Change comparisons.yml to features.yml.

README.md

@@ -322,11 +322,11 @@ 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`.
+`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 }
 ```

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,

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-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-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 }

source/comparison/gitlab-pages-vs-github-pages.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_pages_vs_github_pages, product_one: competitors.gitlab_pages, product_two: competitors.github_pages, key_one: :gitlab_pages, key_two: :github_pages }
+- competitors = data.features.competitors
+= partial "includes/comparison_table", locals: { comparison_block: data.features.comparisons.gitlab_pages_vs_github_pages, product_one: competitors.gitlab_pages, product_two: competitors.github_pages, key_one: :gitlab_pages, key_two: :github_pages }

source/comparison/gitlab-self-hosted-vs-github.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_github_com, product_one: competitors.gitlab_self_hosted, product_two: competitors.github_com, key_one: :gitlab_self_hosted, key_two: :github_com }
+- competitors = data.features.competitors
+= partial "includes/comparison_table", locals: { comparison_block: data.features.comparisons.gitlab_self_hosted_vs_github_com, product_one: competitors.gitlab_self_hosted, product_two: competitors.github_com, key_one: :gitlab_self_hosted, key_two: :github_com }

source/comparison/gitlab-vs-circleci.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_ci_vs_circle_ci, product_one: competitors.gitlab_ci, product_two: competitors.circle_ci, key_one: :gitlab_ci, key_two: :circle_ci }
+- competitors = data.features.competitors
+= partial "includes/comparison_table", locals: { comparison_block: data.features.comparisons.gitlab_ci_vs_circle_ci, product_one: competitors.gitlab_ci, product_two: competitors.circle_ci, key_one: :gitlab_ci, key_two: :circle_ci }

source/comparison/gitlab-vs-github.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_github_com, product_one: competitors.gitlab_com, product_two: competitors.github_com, key_one: :gitlab_com, key_two: :github_com }
+- competitors = data.features.competitors
+= partial "includes/comparison_table", locals: { comparison_block: data.features.comparisons.gitlab_com_vs_github_com, product_one: competitors.gitlab_com, product_two: competitors.github_com, key_one: :gitlab_com, key_two: :github_com }

source/comparison/gitlab-vs-jenkins.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_ci_vs_jenkins, product_one: competitors.gitlab_ci, product_two: competitors.jenkins, key_one: :gitlab_ci, key_two: :jenkins }
+- competitors = data.features.competitors
+= partial "includes/comparison_table", locals: { comparison_block: data.features.comparisons.gitlab_ci_vs_jenkins, product_one: competitors.gitlab_ci, product_two: competitors.jenkins, key_one: :gitlab_ci, key_two: :jenkins }

source/comparison/gitlab-vs-svn.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_vs_svn, product_one: competitors.gitlab_ce, product_two: competitors.svn, key_one: :gitlab_ce, key_two: :svn }
+- competitors = data.features.competitors
+= partial "includes/comparison_table", locals: { comparison_block: data.features.comparisons.gitlab_vs_svn, product_one: competitors.gitlab_ce, product_two: competitors.svn, key_one: :gitlab_ce, key_two: :svn }

source/comparison/gitlab-vs-travis-ci.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_ci_vs_travis_ci, product_one: competitors.gitlab_ci, product_two: competitors.travis_ci, key_one: :gitlab_ci, key_two: :travis_ci }
+- competitors = data.features.competitors
+= partial "includes/comparison_table", locals: { comparison_block: data.features.comparisons.gitlab_ci_vs_travis_ci, product_one: competitors.gitlab_ci, product_two: competitors.travis_ci, key_one: :gitlab_ci, key_two: :travis_ci }

source/comparison/index.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_github_com, product_one: competitors.gitlab_com, product_two: competitors.github_com, key_one: :gitlab_com, key_two: :github_com }
+- competitors = data.features.competitors
+= partial "includes/comparison_table", locals: { comparison_block: data.features.comparisons.gitlab_com_vs_github_com, product_one: competitors.gitlab_com, product_two: competitors.github_com, key_one: :gitlab_com, key_two: :github_com }

source/comparison/pdfs/template.html.haml

@@ -33,8 +33,8 @@ layout: false
               %col{:width => "10%"}
               %col{:width => "10%"}
             %tbody.header.first
-              - product_one = data.comparisons.competitors[key_one]
-              - product_two = data.comparisons.competitors[key_two]
+              - product_one = data.features.competitors[key_one]
+              - product_two = data.features.competitors[key_two]
               %tr
                 %td.text-left.table-title
                   FEATURES
@@ -51,7 +51,7 @@ layout: false
                       = partial "../..#{product_two.logo}"
                   - else
                     = product_two.name
-              - data.comparisons.features.each do |feature|
+              - data.features.features.each do |feature|
                 - if (feature.public_send(key_one) != nil && feature.public_send(key_two) != nil)
                   %tr
                     %td.feature-in-list

source/includes/comparison_table.html.haml

@@ -62,7 +62,7 @@
         - else
           = product_two.name
   %tbody.header.first
-    - data.comparisons.features.each do |feature|
+    - data.features.features.each do |feature|
       - if (feature.public_send(key_one) != nil && feature.public_send(key_two) != nil)
         %tr
           %td.feature-in-list