Fix merge conflict

.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

@@ -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,

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/comparisons.yml → data/features.yml

@@ -74,68 +74,68 @@ competitors:
 comparisons:
   gitlab_com_vs_github_com:
-    title: 'GitLab.com vs. GitHub.com'
+    title: 'GitΗub.com vs. GitLab.com'
     product_one: 'gitlab_com'
     product_two: 'github_com'
     pdf: 'gitlabcom-vs-githubcom.pdf'
   gitlab_ce_vs_bitbucket_server:
-    title: 'GitLab CE vs. Bitbucket Server'
+    title: 'Bitbucket Server vs. GitLab CE'
     product_one: 'gitlab_ce'
     product_two: 'bitbucket_server'
     pdf: 'gitlabce-vs-bitbucketserver.pdf'
   gitlab_ci_vs_jenkins:
-    title: 'GitLab CI vs. Jenkins'
+    title: 'Jenkins vs. GitLab CI'
     product_one: 'gitlab_ci'
     product_two: 'jenkins'
     pdf: 'gitlab-vs-jenkins.pdf'
   gitlab_ee_vs_github_enterprise:
-    title: 'GitLab EE vs. GitHub Enterprise'
+    title: 'GitHub Enterprise vs. GitLab EE'
     product_one: 'gitlab_ees'
     product_two: 'github_enterprise'
     pdf: 'gitlab-ee-vs-github-enterprise.pdf'
   gitlab_com_vs_bitbucket_org:
-    title: 'GitLab.com vs. Bitbucket.org'
+    title: 'Bitbucket.org vs. GitLab.com'
     product_one: 'gitlab_com'
     product_two: 'bitbucket_org'
     pdf: 'gitlab-com-vs-bitbucket-org.pdf'
   gitlab_vs_svn:
-    title: 'GitLab vs. SVN'
+    title: 'SVN vs. GitLab'
     product_one: 'gitlab_ce'
     product_two: 'svn'
     pdf: 'gitlab-vs-svn.pdf'
   gitlab_ci_vs_travis_ci:
-    title: 'GitLab CI vs. Travis CI'
+    title: 'Travis CI vs. GitLab CI'
     product_one: 'gitlab_ci'
     product_two: 'travis_ci'
     pdf: 'gitlab-vs-travis-ci.pdf'
   gitlab_ci_vs_circle_ci:
-    title: 'GitLab CI vs. Circle CI'
+    title: 'Circle CI vs. GitLab CI'
     product_one: 'gitlab_ci'
     product_two: 'circle_ci'
   gitlab_self_hosted_vs_github_com:
-    title: 'GitLab Self-hosted vs. GitHub.com'
+    title: 'GitHub.com vs. GitLab Self-hosted'
     product_one: 'gitlab_self_hosted'
     product_two: 'github_com'
     pdf: 'gitlab-self-hosted-vs-github.pdf'
   gitlab_self_hosted_vs_saas:
-    title: 'GitLab Self-hosted vs. SaaS'
+    title: 'Saas vs. GitLab Self-hosted'
     product_one: 'gitlab_self_hosted'
     product_two: 'saas'
     pdf: 'gitlab-ce-ee-vs-saas.pdf'
   gitlab_issue_boards_vs_trello:
-    title: 'GitLab Issue Boards vs. Trello'
+    title: 'Trello vs. GitLab Issue Boards'
     product_one: 'gitlab_issue_boards'
     product_two: 'trello'
   gitlab_issue_boards_vs_asana:
-    title: "Asana vs. GitLab Issue Boards"
+    title: 'Αsana vs. GitLab Issue Boards'
     product_one: 'gitlab_issue_boards'
     product_two: 'asana'
   gitlab_pages_vs_github_pages:
-    title: 'GitLab Pages vs. GitHub Pages'
+    title: 'GitHub Pages vs. GitLab Pages'
     product_one: 'gitlab_pages'
     product_two: 'github_pages'
   gitlab_merge_requests_vs_github_pull_requests:
