username-removed-386624 · b644c77e
--- a/data/comparisons.yml 0 → 100644
+++ b/data/comparisons.yml 0 → 100644
+    - title: "Move issues between projects"
+      description: "You can move issues between projects in GitLab. All links, history and comments will be copied and the original issue will reference the newly moved issue. This makes working with multiple issue trackers much easier."
+      documentation_link: ""
+      competitor_one: true
+      competitor_two: false
+    - title: "Group-level milestones"
+      description: "View all the issues for the milestone you’re currently working on across multiple projects."
+      documentation_link: "[Example milestone for GitLab 8.2 (need to be logged in)](https://gitlab.com/groups/gitlab-org/milestones/8-2?title=8.2)"
+      competitor_one: true
+      competitor_two: false
+    - title: "Create new branches from Issues"
+      description: "In GitLab, you can quickly create a new branch from an issue on the issue tracker. It will include the issue number and title automatically, making it easy to track which branch belongs to which issue."
+      documentation_link: "[See how in our documentation](http://doc.gitlab.com/ce/workflow/web_editor.html#sts=Create%20a%20new%20branch%20from%20an%20issue)"
+      competitor_one: true
+      competitor_two: false
+    - title: "Search through commit messages"
--- a/data/comparisons.yml 0 → 100644
+++ b/data/comparisons.yml 0 → 100644
+      description: "You can change the order of tasks in markdown on GitHub. GitLab does not have this ability, but is considering implementing it."
+      documentation_link: "[See the GitLab issue to implement this](https://gitlab.com/gitlab-org/gitlab-ce/issues/18003)"
+      competitor_one: false
+      competitor_two: true
+    - title: "Allow edits from upstream maintainers in branch"
+      description: "In GitHub, when a user opens a pull request from a fork, they are given the option that allows the upstream repository contributors to collaborate with them on their new branch. GitLab allows you to restrict pushes very carefully, but does not have this option."
+      documentation_link: "[GitLab issue to implement the same feature](https://gitlab.com/gitlab-org/gitlab-ce/issues/21975)"
+      competitor_one: false
+      competitor_two: true
+    - title: "Cycle Analytics"
+      description: "GitLab provides a dashboard that lets teams measure the time it takes to go from an idea to production. GitLab can provide this data because it has all the tools built-in: from the idea, to the CI, to code review, to deploy to production."
+      documentation_link: "[Feature Highlight: Cycle Analytics](https://about.gitlab.com/2016/09/21/cycle-analytics-feature-highlight/)"
+      competitor_one: true
+      competitor_two: false
+    - title: "Slash commands"
+      description: "In GitLab, you can pilot almost everything that affects an issue or a merge request with slash commands."
--- a/data/comparisons.yml 0 → 100644
+++ b/data/comparisons.yml 0 → 100644
+    - title: "Issue board"
+      description: "GitHub has Projects, which are not tight to labels in any way, making it hard to automatize flows. GitLab has Issue boards. Each list of an issue board is based on a label that exists in your issue tracker. The Issue Board will therefore match the state of your issue tracker in a user friendly way."
+      documentation_link: "[Feature highlight: Issue Boards](https://about.gitlab.com/2016/08/22/announcing-the-gitlab-issue-board/)"
+      competitor_one: true
+      competitor_two: 'sortof'
+    - title: "Time tracking"
+      description: "Time Tracking in GitLab Enterprise Edition lets your team add estimates and record time spent on issues and merge requests. There is no need to use external tools anymore."
+      documentation_link: "[Time Tracking is available as an Enterprise Edition Product](https://about.gitlab.com/features/time-tracking/)"
+      competitor_one: true
+      competitor_two: false
+    - title: "Continuous Integration"
+      description: "GitHub integrates with popular, external CI platforms. GitLab provides a continuous integration service, built-in, for free. It's tightly integrated with everything in the product and just works. You can also decide to use external CI solutions if you choose to."
+      documentation_link: "[Documentation on CI](https://docs.gitlab.com/ce/ci/quick_start/README.html)"
+      competitor_one: true
+      competitor_two: false
+    - title: "Docker Registry support"
--- a/data/comparisons.yml 0 → 100644
+++ b/data/comparisons.yml 0 → 100644
+    - title: "File Locking"
+      description: "GitLab EE provides an easy mechanism to lock files, preventing everyone from modifying a specific file or an entire directory."
+      documentation_link: ""
+      competitor_one: true
+      competitor_two: false
+    - title: "Access to the server"
+      description: "You have complete control of the server/instance, so you can install additional software (intrusion detection, performance monitoring, etc.) and view log files on the server itself."
+      documentation_link: "[Learn more about logging](http://doc.gitlab.com/ce/logs/logs.html)"
+      competitor_one: true
+      competitor_two: false
+    - title: "Runs on metal"
+      description: "You can run GitLab fully on metal. No need for pre-supplied VMs. Run GitLab on your infrastructure, however you like."
+      documentation_link: ""
+      competitor_one: true
+      competitor_two: false
+    - title: "Run more users on a single server"
--- a/data/comparisons.yml 0 → 100644
+++ b/data/comparisons.yml 0 → 100644
+    - title: "Custom Push Rules (pre-received hooks)"
+      description: "GitHub allows site administrators to create pre-received hooks at a global or project level. GitLab also allows the creation of those hooks at a project or global level, but they can be set by either the project owner or an administrator, and provides a simple user interface to define those push rules."
+      documentation_link: "[Documentation on push rules](https://docs.gitlab.com/ee/push_rules/push_rules.html#prevent-pushing-secrets-to-the-repository)"
+      competitor_one: true
+      competitor_two: 'sortof'
+    - title: "Prevent committing secrets in the repositories"
+      description: "GitLab provides a way to avoid committing sensitive files to your repositories automatically."
+      documentation_link: "[Documentation](https://docs.gitlab.com/ee/push_rules/push_rules.html#prevent-pushing-secrets-to-the-repository)"
+      competitor_one: true
+      competitor_two: false
+    - title: "Ability to set a project size"
+      description: "GitLab allows to set a project size limit at a global, group and project level."
+      documentation_link: "[Documentation on account and limit settings](https://docs.gitlab.com/ee/user/admin_area/settings/account_and_limit_settings.html)"
+      competitor_one: true
+      competitor_two: false
+    - title: "Merge Request Issue Templates"
--- a/data/comparisons.yml 0 → 100644
+++ b/data/comparisons.yml 0 → 100644
+    logo: '/images/comparison/github-logo.svg'
+  last_updated: 'January 31, 2017'
+  features:
+    - title: "Unlimited public private repositories and unlimited collaborators for free"
+      description: "No matter the type of project or how many people you collaborate with, you can use GitLab.com for free. That means free public projects, free private projects and as many people on those as you need."
+      competitor_one: true
+      competitor_two: false
+    - title: "GitLab.com runs GitLab Enterprise Edition with all its features"
+      description: "All the features from GitLab Enterprise Edition run on GitLab.com. This means you can use Push Rules, Merge Request Approvals and even File Locking on GitLab.com."
+      competitor_one: true
+      competitor_two: true
+    - title: "Free CI with Shared or Own Runner"
+      description: "GitLab.com has shared runners that allow you to use GitLab CI completely free. Alternatively, you can set up your own Runner for faster build processing or special requirements."
+      competitor_one: true
+      competitor_two: false
+    - title: "GitHub.com has faster pageloads than GitLab.com"
--- a/data/comparisons.yml 0 → 100644
+++ b/data/comparisons.yml 0 → 100644
+  last_updated: 'January 31, 2017'
+  features:
+    - title: "Unlimited public private repositories and unlimited collaborators for free"
+      description: "No matter the type of project or how many people you collaborate with, you can use GitLab.com for free. That means free public projects, free private projects and as many people on those as you need."
+      competitor_one: true
+      competitor_two: false
+    - title: "GitLab.com runs GitLab Enterprise Edition with all its features"
+      description: "All the features from GitLab Enterprise Edition run on GitLab.com. This means you can use Push Rules, Merge Request Approvals and even File Locking on GitLab.com."
+      competitor_one: true
+      competitor_two: true
+    - title: "Free CI with Shared or Own Runner"
+      description: "GitLab.com has shared runners that allow you to use GitLab CI completely free. Alternatively, you can set up your own Runner for faster build processing or special requirements."
+      competitor_one: true
+      competitor_two: false
+    - title: "GitHub.com has faster pageloads than GitLab.com"
+      description: "Improving this is a work in progress."
--- a/data/comparisons.yml 0 → 100644
+++ b/data/comparisons.yml 0 → 100644
+      description: "Improving this is a work in progress."
+      documentation_link: "[Issue](https://gitlab.com/gitlab-com/operations/issues/42/)"
+      competitor_one: false
+      competitor_two: true
+
+gitlab_ce_ee_vs_bitbucket_server:
+  title: "GitLab CE/EE vs. Bitbucket Server"
+  competitor_one:
+    name: 'GitLab CE/EE'
+    logo: '/images/comparison/ce-ee-gitlab-logo.svg'
+  competitor_two:
+    name: 'Bitbucket Server'
+    logo: '/images/comparison/bitbucket-logo.svg'
+  last_updated: 'January 31, 2017'
+  features:
+    - title: "Built-in Continuous Integration tool"
--- a/data/comparisons.yml 0 → 100644
+++ b/data/comparisons.yml 0 → 100644
+gitlab_com_vs_bitbucket_org:
+  title: "GitLab.com vs. Bitbucket.org"
+  competitor_one:
+    name: 'GitLab.com'
+    logo: '/images/comparison/gitlab-logo.svg'
+  competitor_two:
+    name: 'Bitbucket.org'
+    logo: '/images/comparison/bitbucket-logo.svg'
+  last_updated: 'January 31, 2017'
+  features:
+    - title: "Unlimited collaborators"
+      description: "With GitLab.com, you don't have to start paying when you have more than 5 collaborators across all your private repositories."
+      competitor_one: true
+      competitor_two: true
+    - title: "New features every month"
+      description: "GitLab is updated very often. The schedule is predictable with a monthly release cycle."
--- a/source/stylesheets/compared.css.scss
+++ b/source/stylesheets/compared.css.scss
    padding: 10px 0 40px;
  }

+  // scss-lint:disable SelectorDepth
--- a/source/stylesheets/compared.css.scss
+++ b/source/stylesheets/compared.css.scss
+  }
+
+  h4 {
+    color: $color-gray-light;
+    padding: 0 160px 10px;
+    line-height: 25px;
+
+    @media (max-width: $screen-md-max) {
+      padding: 0 40px 10px;
+    }
+  }
+
+  .left-columns {
+    padding-right: 30px;
+
+    @media (max-width: $screen-md-min) {
--- a/source/stylesheets/compared.css.scss
+++ b/source/stylesheets/compared.css.scss
+      padding: 0 40px 10px;
+    }
+  }
+
+  .left-columns {
+    padding-right: 30px;
+
+    @media (max-width: $screen-md-min) {
+      padding: 0 15px;
+    }
+  }
+
+  .right-columns {
+    padding-left: 30px;
+
+    @media (max-width: $screen-md-min) {
--- a/source/stylesheets/compared.css.scss
+++ b/source/stylesheets/compared.css.scss
  }

  .comparison-container {
-    padding: 40px;
+    padding: 10px 0 40px;
+  }
+
+  // scss-lint:disable SelectorDepth
+  .table-responsive {
+    @media (max-width: $screen-md-min) {
--- a/source/stylesheets/compared.css.scss
+++ b/source/stylesheets/compared.css.scss
    }
  }
 }
+
+.last-updated-section {
+  border-top: 1px solid $navbar-default-border;
+  margin-left: -15px;
+  padding: 10px 0 30px;
+
+  @media (max-width: $screen-md-min) {
--- a/source/stylesheets/compared.css.scss
+++ b/source/stylesheets/compared.css.scss
    }
  }
 }
+
+.last-updated-section {
+  border-top: 1px solid $navbar-default-border;
+  margin-left: -15px;
--- a/source/layouts/comparison_page.haml
+++ b/source/layouts/comparison_page.haml
+              Unlike closed-source software, you can modify GitLab's source code. Be it right on the server or by forking our repositories, you can add features and make customizations. We do recommend that you try to merge your changes back into the main source code, so that others can benefit and your instance stays easy to maintain and update.
+        .row
+          .col-md-6.left-columns
+            %h3
+              Viable long term
+            %p
+              GitLab has a solid community with hundreds of thousands of organizations using and often contributing to the software. This means that GitLab is much more viable for long term usage, as it's not reliable on a single company supporting it.
+          .col-md-6.right-columns
+            %h3
+              New stable version every month
+            %p
+              GitLab releases a new stable version every single month, full of improvements, new features, and fixes. This allows GitLab to move fast and respond to customer requests extremely quickly.
+        .row
+          .col-md-6.left-columns
+            %h3
+              Build with a community