.gitlab-ci.yml

@@ -62,7 +62,7 @@ review:
   dependencies:
     - build_branch
   variables:
-    GIT_STRATEGY: none
+    GIT_STRATEGY: fetch
   script:
     - rsync -avz --delete public ~/pages/$CI_COMMIT_REF_SLUG
   environment:
@@ -103,7 +103,7 @@ deploy:
   stage: deploy
   cache: {}
   variables:
-    GIT_STRATEGY: none
+    GIT_STRATEGY: fetch
   dependencies:
     - build_master
   before_script: []

README.md

@@ -321,12 +321,12 @@ The feature page grabs its content automatically from the file
 ### Create or update the comparison pages (under `/comparison`)
-The [comparison page][comp] grabs its content automatically from 
-`data/comparisons.yml`.
+The [comparison page][comp] grabs its content automatically from
+`data/features.yml`.
 There are 3 files in total which you need to create or edit:
-- `data/comparisons.yml`: Update for new comparisons. Comparisons are automatically generated from the contents of this file.
+- `data/features.yml`: Update for new comparisons. Comparisons are automatically generated from the contents of this file.
 - `source/comparison/gitlab-vs-competitor.html.haml`: Create for new comparisons.
   Every comparison page has its own html file. **Use dashes**
 - `source/includes/comparison_table.html.haml`: Edit for new or existing
@@ -397,7 +397,7 @@ extra_js:
   - comparison.js
 ---
-- data.comparisons.gitlab_vs_competitor do |comparison_block|
+- data.features.gitlab_vs_competitor do |comparison_block|
   = partial "includes/comparison_table", locals: { comparison_block: comparison_block }
 ```
@@ -689,6 +689,7 @@ Beware that:
 In case someone forgot the most important commands and is catting this file from the command line we end by listing them:
 ```
