Commit 9756ca24 authored by Clinton Sprauve's avatar Clinton Sprauve

Merge branch 'csprauve-01' into 'master'

Csprauve 01

See merge request !23057
parents b8cc9b1e bec6aece
Pipeline #62726682 passed with stages
in 24 minutes and 32 seconds
......@@ -143,6 +143,14 @@ devops_tools:
category:
- continuous_integration
summary: 'CircleCI is a continuous integration server (available both cloud-based and self-hosted) that supports any language that builds on Linux or macOS, including C++, Javascript, .NET, PHP, Python, and Ruby. Like GitLab, CircleCI has been named a leader in CI by Forrester in 2017. CircleCI focuses on the orchestration and automation of the CI/CD pipeline and integrates to several industry standard tools for all other functionality. In contrast, GitLab offers a single integrated application providing automation of the entire DevOps lifecycle, based on tight out-of-the-box integrations with industry leading open source tools. GitLab also has the ability integrate to all other tools using CLI, API, and webhooks.'
codeship:
name: 'CodeShip'
logo: '/images/devops-tools/codeship-logo.png'
include_file: devops-tools/codeship/index.html.md
category:
- continuous_integration
bamboo:
name: 'Bamboo'
logo: '/images/devops-tools/bamboo-logo.png'
......@@ -1036,7 +1044,7 @@ features:
gitlab_core: false
gitlab_starter: false
gitlab_premium: true
gitlab_ultimate: true
gitlab_ultimate: true
- title: "Issue Weights"
description: "GitLab lets you manage issues using Agile practices by setting the weight of an issue."
link_description: "Read our Issue Weights documentation"
......@@ -6442,7 +6450,7 @@ features:
github_com: false
github_enterprise: false
- title: "Windows Container Executor"
description: |
description: |
With this feature you are able to use Docker containers on Windows directly,
in much the same was as if they were on Linux hosts. This enables more
advanced kinds of pipeline orchestration and management for users of
......@@ -6820,7 +6828,7 @@ features:
github_com: false
github_enterprise: false
bitbucket_org: false
bitbucket_data_center: false
bitbucket_data_center: false
- title: "Pipelines for Merge Requests"
description: "Run your pipelines in the context of a Merge Request, with access to MR information and custom behaviors for that context, as well as the ability to run the pipeline against the combined source+target branch."
link_description: "Learn more about Pipelines for Merge Requests"
......@@ -6854,4 +6862,4 @@ features:
github_com: false
github_enterprise: false
bitbucket_org: false
bitbucket_data_center: false
\ No newline at end of file
bitbucket_data_center: false
......@@ -50,7 +50,7 @@ CodeShip from Cloudbees created a web page that compared [CodeShip Pro to GitLab
* Complete control over your build environment - This 100% applies to GitLab. GitLab also has a built-in container registry.
* Dedicated & Flexible Build Machines - GitLab’s runner architecture lets you run on whatever machines you want. In fact Gitlab can auto-scale.
* Parallel Testing - This is a core capability of GitLab. For more on this, see our [Ticketmaster Case Study](https://about.gitlab.com/2017/06/07/continous-integration-ticketmaster/).
* Debugging via SSH Access - GitLab has this capability
* Debugging via SSH Access - GitLab has this capability
* Pre-configured Deployments - GitLab has this capability with our [Auto DevOps](https://about.gitlab.com/product/auto-devops/) feature. Auto DevOps simplifies and accelerates delivery with a complete delivery pipeline out of the box. Simply commit code and GitLab does the rest.
......@@ -64,5 +64,4 @@ CodeShip from Cloudbees created a web page that compared [CodeShip Pro to GitLab
* You can use up to 100 builds per month for free, with unlimited projects and unlimited team members.
* You can pay for more concurrent builds and more parallel pipelines, or larger instance sizes
## Comparison
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment