.gitlab-ci.yml

@@ -2,6 +2,8 @@ image: dev.gitlab.org:5005/gitlab/gitlab-build-images:www-gitlab-com
 variables:
   GIT_DEPTH: "4"
+  # Speed up middleman
+  NO_CONTRACTS: "true"
 before_script:
   - bundle install --jobs 4 --path vendor

.gitlab/merge_request_templates/Release-Post.md

-Release Post :tada:
+**Review Apps** link:  https://release-x-y.about.gitlab.com/YYYY/MM/22/gitlab-x-y-released/
+
+Release post :rocket:
 - Blog handbook: https://about.gitlab.com/handbook/marketing/blog/
 - Release post handbook: https://about.gitlab.com/handbook/marketing/blog/release-posts/
@@ -26,6 +28,10 @@ Due date: MM/DD (6th working day before the 22nd)
 ### Review
+Ideally, complete the review until the 4th working day before the 22nd,
+so that the 3rd and the 2nd working day before the release
+could be left for fixes and small improvements.
+
 #### Content review (PMs)
 Due date: MM/DD (2nd working day before the 22nd)

.gitlab/route-map.yml

@@ -14,6 +14,9 @@
 - source: /source\/(.*)\/template\..*/ # source/direction/template.html.md.erb
   public: '\1/' # direction/
+- source: /generators\/direction.rb/
+  public: 'direction/'
+
 # Other files
 - source: /source\/(.*)/ # source/images/blogimages/around-the-world-in-6-releases-cover.png
-  public: '\1' # images/blogimages/around-the-world-in-6-releases-cover.png
\ No newline at end of file
+  public: '\1' # images/blogimages/around-the-world-in-6-releases-cover.png

Gemfile

@@ -10,7 +10,7 @@ gem 'tzinfo-data', platforms: [:mswin, :mingw, :x64_mingw, :jruby]
 # Middleman Gems
 gem "middleman", "~> 4.2"
-gem "middleman-blog", git: "https://github.com/middleman/middleman-blog.git"
+gem "middleman-blog", "~> 4.0"
 gem "middleman-livereload"
 gem "middleman-minify-html"
 gem "middleman-autoprefixer"
@@ -27,6 +27,7 @@ gem "builder", "~> 3.0"
 gem "httparty"
 gem "stringex"
+gem "sassc"
 group :development, :test do
   gem 'docopt'

Gemfile.lock