-    title: 'GitLab Merge Requests vs. GitHub Pull Requests'
+    title: 'GitHub Pull Requests vs. GitLab Merge Requests'
     product_one: 'gitlab_merge_requests'
     product_two: 'github_pull_requests'
@@ -148,9 +148,11 @@ features:
     github_com: false
     bitbucket_org: false
   - title: "Built-in CI/CD"
-    description: "GitLab has built-in CI/CD, for free. GitHub has 3rd party CI/CD, which depends on GitHub, that are expensive if your projects are private."
+    description: "GitLab has built-in Continuous Integration/Continuous Delivery, for free."
+    screenshot_url: "images/feature_page/screenshots/09-gitlab-ci.png"
     link_description: "Learn more about CI/CD"
     link: https://about.gitlab.com/features/gitlab-ci-cd/
+    screenshot_url: images/feature_page/screenshots/11-pipelines.png
     feature_page: true
     gitlab_com: true
     gitlab_ce: true
@@ -248,8 +250,9 @@ features:
     github_com: false
   - title: "Powerful Issue Tracker"
     description: "Quickly set the status, assignee or milestone for multiple issues at the same time or easily filter them on any properties. See milestones and issues across projects."
-    link_description: 
-    link: 
+    screenshot_url: "images/feature_page/screenshots/04-issues.png"
+    link_description: "Learn more about the Issue Tracker"
+    link: https://docs.gitlab.com/ee/#issues-and-merge-requests-mrs
     gitlab_com: true
     github_com: true
     bitbucket_org: true
@@ -301,6 +304,7 @@ features:
     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. GitHub can't provide this data."
     link_description: "Learn more about Cycle Analytics"
     link: https://about.gitlab.com/features/cycle-analytics/
+    screenshot_url: images/feature_page/screenshots/15-cycle-analytics.png
     feature_page: true
     gitlab_ce: true
     gitlab_ees: true
@@ -314,6 +318,7 @@ features:
     description: "GitLab Pages provides an easy system for hosting static sites using GitLab repositories and GitLab CI, complete with custom domains and HTTPS support."
     link_description: "Learn more about GitLab Pages"
     link: https://about.gitlab.com/features/pages/
+    screenshot_url: 'images/feature_page/screenshots/03-gitlab-pages.png'
     feature_page: true
     gitlab_ce: true
     gitlab_ees: true
@@ -330,6 +335,7 @@ features:
     bitbucket_server: false
   - title: "Issue boards"
     description: "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."
+    screenshot_url: "images/feature_page/screenshots/05-issue-boards.png"
     link_description: "Learn more about Issue Boards"
     link: https://about.gitlab.com/features/issueboard/
     feature_page: true
@@ -352,6 +358,7 @@ features:
     description: "GitLab Container Registry is a secure and private registry for Docker images. It allows for easy upload and download of images from GitLab CI. It is fully integrated with Git repository management."
     link_description: "Documentation on Container Registry"
     link: https://docs.gitlab.com/ce/user/project/container_registry.html
+    screenshot_url: images/feature_page/screenshots/12-container-registry.png
     gitlab_ce: true
     gitlab_ees: true
     gitlab_eep: true
@@ -377,6 +384,7 @@ features:
     description: "With Review Apps you can spin up dynamic environments for your merge requests and preview your branch in a live environment."
     link_description: "Learn more about Review Apps"
     link: https://about.gitlab.com/features/review-apps/
+    screenshot_url: images/feature_page/screenshots/10-review-apps.png
     feature_page: true
     gitlab_com: true
     gitlab_self_hosted: true
@@ -390,6 +398,7 @@ features:
     description: "GitLab is updated with new features and improvements every month on the 22nd."
     link_description: ""
     link:
+    include_on_features_page: false
     gitlab_com: true
     gitlab_ce: true
     gitlab_ees: true
@@ -401,6 +410,7 @@ features:
     description: "Other tools require the integration of multiple 3rd party tools to complete the software development lifecycle. GitLab has a completely integrated solution that covers the entire development lifecycle."
     link_description:
     link:
+    include_on_features_page: false
     gitlab_ce: true
     gitlab_ees: true
     gitlab_eep: true
@@ -568,13 +578,6 @@ features:
     gitlab_ce: false
     gitlab_ees: true
     gitlab_eep: true
-  - title: "Contributor Analytics"
-    description: "See detailed statistics about contributors in your projects"
-    link_description: "Learn more about Contributor Analytics"
-    link: https://docs.gitlab.com/ee/analytics/contribution_analytics.html
-    gitlab_ce: false
-    gitlab_ees: true
-    gitlab_eep: true
   - title: "Create and remove admins based on an LDAP group"
     description: "Use LDAP groups to create or remove admins from your GitLab instance."
     link_description: "Learn more about this feature"
@@ -604,7 +607,7 @@ features:
     gitlab_ees: true
     gitlab_eep: true
   - title: "Group webhooks"
-    description: ""
+    description: "Add webhooks by default to all projects in a group so you can ensure they are present everywhere."
     link_description: "Learn more about Group webhooks"
     link: https://docs.gitlab.com/ee/web_hooks/web_hooks.html
     gitlab_ce: false
@@ -615,7 +618,7 @@ features:
     hours_per_incident: 0.17
     incidents_per_year: 2
   - title: "Issue board with milestones"
-    description: ""
+    description: "Filter an issue board based on a milestone to review a sprint."
     link_description: "Learn more about issue boards with milestones"
     link: https://docs.gitlab.com/ee/user/project/issue_board.html#board-with-a-milestone
     gitlab_ce: false
@@ -629,7 +632,7 @@ features:
     gitlab_ees: true
     gitlab_eep: true
   - title: "Push rules"
-    description: ""
+    description: "Reject new code and commits that don't comply with company policy."
     link_description: "Learn more about push rules"
     link: https://docs.gitlab.com/ee/push_rules/push_rules.html
     gitlab_ce: false
@@ -651,7 +654,7 @@ features:
     hours_per_incident: 8
     incidents_per_year: 2
   - title: "Rebase before merge"
-    description: ""
+    description: "Create a linear history to make it easier to reason about changes."
     link_description: "Learn more about rebase before merge"
     link: https://docs.gitlab.com/ee/workflow/rebase_before_merge.html
     gitlab_ce: false
@@ -662,21 +665,21 @@ features:
     hours_per_incident: 0.08
     incidents_per_year: 75
   - title: "Squash and merge"
-    description: ""
+    description: "Combine commits into one so that main branch has a simpler to follow and revert history."
     link_description: "Learn more about squash and merge"
     link: https://docs.gitlab.com/ee/user/project/merge_requests/squash_and_merge.html
     gitlab_ce: false
     gitlab_ees: true
     gitlab_eep: true
   - title: "Fast-forward merge"
-    description: ""
+    description: "Merge a merge request in the web interface without creating a merge commit."
     link_description: "Learn more about fast-forward merge"
     link: https://docs.gitlab.com/ee/user/project/merge_requests/fast_forward_merge.html
     gitlab_ce: false
     gitlab_ees: true
     gitlab_eep: true
   - title: "Remote repository mirroring"
-    description: ""
+    description: "Mirror a repository from elsewhere on your local server."
     link_description: "Learn more about repository mirroring"
     link: https://docs.gitlab.com/ee/workflow/repository_mirroring.html
     gitlab_ce: false
@@ -710,19 +713,19 @@ features:
   - title: "Email all users of a project, group, or entire server"
     description: "An admin can email groups of users based on project or group membership, or email everyone using the GitLab instance. This is great for scheduled maintenance or upgrades."
     link_description: ""
-    link: 
+    link:
     gitlab_ce: false
     gitlab_ees: true
     gitlab_eep: true
   - title: "Limit project size at a global, group, and project level"
-    description: ""
+    description: "Ensure that disk space usage is under control."
     link_description: "Learn more about project size limiting"
     link: https://docs.gitlab.com/ee/user/admin_area/settings/account_and_limit_settings.html#repository-size-limit
     gitlab_ce: false
     gitlab_ees: true
     gitlab_eep: true
   - title: "Omnibus package supports log forwarding"
-    description: ""
+    description: "Forward your logs to a central system."
     link_description: "Learn more about log forwarding"
     link: https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md#udp-log-shipping-gitlab-enterprise-edition-only
     gitlab_ce: false
@@ -841,12 +844,117 @@ features:
     hours_per_incident: 10
     incidents_per_year: 1
   - title: "Disaster Recovery (alpha)"
-    description: ""
+    description: "Fail over in minutes to another data-center"
     link_description: "Learn more about Disaster Recovery"
     link: https://docs.gitlab.com/ee/gitlab-geo/disaster-recovery.html#gitlab-geo-disaster-recovery
     gitlab_ce: false
     gitlab_ees: false
     gitlab_eep: true
+  - title: "Lock project membership to group"
+    description: "Group owners can prevent new members from being added to projects within a group."
+    link_description: "Learn more about locking project membership to a group"
+    link: https://docs.gitlab.com/ee/workflow/groups.html#lock-project-membership-to-members-of-this-group
+    gitlab_ce: false
+    gitlab_ees: true
+    gitlab_eep: true
+  - title: "Export issues as CSV"
+    description: "Issues can be exported as CSV from GitLab and are sent to your default notification email as an attachment."
+    link_description: "Learn more about exporting issues as CSV"
+    link: https://docs.gitlab.com/ee/user/project/issues/csv_export.html
+    gitlab_ce: false
+    gitlab_ees: true
+    gitlab_eep: true
+  - title: "User roles"
+    description: "Manage access and permissions with five different user roles and settings for external users."
+    link_description: "Learn more about User Roles"
+    link: https://docs.gitlab.com/ce/user/permissions.html
+    screenshot_url: "images/feature_page/screenshots/02-user-roles.png"
+    gitlab_ce: true
+    gitlab_ees: true
+    gitlab_eep: true
+  - title: "Projects"
+    description: "Organize your repository into private, internal, or public projects."
+    link_description: "Learn more about Projects"
+    link: https://docs.gitlab.com/ce/README.html#projects-and-groups
+    screenshot_url: "images/feature_page/screenshots/01-projects.png"
+    gitlab_ce: true
+    gitlab_ees: true
+    gitlab_eep: true
+  - title: "Todos"
+    description: "When a user is mentioned in or assigned to a merge request it will be included in the user Todos, making the development workflow faster and easier to track."
+    screenshot_url: "images/feature_page/screenshots/06-todos.png"
+    link: https://docs.gitlab.com/ee/workflow/todos.html
+    link_description: "Learn more about Todos"
+    gitlab_ce: true
+    gitlab_ees: true
+    gitlab_eep: true
+  - title: "Merge Requests"
+    description: "Create merge requests and @mention team members to review and safely merge your changes."
+    screenshot_url: "images/feature_page/screenshots/07-merge-requests.png"
+    link: https://docs.gitlab.com/ee/user/project/merge_requests/
+    link_description: "Learn more about merge requests"
+    gitlab_ce: true
+    gitlab_ees: true
+    gitlab_eep: true
+  - title: "Merge conflict resolution"
+    description: "Preview merge conflicts in the GitLab UI and tell Git which version to use."
+    screenshot_url: "images/feature_page/screenshots/08-merge-conflicts.png"
+    link: https://docs.gitlab.com/ee/user/project/merge_requests/resolve_conflicts.html
+    link_description: "Learn more about the merge conflict resolution UI"
+    gitlab_ce: true
+    gitlab_ees: true
+    gitlab_eep: true
+  - title: "Merge request versions"
+    description: "View and compare merge request diffs from the merge request UI."
+    link: https://docs.gitlab.com/ce/user/project/merge_requests/versions.html
+    link_description: "Learn more about merge request versions"
+    gitlab_ce: true
+    gitlab_ees: true
+    gitlab_eep: true
+  - title: "Inline commenting and resolution"
+    description: "Leave comments and resolve discussions on specific lines of code."
+    link: https://docs.gitlab.com/ce/user/discussions/#resolvable-discussions
+    link_description: "Learn more about resolving discussions"
+    gitlab_ce: true
+    gitlab_ees: true
+    gitlab_eep: true
+  - title: "Cherry-pick changes"
+    description: "Use the cherry-pick button in the UI to isolate specific changes from a merge request."
+    link: https://docs.gitlab.com/ce/user/project/merge_requests/cherry_pick_changes.html
+    link_description: "Learn more about cherry-picking changes"
+    gitlab_ce: true
+    gitlab_ees: true
+    gitlab_eep: true
+  - title: "Activity Stream"
+    description: "View a list of the latest commits, merges, comments, and team members on your project."
+    screenshot_url: images/feature_page/screenshots/13-activity-stream.png
+    link: https://docs.gitlab.com/ee/user/profile/preferences.html#default-dashboard
+    link_description: "Learn more about the Activity Stream"
+    gitlab_ce: true
+    gitlab_ees: true
+    gitlab_eep: true
+  - title: "Custom Notifications"
+    description: "Be notified by email, Slack, or ToDos anytime there are changes to an issue or merge request."
+    screenshot_url: images/feature_page/screenshots/14-customized-notifications.png
+    link: https://docs.gitlab.com/ee/workflow/notifications.html
+    link_description: "Learn more about Custom Notifications"
+    gitlab_ce: true
+    gitlab_ees: true
+    gitlab_eep: true
+  - title: "Autoscaling CI runners"
+    description: "You can automatically spin up and down VMs to make sure your builds get processed immediately and minimize costs."
+    link: https://docs.gitlab.com/runner/configuration/autoscale.html#overview
+    link_description: "Learn more about Autoscaling"
+    gitlab_ce: true
+    gitlab_ees: true
+    gitlab_eep: true
+  - title: ""
+    description: ""
+    link:
+    link_description: ""
+    gitlab_ce: true
+    gitlab_ees: true
+    gitlab_eep: true
   ## CI
   - title: "No installation needed"
@@ -1295,7 +1403,7 @@ features:
     link_description: "Learn from the Codepen team why they decided to use Issue Boards instead of Trello."
     link: /2017/01/27/codepen-welcome-to-gitlab/#project-management-everything-in-one-place
     gitlab_issue_boards: true
-    trello: true 
+    trello: true
   - title: "Consistent labels structure"
     description: "An Issue Board is based on its project's label structure, therefore, it applies the same descriptive labels to indicate placement on the board. GitLab Issue Boards not just position issue cards in a column, but also allows them to be in multiple boards and still have meaning without the context of a particular board."
     link_description: "Learn more about labels and Issue Boards"

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/

data/team.yml

@@ -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
@@ -710,18 +689,6 @@
   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: Chief Marketing Officer (CMO)
-  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
@@ -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

generators/direction.rb

@@ -58,7 +58,7 @@ class GitLabProject
    def tier_issues(tier)
      result = @instance.call("/projects/#{@id}/issues", "?labels=direction,#{tier}&state=opened&per_page=100&sort=asc")
-     result = result.select { |issue| issue["milestone"] && issue["milestone"]["due_date"] }
+     #result = result.select { |issue| issue["milestone"] && issue["milestone"]["due_date"] }
    end
    def name
@@ -89,7 +89,7 @@ end
 def tier_bullet(issue)
   output = "- [#{issue["title"]}](#{issue["web_url"]})"
-  output << " <kbd>#{issue["milestone"]["title"]}</kbd>"
+  output << " <kbd>#{issue["milestone"]["title"]}</kbd>" if issue["milestone"]
   output << "\n"
   output
 end