+kill -kill `lsof -t -i tcp:4567`
 bundle exec rake new_post
 bundle exec middleman
 ```

config.rb

@@ -84,7 +84,7 @@ org_chart = OrgChart.new
 proxy "/team/structure/index.html", "/team/structure/template.html", locals: { team_data_tree: org_chart.team_data_tree }, ignore: true
 # Proxy comparison PDF pages
-data.comparisons.comparisons.each do |key, comparison|
+data.features.comparisons.each do |key, comparison|
   file_name = key.dup.gsub(/_/, '-')
   proxy "/comparison/pdfs/#{file_name}.html", "/comparison/pdfs/template.html", locals: {
     comparison_block: comparison,

data/applications.yml

@@ -50,6 +50,13 @@
       links:
         - url: http://branchesapp.co
           title: branchesapp.co
+    - title: Zulip
+      content: Get notifications about your GitLab projects in Zulip. Zulip is the world's most productive group chat and the leading open source alternative to Slack. With Zulip, you don't have to choose between missing important conversations and wasting time reading irrelevant ones.
+      links:
+        - url: https://zulipchat.com/
+          title: About Zulip
+        - url: https://zulipchat.com/integrations/#gitlab
+          title: Zulip's GitLab integration
 - title: CLI Clients
   id: cli-clients
   applications:
@@ -389,6 +396,11 @@
       links:
         - url: /features/gitlab-ci-cd/
           title: GitLab CI
+    - title: Bitrise
+      content: Hosted Continuous Integration and Delivery service for mobile apps. Craft powerful workflows to automate build, testing, deployment and feedback cycles to have more time for actual coding, while having constant overview about the state of your app.
+      links:
+        - url: https://www.bitrise.io
+          title: Bitrise.io
     - title: BuildKite
       content: BuildKite runs builds on GitLab commits, either on self-hosted GitLab repositories or GitLab.com.
       links:
@@ -433,7 +445,7 @@
         - url: https://www.buddybuild.com/blog/buddybuild-gitlab-integration
           title: buddybuild
     - title: Terraform
-      content: HashiCorp Terraform Enterprise provides integration with version control systems (VCS) to facilitate collaboration on infrastructure as code. 
+      content: HashiCorp Terraform Enterprise provides integration with version control systems (VCS) to facilitate collaboration on infrastructure as code.
       links:
         - url: https://www.hashicorp.com/blog/announcing-terraform-enterprise-integration-for-gitlab/
           title: Terraform

data/events.yml

@@ -177,4 +177,25 @@
                Learn more about inner workings of Git protocol and how you can use Go as a performant way to deliver Git to the masses. This talk will explore the work done in Gitlab Workhorse and as an experiment, migrate the Git Smart HTTP code to Caddy (a modular Go HTTP Server).
   location: São Paulo, Brazil
   social_tags: theconfbr
-  event_url: http://www.theconf.club
\ No newline at end of file
+  event_url: http://www.theconf.club
+  
+  
+- topic: USENIX LISA 2017
+  type: Training, Conference
+  date: October 29 - November 3 2017
+  date_ends: November 3, 2017 # Month DD, YYYY
+  description: |
+               Our partners at Vertical Sysadmin will be leading training courses on, "Git Foundations: Unlocking the Mysteries" and "Setting up CI/CD Pipelines." The CI/CD course will cover GitLab CI and Jenkins (the conference wanted a vendor-neutral approach).
+  location: San Francisco, CA USA
+  social_tags: LISA17
+  event_url: https://www.usenix.org/conference/lisa17
+  
+- topic: AWS Reinvent
+  type: Cloud, Conference
+  date: November 27 - December 1 2017
+  date_ends: December 1, 2017 # Month DD, YYYY
+  description: |
+               AWS re:Invent is a learning conference hosted for the global cloud computing community. The event features keynote announcements, training and certification opportunities.
+  location: Las Vegas, NV USA
+  social_tags: AWSreinvent
+  event_url: https://reinvent.awsevents.com/
\ No newline at end of file

data/jobs.yml

@@ -263,8 +263,8 @@
 - title: "Performance Lead"
   description: /jobs/performance-lead
-  apply: https://gitlab.workable.com/jobs/398569/candidates/new
-  open: true
+  apply: 
+  open: false
 - title: "Senior Product Marketing Manager"
   description: /jobs/senior-product-marketing-manager/
@@ -391,7 +391,7 @@
 - title: "Senior Web/UX Designer"
   description: /jobs/web-ux-designer/
-  apply: https://gitlab.workable.com/jobs/494761/candidates/new
-  open: true
+  apply:
+  open: false
   # Ordered alphabetically **by job description URL**

data/promo.yml

-text: "Join our webcast, 'Getting Started with Git' on June 14th!"
-link: 'http://get.gitlab.com/getting-started-with-git/'
+text: "Discover why CI/CD is at the core of modern software development. Download the white paper."
+link: 'http://get.gitlab.com/scaled-ci-cd/'

data/resources.yml

@@ -26,14 +26,18 @@
       url: /2016/12/09/how-to-evaluate-gitlab-during-ee-trial/
     - title: 'Getting Started With GitLab Development Kit [blog post]'
       url: /2016/06/08/getting-started-with-gitlab-development-kit/
+    - title: 'Getting Started With Git [webcast]'
+      url: 'http://get.gitlab.com/getting-started-with-git/'
       
 - title: 'CI/CD and Continuous Workflows'
   data:
+    - title: "How GitLab CI Supported Ticketmaster's Ramp Up to Weekly Mobile Releases [blog post]"
+      url: /2017/06/07/continous-integration-ticketmaster/
     - title: 'Demo - CI/CD with GitLab in Action [blog post]'
       url: /2017/03/13/ci-cd-demo/
     - title: 'From Continous Integration to Continuous Everything [webcast]'
       url: 'https://page.gitlab.com/20170301_continuouseverything.html'
-    - title: 'Why we Chose GitLab CI for our CI/CD Solution [blog post]'
+    - title: 'Customer Story: Why we Chose GitLab CI for our CI/CD Solution [blog post]'
       url: /2016/10/17/gitlab-ci-oohlala/
     - title: 'Review Apps, A Continuous Case Study [blog post]' 
       url: /2017/03/21/review-apps-continuous-case-study/
@@ -49,11 +53,14 @@
       url: /2016/11/30/setting-up-gitlab-ci-for-android-projects/
     - title: 'GitLab Container Registry [blog post]'
       url: /2016/05/23/gitlab-container-registry/
+    - title: 'Customer Story: Building our Web App on GitLab CI [blog post]'
+      url: /2016/07/22/building-our-web-app-on-gitlab-ci/
+
 - title: 'DevOps'
   data:
     - title: 'The DevOps Journey: Using Containers [webcast]'
-      url: 'http://get.gitlab.com/moving-to-git/'
+      url: 'https://get.gitlab.com/devops-journey-using-containers/'
     - title: '2016 Developer Survey [report]'
       url: 'http://get.gitlab.com/global-developer-survey/'
     - title: 'Managing the DevOps Culture Shift [webcast]'

data/team.yml

@@ -244,7 +244,7 @@
   locality: San Francisco, CA
   country: USA
   role: <a href="https://about.gitlab.com/jobs/field-marketing-manager/">Field Marketing Manager</a>
-  reports_to: Interim VP of Marketing
+  reports_to: Chief Marketing Officer (CMO)
   picture: emilykyle.jpg
   twitter: emilylucie
   gitlab: emilykyle
@@ -543,7 +543,7 @@
   locality: Colorado Springs, CO
   country: USA
   role: <a href="https://about.gitlab.com/jobs/designer/">Designer</a>
-  reports_to: Interim VP of Marketing
+  reports_to: Chief Marketing Officer (CMO)
   picture: lukebabb.jpg
   twitter: lukebabb
   gitlab: lukebabb
@@ -641,27 +641,6 @@
           and automating everything. Because doing the same thing thrice is just boring. In his free time he takes care
           of his family and enjoys riding in 2 wheels, with or without engine.
-- name: Alfredo Sumaran
-  locality: Lima
-  country: Peru
-  role: <a href="https://about.gitlab.com/jobs/frontend-engineer/">Frontend Engineer</a>
-  reports_to: Frontend AC Lead
-  picture: alfredo.jpg
-  twitter: asumaran
-  gitlab: alfredo1
-  projects:
-    gitlab-ce: maintainer frontend
-    gitlab-ee: maintainer frontend
-  expertise:  |
-                <li>Frontend Architectural <a href="/jobs/expert/">expert</a></li>
-                <li><a href="/jobs/expert/">Expert</a> on: Bulk Label assignment, Priority Labels, Branch Permissions</li>
-  story:  |
-          Alfredo is a multi-disciplined web veteran specializing in front-end development and web design.
-          In the past, he also dabbled in back-end, prototyping and graphic design.
-          Self-taught with over ten years of experience,
-          he enjoys developing from small to large scale projects with a high degree of devotion.
-          He likes music and loves attending concerts.
-
 - name: Zeger-Jan 'ZJ' van de Weg
   locality: Zeist
   country: The Netherlands
@@ -703,25 +682,13 @@
   locality: Lehi, UT
   country: USA
   role: <a href="https://about.gitlab.com/jobs/online-marketing-manager/">Online Marketing Manager</a>
-  reports_to: Interim VP of Marketing
+  reports_to: Chief Marketing Officer (CMO)
   picture: mitchell.jpg
   twitter: mitchellbwright
   gitlab: mitchellwright
   story:  |
           Mitchell is a technical marketer that began his career consulting with B2C companies on their online presence. He has since shifted to helping B2B companies drive demand for their products through digital marketing. He enjoys playing volleyball, ultimate frisbee, and trying new restaurants with his wife.
-- name: Amanda Folson
-  locality: Alameda, CA
-  country: USA
-  role: <a href="https://about.gitlab.com/jobs/developer-advocate/">Developer Advocate</a>
-  reports_to: Interim VP of Marketing
-  picture: amanda.jpg
-  twitter: AmbassadorAwsum
-  gitlab: afolson
-  story:  |
-          Amanda began her career as a technical writer and consultant. She went to her first conference in 2011, which is when she decided that she wanted to take a more active role in community building. The rest was history. When she's not on the road, you'll find her nose-deep in a book or wrangling code for some obscure project or another.
-
-
 - name: Felipe Artur
   locality: Goiânia, GO
   country: Brazil
@@ -777,7 +744,7 @@
   locality: New York City, NY
   country: USA
   role: <a href="https://about.gitlab.com/jobs/senior-product-marketing-manager/">Senior Product Marketing Manager</a>
-  reports_to: Interim VP of Marketing
+  reports_to: Chief Marketing Officer (CMO)
   picture: amara.png
   twitter: its_amaracle
   gitlab: amara
@@ -1068,18 +1035,18 @@
           Luke believes that Git is one of the most significant tools in today's digital toolbox. After recognising the importance of the GitLab vision and values, he couldn't have got on board any quicker. Luke is excited to use Ruby, JavaScript and Sass to craft rich and elegant user experiences at GitLab. In his spare time, Luke enjoys cooking, pretending to understand financial markets and hacking intelligence into boring household applicances.
 - name: Brittany Rohde
-  locality: Columbus, GA
+  locality: Clarksville, TN
   country: USA
   role: <a href="https://about.gitlab.com/jobs/people-ops-specialist/">People Operations Specialist</a>
   reports_to: Senior Director of People Operations
   picture: brittanyrohde.jpg
-  twitter: brittany_rohde
+  twitter:
   gitlab: brittanyr
   expertise:  |
               <li>GitLab Summit Expert</li>
               <li>GitLab People Data Expert</li>
   story:  |
-           Coming from a mathematics background, Brittany combined her love for human interaction with her thirst for knowledge and began working in human resources. She enjoys learning as much as possible about employee relations and benefits. Originally from Northern California as a giant Giants fan, she stays active in the great outdoors with her husband and their golden retriever, Cowboy Jake.
+           Coming from a mathematics background, Brittany combined her love for human interaction with her thirst for knowledge and began working in human resources. She enjoys learning as much as possible about employee relations, compensation, and benefits. Originally from Northern California as a giant Giants fan, she stays active in the great outdoors with her husband and their playful pups, Golden Retriever, Cowboy Jake, and mini St. Bernard, Lucy Lulu.
 - name: Chris Peressini
   locality: Madrid
@@ -1186,7 +1153,7 @@
   locality: Provo, UT
   country: USA
   role: <a href="https://about.gitlab.com/jobs/bdr-manager/">BDR Manager</a>
-  reports_to: Interim VP of Marketing
+  reports_to: Chief Marketing Officer (CMO)
   picture: chet.jpg
   twitter: chetbackman
   gitlab: chetbackman
@@ -1280,7 +1247,7 @@
   locality: Spokane, WA
   country: USA
   role: <a href="https://about.gitlab.com/jobs/marketing-operations-manager/">Marketing Operations Manager</a>
-  reports_to: Interim VP of Marketing
+  reports_to: Chief Marketing Officer (CMO)
   picture: jennifer.jpg
   twitter: JJCordz
   gitlab: jjcordz
@@ -1322,7 +1289,7 @@
   locality: Boulder, CO
   country: USA
   role: <a href="https://about.gitlab.com/jobs/content-marketing-manager/">Content Marketing Manager</a>
-  reports_to: Interim VP of Marketing
+  reports_to: Chief Marketing Officer (CMO)
   picture: erica.jpg
   twitter: EricaLindberg_
   gitlab: lindberg
@@ -1472,8 +1439,8 @@
 - name: Elsje Smart
   locality: Marazion
   country: United Kingdom
-  role: <a href="https://about.gitlab.com/jobs/business-development-representative/">Business Development Representative</a>
-  reports_to: BDR Manager
+  role: <a href="https://about.gitlab.com/jobs/sales-development-representative/">Sales Development Representative</a>
+  reports_to: Sales Development Representative Lead
   picture: elsje.jpg
   twitter:
   gitlab: elsje
@@ -1709,7 +1676,7 @@
   locality: Highlands Ranch, CO
   country: USA
   role: <a href="https://about.gitlab.com/jobs/community-advocate/">Community Advocate</a>
-  reports_to: Interim VP of Marketing
+  reports_to: Chief Marketing Officer (CMO)
   picture: connor.png
   twitter: connorjshea
   gitlab: connorshea
@@ -1888,7 +1855,7 @@
   locality: Belgrade
   country: Serbia
   role: <a href="https://about.gitlab.com/jobs/community-advocate/">Community Advocate</a>
-  reports_to: Interim VP of Marketing
+  reports_to: Chief Marketing Officer (CMO)
   picture: matija.png
   twitter: cmattrex
   gitlab: cmattrex
@@ -1923,17 +1890,6 @@
   story:  |
           Ever since Harish rediscovered his childhood joy of programming, he has spent most of his time either on the computer writing code or learning new ways to code.  He loves spending the rest of his time with his lovely wife and two kids, or hanging out with friends in Jacksonville, Florida.  He also enjoys exercising and you will usually find him beginning each day with a trip to the gym.
-- name: Tim Anglade
-  locality: San Francisco, CA
-  country: USA
-  role: <a href="https://about.gitlab.com/jobs/vp-of-marketing/">Interim VP of Marketing</a>
-  reports_to: CEO
-  picture: timanglade.png
-  twitter: timanglade
-  gitlab: timanglade
-  story:  |
-          Helping Marketing for a little bit. EIR at Scale Venture Partners, Senior Technical Advisor on the TV show Silicon Valley. Formerly: VP Product at Realm, Head of Developer Programs at Apigee, Lecturer in Computer Science & Management at the Université of Paris Est.
-
 - name: Jim Ash
   locality: San Francisco, CA
   country: USA
@@ -2530,16 +2486,18 @@
           Outside of GitLab, Victor enjoys walking and playing with his dogs, spending time with family
           and friends, travelling, video games and computers in general.
-- name: M.M.
-  locality:
-  country:
+- name: Mike McLaughlin
+  locality: Austin, TX
+  country: USA
   role: <a href="https://about.gitlab.com/jobs/solutions-architect/">Senior Solutions Architect</a>
   reports_to: Director of WW Customer Success
-  picture: logo-extra-whitespace.png
+  picture: mikemclaughlin.jpg
   twitter:
-  gitlab:
+  gitlab: mmclaughlin
   story:  |
-          Joining June 12th
+          Mike is a unique mix between the nerdy sales guy and the cool technical dude.
+          He enjoys the challenge to continually stay current on modern software development techniques and tooling.  He takes pride in possessing the ability to articulate complex topics in a manner most appropriate for any given audience ranging from developers and executives to his colleagues and friends.
+          Outside of work, Mike is passionate about sports, travel, and wildlife.  You will often find Mike fostering local shelter animals, helping them find a forever home.
 - name: Shinya Maeda
   locality: Kyoto
@@ -2553,6 +2511,18 @@
           Shinya is an Inspection System engineer who is good at hardware integration. So far he has bulit up 20+ softwares using external devices such as Stereo Camera, Sound Level Meter, Arduino, etc. He also likes competiting on programming contests. Once he met a tough problem, he won't be satisfied until he has found the solution.
           In his free time, he enjoys composing original music and covering famous songs.
+- name: J.G.
+  locality:
+  country:
+  role: <a href="https://about.gitlab.com/jobs/executive-assistant/">Executive Assistant</a>
+  reports_to: CEO
+  picture: logo-extra-whitespace.png
+  twitter:
+  gitlab:
+  story:  |
+          Joining June 19th
+
+
 - name: J.J.
   locality:
   country:

source/community/sponsorship/index.html.markdown

 ---
 layout: markdown_page
-title: "GitLab Sponsorship"
+title: "GitLab Diversity Sponsorship"
 comments: false
 sharing: true
 suppress_header: true
 ---
-![Community Sponsorship](/images/community/gitlab-growth.jpg)
-
-# Community Sponsorship
-
-GitLab would like to reach out and grow the community.
-
-Each year GitLab sponsors a number of large events in Europe and North America and we send our team to speak or teach workshops in the most farflung parts of the globe. In 2016 we are sponsoring larger initatives such as [Ruby Together](https://rubytogether.org/), but would like to expand our reach into the community through a more localized sponsorship program.
-### How we can help
-1.  Financial assistance, in some cases.
-2.  Venue, food, drinks and some flashy GitLab swag for GitLab meet-ups.
-3.  Coaching, mentors and speakers for events.
-4.  Assistance in promotion of your GitLab-focused event.
+![Community Sponsorship](/images/community/gitlab-growth.jpg)
+In February 2016, [we announced a $500 USD grant](https://about.gitlab.com/2016/02/02/gitlab-diversity-sponsorship/) for events which promote diversity in technology.
+Yep, all events which help increase diversity in technology automatically receive the grant.
 [Apply for sponsorship](https://docs.google.com/forms/d/1FUm7DOc85yjplFj4zAIo3pqlGlbJR4c6AnHDHVv0k7Y/viewform)
-### Our highest priorities
-
-All applications will be reviewed by our team. Our highest priority in selecting events to support is to reach the greatest number of people and grow the open source GitLab community.
-
-1.  Events or initiatives which foster diversity, especially in underserved regions and communities.
-2.  Events or initiatives which help mentor young people in finding a path to software development fluency.
-3.  Events where our users meet, such as GitLab meetups.
-
-We would like to sponsor events related to issues and solutions that GitLab users face every day, such as DevOps, open source and collaboration. If you think you have an event where people would like to get to know more about GitLab and our community, please do contact us. We certainly haven't thought of everything.
-
-### A special grant for Diversity events
-
-In February 2016, [we announced a $500 USD grant](https://about.gitlab.com/2016/02/02/gitlab-diversity-sponsorship/) for ALL events which promote diversity in technology.
-Yep, all events which help increase diversity in technology fields.
-You will automatically receive the grant if you meet the criteria.
-We're focusing on regions outside of New York and the Bay Area because these
-areas are already well-served by existing programs.
-
-What are the criteria?
-
-*   An event which aims to increase participation from underrepresented groups in its local region.
-*   An event outside of NYC or Bay Area.
-
 Why is fostering diversity important?
 As if the moral imperative and ethical rationale was not enough,
@@ -53,6 +21,7 @@ These events help increase the potential pool of talent to work at GitLab.
 Research has also proven that more diversity is better for business in almost
 every aspect. ([McKinsey, 2015](http://www.mckinsey.com/insights/organization/why_diversity_matters))
-### A grant for open science
-We are also offering a special grant for the integration of GitLab into the Open Science Framework (OSF). Please read how you can help: [OSF grant.](https://about.gitlab.com/2015/09/03/a-grant-to-help-us-integrate-gitlab-with-open-source-osf/)
+### Other sponsorships
+- In 2017 we are sponsoring larger initatives such as [Ruby Together](https://rubytogether.org/), but would like to expand our reach into the community through a more localized sponsorship program.
+- A special grant for the integration of GitLab into the Open Science Framework (OSF). Please read how you can help: [OSF grant.](https://about.gitlab.com/2015/09/03/a-grant-to-help-us-integrate-gitlab-with-open-source-osf/)

source/comparison/gitlab-ce-ee-vs-bitbucket-server.html.haml

@@ -10,5 +10,5 @@ extra_js:
   - comparison.js
 ---
-- competitors = data.comparisons.competitors
-= partial "includes/comparison_table", locals: { comparison_block: data.comparisons.comparisons.gitlab_ce_vs_bitbucket_server, product_one: competitors.gitlab_ce, product_two: competitors.bitbucket_server, key_one: :gitlab_ce, key_two: :bitbucket_server }
+- competitors = data.features.competitors
+= partial "includes/comparison_table", locals: { comparison_block: data.features.comparisons.gitlab_ce_vs_bitbucket_server, product_one: competitors.gitlab_ce, product_two: competitors.bitbucket_server, key_one: :gitlab_ce, key_two: :bitbucket_server }

source/comparison/gitlab-ce-ee-vs-saas.html.haml

@@ -10,5 +10,5 @@ extra_js:
   - comparison.js
 ---
-- competitors = data.comparisons.competitors
-= partial "includes/comparison_table", locals: { comparison_block: data.comparisons.comparisons.gitlab_self_hosted_vs_saas, product_one: competitors.gitlab_self_hosted, product_two: competitors.saas, key_one: :gitlab_self_hosted, key_two: :saas }
+- competitors = data.features.competitors
+= partial "includes/comparison_table", locals: { comparison_block: data.features.comparisons.gitlab_self_hosted_vs_saas, product_one: competitors.gitlab_self_hosted, product_two: competitors.saas, key_one: :gitlab_self_hosted, key_two: :saas }

source/comparison/gitlab-ce-vs-gitlab-ee.html.haml

----
-layout: comparison_page
-trial_bar: true
-suppress_header: true
-title: "GitLab EE vs GitLab CE | GitLab compared to other tools"
-image_title: '/images/comparison/title_image.png'
-extra_css:
-  - compared.css
-extra_js:
-  - comparison.js
----
-
-- competitors = data.comparisons.competitors
-= partial "includes/comparison_table", locals: { comparison_block: data.comparisons.comparisons.gitlab_ce_vs_gitlab_ee, product_one: competitors.gitlab_ce, product_two: competitors.gitlab_ees, key_one: :gitlab_ce, key_two: :gitlab_ees }

source/comparison/gitlab-com-vs-bitbucket-org.html.haml

@@ -10,5 +10,5 @@ extra_js:
   - comparison.js
 ---
-- competitors = data.comparisons.competitors
-= partial "includes/comparison_table", locals: { comparison_block: data.comparisons.comparisons.gitlab_com_vs_bitbucket_org, product_one: competitors.gitlab_com, product_two: competitors.bitbucket_org, key_one: :gitlab_com, key_two: :bitbucket_org }
+- competitors = data.features.competitors
+= partial "includes/comparison_table", locals: { comparison_block: data.features.comparisons.gitlab_com_vs_bitbucket_org, product_one: competitors.gitlab_com, product_two: competitors.bitbucket_org, key_one: :gitlab_com, key_two: :bitbucket_org }

source/comparison/gitlab-ee-vs-github-enterprise.html.haml

@@ -10,5 +10,5 @@ extra_js:
   - comparison.js
 ---
-- competitors = data.comparisons.competitors
-= partial "includes/comparison_table", locals: { comparison_block: data.comparisons.comparisons.gitlab_ee_vs_github_enterprise, product_one: competitors.gitlab_ees, product_two: competitors.github_enterprise, key_one: :gitlab_ees, key_two: :github_enterprise }
+- competitors = data.features.competitors
+= partial "includes/comparison_table", locals: { comparison_block: data.features.comparisons.gitlab_ee_vs_github_enterprise, product_one: competitors.gitlab_ees, product_two: competitors.github_enterprise, key_one: :gitlab_ees, key_two: :github_enterprise }

source/comparison/gitlab-ees-vs-gitlab-eep.html.haml

----
-layout: comparison_page
-trial_bar: true
-suppress_header: true
-title: GitLab EE Starter vs GitLab EE Premium | GitLab compared to other tools
-image_title: '/images/comparison/title_image.png'
-extra_css:
-  - compared.css
-extra_js:
-  - comparison.js
----
-
-- competitors = data.comparisons.competitors
-= partial "includes/comparison_table", locals: { comparison_block: data.comparisons.comparisons.gitlab_ees_vs_gitlab_eep, product_one: competitors.gitlab_ees, product_two: competitors.gitlab_eep, key_one: :gitlab_ees, key_two: :gitlab_eep }
-
-.content-container.explore-product-roadmap.text-center
-  .container
-    %h1.page-headline.cta
-      View the GitLab EE Premium Product Roadmap
-    %a.btn.btn-lg.btn-red.btn-margin-top{ href: "/direction/#premium-features" }
-      Read more

source/comparison/gitlab-issueboards-vs-asana.html.haml

@@ -10,5 +10,5 @@ extra_js:
   - comparison.js
 ---
-- competitors = data.comparisons.competitors
-= partial "includes/comparison_table", locals: { comparison_block: data.comparisons.comparisons.gitlab_issue_boards_vs_asana, product_one: competitors.gitlab_issue_boards, product_two: competitors.asana, key_one: :gitlab_issue_boards, key_two: :asana }
+- competitors = data.features.competitors
+= partial "includes/comparison_table", locals: { comparison_block: data.features.comparisons.gitlab_issue_boards_vs_asana, product_one: competitors.gitlab_issue_boards, product_two: competitors.asana, key_one: :gitlab_issue_boards, key_two: :asana }

source/comparison/gitlab-issueboards-vs-trello.html.haml

@@ -10,5 +10,5 @@ extra_js:
   - comparison.js
 ---
-- competitors = data.comparisons.competitors
-= partial "includes/comparison_table", locals: { comparison_block: data.comparisons.comparisons.gitlab_issue_boards_vs_trello, product_one: competitors.gitlab_issue_boards, product_two: competitors.trello, key_one: :gitlab_issue_boards, key_two: :trello }
+- competitors = data.features.competitors
+= partial "includes/comparison_table", locals: { comparison_block: data.features.comparisons.gitlab_issue_boards_vs_trello, product_one: competitors.gitlab_issue_boards, product_two: competitors.trello, key_one: :gitlab_issue_boards, key_two: :trello }

source/comparison/gitlab-merge-request-vs-github-pull-request.html.haml

@@ -10,5 +10,5 @@ extra_js:
   - comparison.js
 ---
-- competitors = data.comparisons.competitors
-= partial "includes/comparison_table", locals: { comparison_block: data.comparisons.comparisons.gitlab_merge_requests_vs_github_pull_requests, product_one: competitors.gitlab_merge_requests, product_two: competitors.github_pull_requests, key_one: :gitlab_merge_requests, key_two: :github_pull_requests }
+- competitors = data.features.competitors
+= partial "includes/comparison_table", locals: { comparison_block: data.features.comparisons.gitlab_merge_requests_vs_github_pull_requests, product_one: competitors.gitlab_merge_requests, product_two: competitors.github_pull_requests, key_one: :gitlab_merge_requests, key_two: :github_pull_requests }