-GIT
-  remote: https://github.com/middleman/middleman-blog.git
-  revision: c7650db4a49c9cad07b9f55b0493108d7255eb16
-  specs:
-    middleman-blog (4.0.1)
-      addressable (~> 2.3)
-      middleman-core (>= 4.0.0)
-      tzinfo (>= 0.3.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.0.2)
+    activesupport (5.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -19,7 +10,7 @@ GEM
       public_suffix (~> 2.0, >= 2.0.2)
     autoprefixer-rails (6.7.7.1)
       execjs
-    backports (3.7.0)
+    backports (3.8.0)
     builder (3.2.3)
     coffee-script (2.4.1)
       coffee-script-source
@@ -31,7 +22,7 @@ GEM
     contracts (0.13.0)
     diff-lcs (1.3)
     docopt (0.5.0)
-    dotenv (2.2.0)
+    dotenv (2.2.1)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
@@ -68,6 +59,10 @@ GEM
     middleman-autoprefixer (2.7.1)
       autoprefixer-rails (>= 6.5.2, < 7.0.0)
       middleman-core (>= 3.3.3)
+    middleman-blog (4.0.2)
+      addressable (~> 2.3)
+      middleman-core (~> 4.0)
+      tzinfo (>= 0.3.0)
     middleman-cli (4.2.1)
       thor (>= 0.17.0, < 2.0)
     middleman-core (4.2.1)
@@ -106,7 +101,7 @@ GEM
     mini_portile2 (2.1.0)
     mini_racer (0.1.9)
       libv8 (~> 5.3)
-    minitest (5.10.1)
+    minitest (5.10.2)
     multi_xml (0.6.0)
     nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
@@ -116,9 +111,9 @@ GEM
       tilt (>= 1.4.1, < 3)
     padrino-support (0.13.3.3)
       activesupport (>= 3.1)
-    parallel (1.11.1)
+    parallel (1.11.2)
     public_suffix (2.0.5)
-    rack (2.0.1)
+    rack (2.0.3)
     rack-livereload (0.3.16)
       rack
     rake (12.0.0)
@@ -139,7 +134,11 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    sass (3.4.23)
+    sass (3.4.24)
+    sassc (1.11.1)
+      bundler
+      ffi (~> 1.9.6)
+      sass (>= 3.3.0)
     scss_lint (0.52.0)
       rake (>= 0.9, < 13)
       sass (~> 3.4.20)
@@ -150,7 +149,7 @@ GEM
     tilt (2.0.7)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    uglifier (3.1.11)
+    uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
     yaml-lint (0.0.9)
@@ -164,13 +163,14 @@ DEPENDENCIES
   kramdown (~> 1.10)
   middleman (~> 4.2)
   middleman-autoprefixer
-  middleman-blog!
+  middleman-blog (~> 4.0)
   middleman-livereload
   middleman-minify-html
   middleman-syntax
   mini_racer (~> 0.1)
   nokogiri
   rspec (~> 3.5)
+  sassc
   scss_lint
   stringex
   tzinfo-data
@@ -178,4 +178,4 @@ DEPENDENCIES
   yaml-lint
 BUNDLED WITH
-   1.14.6
+   1.15.0

README.md

@@ -321,13 +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 the files under
-`data/comparisons/`.
+The [comparison page][comp] grabs its content automatically from 
+`data/comparisons.yml`.
 There are 3 files in total which you need to create or edit:
-- `data/comparisons/gitlab_vs_competitor.yml`: Create for new comparisons. Every
-  comparison page has its own yaml file. **Use underscores**
+- `data/comparisons.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

Rakefile

@@ -16,7 +16,7 @@ namespace :lint do
   desc "Lint YAML files"
   task :yaml do
     failed = 0
-    Dir["data/*.yml"].each do |yml|
+    Dir["data/**/*.yml"].each do |yml|
       lint = YamlLint.new(yml)
       failed = failed + lint.do_lint
     end
@@ -144,7 +144,6 @@ PDFS = %w{
   public/terms/print/gitlab_subscription_terms.pdf
   public/terms/print/gitlab_subscription_terms_sig.pdf
   public/high-availability/gitlab-ha.pdf
-  public/features/gitlab-features.pdf
   public/pdfs/the-eleven-rules-of-gitlab-flow.pdf
 }

data/applications.yml

@@ -432,6 +432,11 @@
       links:
         - 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. 
+      links:
+        - url: https://www.hashicorp.com/blog/announcing-terraform-enterprise-integration-for-gitlab/
+          title: Terraform
 - title: CMS Plugins
   id: cms-plugins
   applications:
@@ -445,6 +450,11 @@
       links:
         - url: http://dropfort.com
           title: www.dropfort.com
+    - title: Confluence
+      content: This plugin aims to provide a connection between Confluence and your GitLab server instance. It enables you to view issues, builds, merge requests and project information with simple to use macros.
+      links:
+        - url: https://rumpelcoders.atlassian.net/wiki/display/PLUG/GitLab+Connector+Plugin
+          title: GitLab Connector Plugin
 - title: GUI Git Clients
   id: gui-git-clients
   applications:
@@ -466,10 +476,10 @@
         - url: https://plugins.jetbrains.com/plugin/7447?pr=idea
           content: JetBrains integration plugin
     - title: Visual Studio
-      content: The Visual Studio Tools for Git is an extension for Team Explorer that provides source control integration for Git.
+      content: The Visual Studio IDE provides built-in source control integration for Git.
       links:
-        - url: https://visualstudiogallery.msdn.microsoft.com/abafc7d6-dcaa-40f4-8a5e-d6724bdb980c
-          title: visualstudiogallery
+        - url: https://visualstudio.com/
+          title: www.visualstudio.com
     - title: GitKraken
       content: The downright luxurious Git client for Windows, Mac & Linux.
       links:

data/contract_types.yml

@@ -7,7 +7,7 @@
 - country: Netherlands
   employee_factor: 0.8
 - country: United Kingdom
-  employee_factor: 0.85
+  employee_factor: 0.8
 - country: United States
   employee_factor: 1
 - country: '*'

data/events.yml

@@ -168,3 +168,13 @@
   location: Los Angeles, CA USA
   social_tags: OpenSourceSummit2017
   event_url: http://events.linuxfoundation.org/events/open-source-summit-north-america
+
+- topic: Building a Git reverse proxy in Go for Caddy
+  type: Talk
+  date: September 30, 2017
+  date_ends: September 30, 2017
+  description: |
+               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

data/features.yml

-- title: Support SLA
-  features:
-  - description: Community and support forums
-    in_ce: true
-    link: https://about.gitlab.com/support/
-  - description: Next business day support
-    in_ee: true
-    link: https://about.gitlab.com/support/
-  - description: 4-hr support response time
-    link: https://about.gitlab.com/features/premium-support/
-    in_eep: true
-  - description: End user & admin training
-    link: https://about.gitlab.com/features/premium-support/
-    in_eep: true
-  - description: 24/7 emergency support
-    link: https://about.gitlab.com/features/premium-support/
-    in_eep: true
-
-- title: Reporting and Publishing
-  features:
-  - description: Host static pages straight (with TLS and CNAME support) from GitLab using GitLab Pages
-    link: https://docs.gitlab.com/ce/user/project/pages/index.html
-    in_ce: true
-  - description: Cycle Analytics
-    link: https://docs.gitlab.com/ce/user/project/cycle_analytics.html
-    in_ce: true
-  - description: Contribution Analytics, see detailed statistics of contributors
-    link: https://docs.gitlab.com/ee/analytics/contribution_analytics.html
-    in_ee: true
-  - description: Audit log and events
-    link: https://docs.gitlab.com/ee/administration/audit_events.html
-    in_ee: true
-
-- title: Extended authentication and authorization integration
-  features:
-  - description: LDAP user authentication (also compatible with Active Directory)
-    link: https://docs.gitlab.com/ee/integration/ldap.html#gitlab-ldap-integration
-    in_ce: true
-  - description: Two-factor Authentication
-    link: https://docs.gitlab.com/ce/profile/two_factor_authentication.html
-    in_ce: true
-  - description: Central Authentication Service (CAS) integration
-    link: https://docs.gitlab.com/ce/integration/cas.html
-    in_ce: true
-  - description: Multiple LDAP server support (also compatible with Active Directory)
-    link: https://docs.gitlab.com/ee/integration/ldap.html#integrate-gitlab-with-more-than-one-ldap-server-enterprise-edition
-    in_ee: true
-  - description: LDAP group synchronization (also compatible with Active Directory)
-    link: https://docs.gitlab.com/ee/administration/auth/ldap-ee.html#group-sync
-    in_ee: true
-  - description: Create and remove admins based on an LDAP group
-    link: https://docs.gitlab.com/ee/integration/ldap.html#enabling-the-admin-group-feature
-    in_ee: true
-  - description: Kerberos user authentication
-    link: https://docs.gitlab.com/ee/integration/kerberos.html
-    in_ee: true
-  - description: Integrate with Atlassian Crowd
-    link: https://docs.gitlab.com/ce/integration/crowd.html
-    in_ee: true
-
-- title: Personal workflow management
-  features:
-  - description: Keyboard shortcuts
-    link: https://docs.gitlab.com/ce/workflow/shortcuts.html
-    in_ce: true
-  - description: Email notifications
-    link: https://docs.gitlab.com/ce/workflow/notifications.html
-    in_ce: true
-  - description: Todos
-    link: https://docs.gitlab.com/ce/workflow/todos.html
-    in_ce: true
-
-- title: Group management
-  features:
-  - description: Groups with multiple projects
-    link: https://docs.gitlab.com/ce/workflow/groups.html
-    in_ce: true
-  - description: Subgroups
-    link: https://docs.gitlab.com/ce/user/group/subgroups/
-    in_ce: true
-  - description: Share project with group
-    link: https://docs.gitlab.com/ce/workflow/share_projects_with_other_groups.html
-    in_ce: true
-  - description: Transfer project to group
-    link: https://docs.gitlab.com/ee/workflow/groups.html#transferring-an-existing-project-into-a-group
-    in_ce: true
-  - description: Lock project membership to group
-    link: https://docs.gitlab.com/ee/workflow/groups.html
-    in_ee: true
-  - description: Group webhooks
-    link: https://docs.gitlab.com/ee/web_hooks/web_hooks.html
-    in_ee: true
-
-- title: Team collaboration and issue management
-  features:
-  - description: GitLab flavored Markdown
-    link: https://docs.gitlab.com/ce/user/markdown.html
-    in_ce: true
-  - description: Wikis
-    link: https://docs.gitlab.com/ce/user/project/wiki/index.html
-    in_ce: true
-  - description: Issues
-    link: https://docs.gitlab.com/ce/user/project/issues/index.html
-    in_ce: true
-  - description: Issue templates
-    link: https://docs.gitlab.com/ee/user/project/description_templates.html#creating-issue-templates
-    in_ee: true    
-  - description: Single assignee per issue
-    link: https://docs.gitlab.com/ce/user/project/issues/issues_functionalities.html#3-assignee
-    in_ce: true
-  - description: Multiple assignees per issue
-    link: https://docs.gitlab.com/ce/user/project/issues/issues_functionalities.html#3-1-multiple-assignees-ees-eep
-    in_ee: true    
-  - description: Milestones
-    link: https://docs.gitlab.com/ce/user/project/milestones/index.html
-    in_ce: true
-  - description: Issue time tracking
-    link: https://docs.gitlab.com/ee/workflow/time_tracking.html
-    in_ce: true
-  - description: Due dates
-    link: https://docs.gitlab.com/ce/user/project/issues/due_dates.html
-    in_ce: true
-  - description: Labels
-    link: https://docs.gitlab.com/ce/user/project/labels.html
-    in_ce: true
-  - description: Issue weights
-    link: https://docs.gitlab.com/ee/workflow/issue_weight.html
-    in_ee: true
-  - description: Create merge request or branch from issue
-    link: https://docs.gitlab.com/ce/user/project/issues/issues_functionalities.html#18-new-merge-request
-    in_ce: true        
-  - description: Slash commands
-    link: https://docs.gitlab.com/ce/user/project/slash_commands.html
-    in_ce: true
-  - description: Single issue board per project
-    link: https://docs.gitlab.com/ce/user/project/issue_board.html
-    in_ce: true
-  - description: Multiple issue boards per project
-    link: https://docs.gitlab.com/ee/user/project/issue_board.html#multiple-issue-boards
-    in_ee: true
-  - description: Issue board with milestones
-    link: https://docs.gitlab.com/ee/user/project/issue_board.html#board-with-a-milestone
-    in_ee: true
-  - description: Issue board focus mode
-    link: https://docs.gitlab.com/ee/user/project/issue_board.html#focus-mode
-    in_ee: true
-  - description: Burndown charts
-    link: https://docs.gitlab.com/ee/user/project/milestones/index.html#burndown-charts
-    in_ee: true
-  - description: Export issues
-    link: https://docs.gitlab.com/ee/user/project/issues/csv_export.html
-    in_ee: true
-  - description: Service desk
-    link: https://docs.gitlab.com/ee/user/project/service_desk.html
-    in_eep: true
-  - description: JIRA integration
-    link: https://docs.gitlab.com/ce/user/project/integrations/jira.html
-    in_ce: true
-    
-- title: Development, merge requests, and code review
-  features:
-  - description: Snippets
-    link: https://docs.gitlab.com/ce/user/snippets.html
-    in_ce: true
-  - description: Fork project (with repo)
-    link: https://docs.gitlab.com/ce/workflow/forking_workflow.html
-    in_ce: true
-  - description: Develop code and manage branches
-    link: https://docs.gitlab.com/ce/workflow/web_editor.html
-    in_ce: true
-  - description: File finder
-    link: https://docs.gitlab.com/ce/workflow/file_finder.html
-    in_ce: true
-  - description: Git LFS (Large File Storage)
-    link: https://docs.gitlab.com/ce/workflow/lfs/manage_large_binaries_with_git_lfs.html
-    in_ce: true
-  - description: Protected tags
-    link: https://docs.gitlab.com/ce/user/project/protected_tags.html
-    in_ce: true
-  - description: Merge requests
-    link: https://docs.gitlab.com/ce/#issues-and-merge-requests-mrs
-    in_ce: true
-  - description: Merge request slash commands
-    link: https://docs.gitlab.com/ce/user/project/slash_commands.html
-    in_ce: true
-  - description: Merge request versions
-    link: https://docs.gitlab.com/ce/user/project/merge_requests/versions.html
-    in_ce: true
-  - description: Merge conflict resolution
-    link: https://docs.gitlab.com/ce/user/project/merge_requests/resolve_conflicts.html
-    in_ce: true
-  - description: Resolvable merge request discussions
-    link: https://docs.gitlab.com/ce/user/project/merge_requests/merge_request_discussion_resolution.html
-    in_ce: true
-  - description: Work in progress merge requests
-    link: https://docs.gitlab.com/ce/user/project/merge_requests/work_in_progress_merge_requests.html
-    in_ce: true
-  - description: Automatically merge when pipeline passes
-    link: https://docs.gitlab.com/ce/user/project/merge_requests/merge_when_pipeline_succeeds.html
-    in_ce: true
-  - description: Close issue triggers
-    link: https://docs.gitlab.com/ce/user/project/issues/automatic_issue_closing.html
-    in_ce: true
-  - description: Cherry-pick commit
-    link: https://docs.gitlab.com/ce/user/project/merge_requests/cherry_pick_changes.html#cherry-picking-a-commit
-    in_ce: true
-  - description: Cherry-pick merge request
-    link: https://docs.gitlab.com/ce/user/project/merge_requests/cherry_pick_changes.html#cherry-picking-a-merge-request
-    in_ce: true
-  - description: Revert commit
-    link: https://docs.gitlab.com/ce/user/project/merge_requests/revert_changes.html#reverting-a-commit
-    in_ce: true
-  - description: Revert merge request
-    link: https://docs.gitlab.com/ce/user/project/merge_requests/revert_changes.html#reverting-a-merge-request
-    in_ce: true
-  - description: Merge request templates
-    link: https://docs.gitlab.com/ee/user/project/description_templates.html#creating-merge-request-templates
-    in_ee: true
-  - description: Global code search
-    link: https://docs.gitlab.com/ee/integration/elasticsearch.html
-    in_ee: true
-  - description: Push rules
-    link: https://docs.gitlab.com/ee/push_rules/push_rules.html
-    in_ee: true
-  - description: Block secret file push
-    link: https://docs.gitlab.com/ee/push_rules/push_rules.html#prevent-pushing-secrets-to-the-repository
-    in_ee: true
-  - description: Protected branches
-    link: https://docs.gitlab.com/ee/user/project/protected_branches.html
-    in_ee: true
-  - description: Merge requests approvals
-    link: https://docs.gitlab.com/ee/workflow/merge_request_approvals.html
-    in_ee: true
-  - description: Rebase before merge
-    link: https://docs.gitlab.com/ee/workflow/rebase_before_merge.html
-    in_ee: true
-  - description: Squash before merge
-    link: https://docs.gitlab.com/ee/user/project/merge_requests/squash_and_merge.html
-    in_ee: true
-  - description: Fast forward merge
-    link: https://docs.gitlab.com/ee/user/project/merge_requests/fast_forward_merge.html
-    in_ee: true
-  - description: Remote repository mirroring
-    link: https://docs.gitlab.com/ee/workflow/repository_mirroring.html
-    in_ee: true
-  - description: File locking
-    link: https://docs.gitlab.com/ee/user/project/file_lock.html
-    in_eep: true
-
-- title: Chat integration
-  features:
-  - description: Slack notifications
-    link: https://docs.gitlab.com/ce/user/project/integrations/slack.html
-    in_ce: true
-  - description: Slack slash commands
-    link: https://docs.gitlab.com/ce/user/project/integrations/slack_slash_commands.html
-    in_ce: true
-  - description: Mattermost notifications
-    link: https://docs.gitlab.com/ce/user/project/integrations/mattermost.html
-    in_ce: true
-  - description: Mattermost slash commands
-    link: https://docs.gitlab.com/ce/user/project/integrations/mattermost_slash_commands.html
-    in_ce: true
-
-- title: Additional server management options
-  features:
-  - description: Branded Login Page
-    link: https://docs.gitlab.com/ee/customization/branded_login_page.html
-    in_ce: true
-  - description: Project importing from GitHub to GitLab
-    link: https://docs.gitlab.com/ce/workflow/importing/import_projects_from_github.html
-    in_ce: true
-  - description: Detailed monitoring of GitLab services with Prometheus
-    link: https://docs.gitlab.com/ee/administration/monitoring/prometheus/
-    in_ce: true
-  - description: An admin can email all users of a project, a group or the entire server
-    email: https://docs.gitlab.com/ee/tools/email.html
-    in_ee: true
-  - description: Omnibus package supports log forwarding
-    link: https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md#udp-log-shipping-gitlab-enterprise-edition-only
-    in_ee: true
-  - description: Project importing from GitLab.com to your private GitLab instance
-    link: https://docs.gitlab.com/ce/workflow/importing/import_projects_from_gitlab_com.html
-    in_ee: true
-  - description: Super-powered search using Elasticsearch
-    link: https://docs.gitlab.com/ee/integration/elasticsearch.html#sts=Elasticsearch_integration
-    in_ee: true
-  - description: Limit project size at a global, group and project level
-    link: https://docs.gitlab.com/ee/user/admin_area/settings/account_and_limit_settings.html#repository-size-limit
-    in_ee: true
-  - description: Auditor users
-    link: https://docs.gitlab.com/ee/administration/auditor_users.html
-    in_eep: true
-  - description: (Pivotal Tile)  Deploy GitLab as a pre-configured appliance
-    link: https://about.gitlab.com/2015/11/03/pivotal-cloud-foundry-tile-for-gitlab-ee/
-    in_eep: true
-  - description: (GitLab Geo) Geographically replicated instance
-    link: https://about.gitlab.com/features/gitlab-geo/
-    in_eep: true
-  - description: Support for High Availability
-    link: https://about.gitlab.com/high-availability/
-    in_eep: true
-  - description: Disaster Recovery (alpha)
-    link: https://docs.gitlab.com/ee/gitlab-geo/disaster-recovery.html#gitlab-geo-disaster-recovery
-    in_eep: true
-
-- title: Deeper integration with your tool stack
-  features:
-  - description: Mention JIRA ticket from GitLab
-    link: https://docs.gitlab.com/ce/project_services/jira.html
-    in_ce: true
-  - description: Reference JIRA issues with GitLab commits, merge requests and issues
-    link: https://docs.gitlab.com/ce/project_services/jira.html
-    in_ce: true
-  - description: Close JIRA issues with GitLab commits
-    link: https://docs.gitlab.com/ce/project_services/jira.html
-    in_ce: true
-  - description: Application performance monitoring with Prometheus
-    link: http://docs.gitlab.com/ce/user/project/integrations/prometheus.html
-    in_ce: true
-  - description: Omnibus package supports configuring an external PostgreSQL database
-    link: https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md#using-a-non-packaged-postgresql-database-management-server
-    in_ce: true
-  - description: Omnibus package supports configuring an external MySQL database
-    link: https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md#using-a-mysql-database-management-server-enterprise-edition-only
-    in_ee: true
-  - description: Display merge request status for builds on Jenkins CI
-    link: https://docs.gitlab.com/ee/integration/jenkins.html
-    in_ee: true
-
-- title: Continuous Integration
-  features:
-  - description: Continuous integration shipped along and fully integrated in the GitLab interface
-    in_ce: true
-    link: https://docs.gitlab.com/ce/ci/
-  - description: Configure CI builds using a versioned, flexible build script
-    in_ce: true
-    link: https://docs.gitlab.com/ce/ci/yaml/README.html
-  - description: Power your CI with Docker
-    in_ce: true
-    link: https://docs.gitlab.com/ce/ci/docker/using_docker_images.html
-  - description: Artifacts as output. Stored in GitLab and explorable
-    in_ce: true
-    link: https://docs.gitlab.com/ce/ci/build_artifacts/README.html
-  - description: Run your builds on any machine, architecture, infinitely scalable
-    in_ce: true
-    link: https://docs.gitlab.com/ce/ci/runners/README.html
-  - description: Trigger builds easily, allowing for extensive customization and integration with your existing tools
-    in_ce: true
-    link: https://docs.gitlab.com/ce/ci/triggers/README.html
-  - description: GitLab Container Registry for Docker images
-    in_ce: true
-    link: https://docs.gitlab.com/ce/container_registry/README.html
-  - description: Build pipelines
-    in_ce: true
-    link: https://docs.gitlab.com/ce/ci/pipelines.html
-  - description: Environments and deployments in CI
-    in_ce: true
-    link: https://docs.gitlab.com/ce/ci/environments.html
-  - description: Review Apps
-    in_ce: true
-    link: https://about.gitlab.com/features/review-apps/
-  - description: Deploy Boards
-    in_eep: true
-    link: https://docs.gitlab.com/ee/user/project/deploy_boards.html
-  - description:   Canary Deployments
-    in_eep: true
-    link: https://docs.gitlab.com/ee/user/project/deploy_boards.html#canary-deployments

data/gitlab_com.yml

@@ -52,7 +52,7 @@ questions:
       No. We will only restrict your minutes for our shared runners. If you have a <a href="https://docs.gitlab.com/runner/">specific runner setup for your projects</a>, there is no limit to your build time on GitLab.com.
   - question: Is there a catch with the free forever plan?
     answer:
-      There is no catch. GitLab.com allows you to have unlimited free private repositories and collaborators.
+      There is no catch. Part of <a href="https://about.gitlab.com/strategy/#sequence">our strategy sequence</a> is to make GitLab.com the most popular SaaS solution for private and public repositories. To achieve this goal you get unlimited public and private projects, and there is no limit to the number of collaborators on a project.
   - question: Can I acquire a mix of licenses?
     answer:
       No, all users in the group need to be on the same plan.
@@ -80,8 +80,16 @@ questions:
   - question: What counts towards the disk space?
     answer:
       The project and wiki repository, Git LFS files, attachments, build artifacts, and images in the container registry.
-  - question: >
-      *What features are not included?
+  - question: Where can I find detailed information on GitLab.com's settings, such as SSH host keys and its runners?
+    answer:
+      Please refer to [GitLab.com settings](/settings/) for information about SSH host keys, Runners and Pages settings.
+  - question: Is GitLab.com functioning OK?
+    answer:
+      For more information see our status page at [status.gitlab.com](https://status.gitlab.com/) and follow [@gitlabstatus](https://twitter.com/gitlabstatus) on twitter.
+  - question: Can I buy additional storage space for myself or my organisation?
+    answer: >
+      Not yet, but we are <a href="https://gitlab.com/gitlab-org/gitlab-ce/issues/30297#note_32311261" target="_blank">working on it</a>, you will soon be able to track your storage usage across all features and buy additional storage space for GitLab.com.
+  - question: What Enterprise Edition features are not offered on GitLab.com?
     answer: >
-      GitLab features that pertain to running your own instance and the following features:
-      Geo, LDAP (<a href="https://gitlab.com/gitlab-org/gitlab-ee/issues/1987">issue</a>), Audit user, Log forwarding, Limit project size, Pivotal Tile and MySQL support.
+      Features that are more relevant to self hosted instances:
+      LDAP (<a href="https://gitlab.com/gitlab-org/gitlab-ee/issues/1987">although we might add this</a>), Audit user, Geo, Log forwarding, Limit project size, Pivotal Tile, and MySQL support.

data/installation_methods.yml

@@ -2,7 +2,7 @@ official:
   - url: 'https://gitlab.com/gitlab-org/gitlab-ce/tree/master/docker'
     logo: '/images/logos/docker-logo.svg'
     name: 'Docker'
-    desc: 'Certified GitLab Docker Images'
+    desc: 'Official GitLab Docker Images'
   - url: 'http://docs.gitlab.com/ce/install/kubernetes/'
     name: 'Kubernetes'
     logo: '/images/logos/kubernetes-logo.svg'

data/issue_bash.yml

+- name: 2016 GitLab Issue Bash
+  start_date: 2016-12-3
+  end_date: 2016-12-4
+  contacts:
+    - markglenfletcher
+    - haynes
+    - ClemMakesApps
+  proposal: https://gitlab.com/gitlab-org/gitlab-ce/issues/17815
+- name: GitLab Issue Bash Q1 2017
+  start_date: 2017-3-4
+  end_date: 2017-3-5
+  contacts:
+    - markglenfletcher
+    - haynes
+    - ClemMakesApps
+  proposal: https://gitlab.com/gitlab-org/gitlab-ce/issues/27272
+- name: GitLab Issue Bash Q2 2017
+  start_date: 2017-6-3
+  end_date: 2017-6-4
+  contacts:
+    - markglenfletcher
+    - haynes
+    - blackst0ne
+  proposal: https://gitlab.com/gitlab-org/gitlab-ce/issues/29256
+- name: GitLab Issue Bash Q3 2017
+  start_date: 2017-9-2
+  end_date: 2017-9-3
+  contacts:
+    - markglenfletcher
+    - TBC
+- name: GitLab Issue Bash Q4 2017
+  start_date: 2017-12-2
+  end_date: 2017-12-3
+  contacts:
+    - markglenfletcher
+    - TBC

data/jobs.yml

@@ -11,10 +11,6 @@
   apply:
   open: false
-- title: "Data and Analytics Architect"
-  description: /jobs/data-and-analytics-architect/
-  apply:
-  open: false
 - title: "Recruiter"
   description: /jobs/recruiter/
@@ -27,7 +23,7 @@
   apply:
   open: false
-- title: "Account Executive (US West Coast & EMEA)"
+- title: "Account Executive (EMEA)"
   description: /jobs/account-executive/
   apply: https://gitlab.workable.com/jobs/88120
   open: true
@@ -104,11 +100,19 @@
 - title: "Community Advocate"
   description: /jobs/community-advocate/
+  salary: 55823
   apply:
   open: false
 - title: "Content Editor"
   description: /jobs/content-editor/
+  salary: 50400
+  apply:
+  open: false
+
+- title: "Content Marketing Manager"
+  description: /jobs/content-marketing-manager/
+  salary: 50400
   apply:
   open: false
@@ -130,6 +134,12 @@
   apply: https://gitlab.workable.com/jobs/106660/candidates/new
   open: false
+- title: "Developer Advocate"
+  description: /jobs/developer-advocate/
+  salary: 70200
+  apply:
+  open: false
+
 - title: "Security Specialist"
   description: /jobs/security-specialist
   salary: 87337
@@ -201,6 +211,12 @@
 # Ordered alphabetically **by job description URL**
+- title: "Field Marketing Manager"
+  description: /jobs/field-marketing-manager/
+  salary: 63434
+  apply:
+  open: false
+
 - title: "Frontend Engineer"
   description: /jobs/frontend-engineer/
   salary: 83132
@@ -228,6 +244,12 @@
   apply:
   open: false
+- title: "Online Marketing Manager"
+  description: /jobs/online-marketing-manager/
+  salary: 83345
+  apply:
+  open: false
+
 - title: "Open Application"
   description: /jobs/open-application/
   apply:
@@ -239,6 +261,11 @@
   apply:
   open: false
+- title: "Performance Lead"
+  description: /jobs/performance-lead
+  apply: https://gitlab.workable.com/jobs/398569/candidates/new
+  open: true
+
 - title: "Senior Product Marketing Manager"
   description: /jobs/senior-product-marketing-manager/
   apply: https://gitlab.workable.com/jobs/202183/candidates/new

data/organizations.yml

-- name: IBM
-  logo: /images/organizations/logo_ibm.svg
+- name: Comcast
+  logo: /images/organizations/logo_comcast.svg
 - name: SanDisk
   logo: /images/organizations/logo_sandisk.svg
 - name: RedHat

data/pets.yml

@@ -161,6 +161,20 @@
   picture: sina_ruby.jpg
   human: filipa
   story: Sisters. Ruby loves to run and play around. Sina(tra) loves food and naps. Both love to sit on their humans and ask to be petted.
+- name: Rusty
+  picture: rusty.png
+  human: nick.thomas
+  story: Rusty is a long-haired Syrian hamster. He's so big! Hobbies include hanging out in his coconut, terrorising cats in his transport sphere, and running miles every night on his flying saucer.
+- name: Cedric
+  picture: cedric.png
+  human: nick.thomas
+  story: A new arrival, Cedric was born on a farm in Shetland. He's still deciding what he wants to do with his life, but if he takes up acting, we'll make sure he doesn't join a popular series four films in.
+- name: Epi and Blas
+  picture: epiblas.jpg
+  human: victor.lopez
+  story: Despite their cute appearance (and when they are not asleep), they both enjoy chewing on things they aren't supposed to chew.
+
+
 - name: You?
   picture: ../logo-extra-whitespace.png
   story:  |

data/promo.yml

-text: "GitLab 9.2 Released with Multiple Assignees For Issues, Pipeline Schedules, and much more!"
-link: '/2017/05/22/gitlab-9-2-released/'
+text: "Join our webcast, 'Getting Started with Git' on June 14th!"
+link: 'http://get.gitlab.com/getting-started-with-git/'

data/resellers.yml

 #
-#- name: Emerasoft
-#  image: /images/resellers/emerasoft.png
-#  region: EMEA
-#  content: | 
-#   
-#    Emerasoft offer products, consulting and training services for Application Lifecycle Management, DevOps, Business Process Management, Service Oriented Architecture, Software Testing and Cyber Security.
-#    We work with Commercial and Open Source technologies, able to guarantee transparency, interoperability and proven ROI.
-#    
-#    Le diverse esperienze si riflettono nella capacità di affrontare problemi eterogenei e complessi in modo professionale e qualificato.  
-#    La capacità di produrre e selezionare tecnologie allo stato dell’arte e stringere accordi di collaborazione continua nell’esplorazione di aree di frontiera nello sviluppo applicativo, stimolo e sfida a continuare un percorso di eccellenza e qualità.
-#
-#  email: GitLab@Emerasoft.com
-#  contact:
-#    - address: Turino, Italia
-#      phone: +39 (011) 012 0370
-#    - address: Roma, Italia
-#      phone: +39 (06) 8781 1323
-#    - website: https://www.emerasoft.com
-#  social:
-#    - type: twitter
-#      url: https://twitter.com/emerasoft
-#    - type: linkedin
-#      url: https://www.linkedin.com/company-beta/1203309/
-#    - type: facebook
-#      url: https://www.facebook.com/emerasoft
-#    - type: youtube
-#      url: https://www.youtube.com/user/Emerasoft
-#    - type: google-plus
-#      url: https://plus.google.com/u/1/+Emerasoft_solutionstocollaborate
-#  
+- name: Creationline
+  image: /images/resellers/creationline_logo_type-01_CMYK_01.png
+  region: APAC
+  content: | 
+   
+    Creationline is Japanese company providing solutions for cloud integration, microservices, IoT, big data, automation, DevOps.  We have a wide experience with enterprise customers, and strong relationships with our overseas vendors.
+
+    Creationlineはクラウドインテグレーション、マイクロサービス化、IoT、データ解析、インフラ構築・運用などの自動化を実現する技術ノウハウを持つテクノロジスト集団。 国内外の大手通信事業者、データセンター事業者、サービス提供事業者などに対して多くの実績を持っている。 DevOps、マイクロサービスを実現する上で必要な要素となる技術を持つDocker社、Chef社などの海外ベンダーとの強いパイプを持ち、最先端なテクノロジーを国内でスピード感を持って提供することができる数少ない企業である。
+
+  email: GitLab@CreationLine.com
+  contact:
+    - address: 東京、日本
+      phone: +81 (03) 5829-8355
+    - website: http://www.creationline.com/gitlab/
+  social:
+    - type: twitter
+      url: https://twitter.com/creationline
+    - type: facebook
+      url:  https://www.facebook.com/creationline/
 #
-#- name: Fierce Software
-#  image: /images/resellers/fierceSW.png
-#  region: NA
-#  content: | 
-#   
-#    Fierce Software is more than a trusted IT solutions provider. Yes, we provide Federal and Commercial
-#    organizations with information technology and business process solutions, but in order to ensure 
-#    success in today’s IT environments takes much more. 
-#    Our customers have the advantage of working alongside a trusted partner that will help you to identify 
-#    your needs, pinpoint the most innovative technologies and help implement the most effective solutions 
-#    all while keeping your best interests in the forefront of our process.
+- name: Emerasoft
+  image: /images/resellers/emerasoft.png
+  region: EMEA
+  content: | 
+   
+    Emerasoft is an Italian company providing IT products and services. We specialize in solving complex technical challenges, especially in the areas of ALM, DevOps, UX, OS, SOA, BPM, Software Testing & Security, Embedded Software Development, IT Service Management, Digital Publishing & App Development.
+    
+    Da oltre 10 anni Emerasoft offre prodotti, servizi di consulenza e formazione su tematiche quali ALM, DevOps, UX, OS, SOA, BPM, Software Testing e Security, Embedded Software Development, IT Service Management, Digital Publishing & App Development.
+
+  email: GitLab@Emerasoft.com
+  contact:
+    - address: Torino, Italia
+      phone: +39 (011) 012 0370
+    - address: Roma, Italia
+      phone: +39 (06) 8781 1323
+    - website: http://www.emerasoft.com/devops-servizi-consulenza-strumenti/gitlab/
+  social:
+    - type: twitter
+      url: https://twitter.com/emerasoft
+    - type: linkedin
+      url: https://www.linkedin.com/company-beta/1203309/
+    - type: facebook
+      url: https://www.facebook.com/emerasoft
+    - type: youtube
+      url: https://www.youtube.com/user/Emerasoft
+    - type: google-plus
+      url: https://plus.google.com/u/1/+Emerasoft_solutionstocollaborate
+    - type: gitlab   
+      url: https://gitlab.com/Emerasoft
+    - type: other
+      url: https://www.slideshare.net/emerasoft
+      
 #
-#  email: GitLab@FierceSW.com
-#  contact:
-#    - address: Ashburn/VA, USA
-#      phone: +1 (888)576-1572
-#    - website: https://www.fiercesw.com
-#  social:
-#    - type: twitter
-#      url: https://twitter.com/fierce_software
-#    - type: linkedin
-#      url: https://www.linkedin.com/company-beta/3721309/
-#    - type: facebook
-#      url: https://www.facebook.com/FierceSoftware/
-#    - type: youtube
-#      url: https://www.youtube.com/channel/UCyXXjI4aqn0rV_lKtvcdiLA/featured
-#    - type: other
-#      url: http://fiercesw.com/blog
-#  
+- name: Fierce Software
+  image: /images/resellers/logo_fiercesoftware-horizontal.png
+  region: NA
+  content: | 
+   
+    Fierce Software is more than a trusted IT solutions provider. Yes, we provide Federal and Commercial
+    organizations with information technology and business process solutions, but in order to ensure 
+    success in today’s IT environments takes much more. 
+    Our customers have the advantage of working alongside a trusted partner that will help you to identify 
+    your needs, pinpoint the most innovative technologies and help implement the most effective solutions 
+    all while keeping your best interests in the forefront of our process.
+
+  email: GitLab@FierceSW.com
+  contact:
+    - address: Ashburn/VA, USA
+      phone: +1 (888)576-1572
+    - website: https://www.fiercesw.com/gitlab
+  social:
+    - type: twitter
+      url: https://twitter.com/fierce_software
+    - type: linkedin
+      url: https://www.linkedin.com/company-beta/3721309/
+    - type: facebook
+      url: https://www.facebook.com/FierceSoftware/
+    - type: youtube
+      url: https://www.youtube.com/channel/UCyXXjI4aqn0rV_lKtvcdiLA/featured
+    - type: other
+      url: http://fiercesw.com/blog
+      
 #
 - name: ReleaseTEAM
   image: /images/resellers/release-team-logo.png
@@ -140,7 +162,7 @@
       
 #
 - name: Lyra Infosystems
-  image: /images/resellers/lyra-logo.svg
+  image: /images/resellers/LyraLogo.png
   region: APAC
   content: |
     Lyra is a recognized leader as Open Source Solution Enabler in Asia. We offer comprehensive suite of best-in-class technologies, solutions, support and services to software consuming organizations. Leading enterprises rely on our expertise to maximize their productivity and minimize risk by optimizing their SDLC processes. Our strategic consulting and services deliver high quality, on-demand solutions.
@@ -272,7 +294,7 @@
   contact:
     - address: 서울, 대한민국
       phone: +82 (02) 555-4847
-    - website: http://architectgroup.com/portfolio-item/gitlab/
+    - website: https://www.architectgroup.com/docs/gitlab/Introduction/Overview.html
   social:
     - type: facebook
       url: https://www.facebook.com/openarchitect/