@@ -103,14 +103,11 @@ def generate_direction
     milestones = project.milestones
     milestones.each do |ms|
-      print ms["title"]
       if ms["due_date"] && Date.parse(ms["due_date"]) >= Date.today
         issues += project.milestone_direction_issues(ms["title"])
       end
     end
   end
-  print issues[0]
-  print issues.group_by{|issue| issue["milestone"]["title"]}.keys
   issues.group_by{|issue| issue["milestone"]["title"]}.each do |title, group|
     direction_output << "#### #{title} \n\n"
@@ -160,7 +157,11 @@ def tier_list(label)
     issues += project.tier_issues(label)
   end
   issues.sort_by! do |issue|
-    Date.parse issue["milestone"]["due_date"]
+    if issue["milestone"] && issue["milestone"]["due_date"]
+      Date.parse issue["milestone"]["due_date"]
+    else
+      Date.new(2050,1,1)
+    end
   end
   issues.each do |issue|
     output << tier_bullet(issue)

source/about/index.html.md

@@ -3,6 +3,9 @@ layout: markdown_page
 title: About Us
 ---
+- TOC
+{:toc}
+
 ## GitLab Inc.
 GitLab Inc. is a company based on the [GitLab open-source project](https://gitlab.com/gitlab-org/gitlab-ce/).
@@ -105,7 +108,8 @@ We promise that:
 ### What features are EE only
-When we make new features we ask ourselves, is this feature **more relevant for organizations that have more than 100 potential users**?
+If the wider community contributes a new feature they get to choose if it goes into CE or EE by sending the merge request to the repository they prefer (most go to CE). If the wider community contributes a feature already in EE to CE we use the process linked in [Contributing an EE only feature to CE
+](#contributing-an-ee-only-feature-to-ce). When GitLab Inc. makes a new features we ask ourselves, is this feature **more relevant for organizations that have more than 100 potential users**?
 If the answer is yes the feature is likely to be exclusive to EE.
 There are no features that are only useful to larger organizations, so for every EE features there will be smaller organizations that also need it. We're not saying that there are no small organizations that need the EE feature, just that we think that larger organizations are more likely to need it.
@@ -178,17 +182,12 @@ If you have time to give please help spread the word about GitLab by mentioning
 If you would like to give money please <a href="http://railsgirlssummerofcode.org/campaign/">donate to Rails Girls Summer of Code</a> in our name.
 ## Location
-GitLab is a community project with people participating from all over the world.
-GitLab Inc. has people in three continents to serve our customers better.
-Most of our customers are in the United States.
-
-Most of our team is distributed. We're proud to be [working remotely](https://about.gitlab.com/2014/07/03/how-gitlab-works-remotely/),
-using GitLab Issues to coordinate. We have a [Remote Manifesto](https://about.gitlab.com/2015/04/08/the-remote-manifesto/),
-our team members have shared their [experiences](https://about.gitlab.com/2015/06/17/highlights-to-my-first-remote-job/)
-in our blog and did a Q&A for [Remote.co](https://remote.co/company/gitlab/). You can taste a bit of the GitLab team culture by visiting
+GitLab is an open source project with [more than 1500 people](http://contributors.gitlab.com/) contributing from all over the world.
+GitLab Inc. has people in [more than 35 countries](https://about.gitlab.com/team/).
+We're proud to be [remote only](http://www.remoteonly.org/).
+You can taste a bit of the GitLab team culture by visiting
 our <a href="https://about.gitlab.com/culture/">culture page</a>.
-
 [This commit]: https://gitlab.com/gitlab-org/gitlab-ce/commit/0f43e98ef8c2da8908b1107f75b67cda2572c2c4
 [first version of GitLab CI]: https://gitlab.com/gitlab-org/gitlab-ci/commit/52cd500ee64a4a82b9ff6752ee85028cd419fcbe
 [GitLab Enterprise Edition]: https://about.gitlab.com/2013/08/22/introducing-gitlab-6-0-enterprise-edition/

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