.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: []

.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/
@@ -22,10 +24,15 @@ Due date: MM/DD (6th working day before the 22nd)
 - [ ] Omnibus improvements
 - [ ] Deprecations
 - [ ] Documentation links
+- [ ] Add features to `data/features.yml`
 - [ ] Authorship (author's data)
 ### 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)
@@ -43,6 +50,7 @@ Due date: MM/DD (2nd working day before the 22nd)
   - [ ] Title
   - [ ] Description
   - [ ] Grammar, spelling, clearness (body)
+- [ ] Marketing review (PMM, CMM)
 - [ ] Final review (Job)
 #### Structural Check

.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

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
 }

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
@@ -476,10 +488,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,34 @@
   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
+  
+  
+- 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/gitlab_com.yml

 prices:
-  - title: Free Plan
+  free_plan:
+    title: Free Plan
     support: Unlimited private projects and collaborators
     monthly: Free
     description:
@@ -7,8 +8,8 @@ prices:
     features: Community Edition <a href="/products/#comparison">features</a>*
     link: https://gitlab.com/users/sign_in
     link_text: Sign Up
-  - title: Bronze Plan
-    support: Next business day support
+  bronze_plan:
+    title: Bronze Plan
     paid: true
     monthly: $4
     yearly: $48
@@ -16,9 +17,9 @@ prices:
       2,000 CI pipeline minutes per month
     features: Enterprise Edition Starter <a href="/products/#comparison">features</a>*
     link: https://customers.gitlab.com/subscriptions/new?plan_id=2c92a0ff5a840412015aa3cde86f2ba6
-    link_text: Buy now
-  - title: Silver Plan
-    support: Next business day support
+    link_text: Buy Now
+  silver_plan:
+    title: Silver Plan
     paid: true
     monthly: $19
     yearly: $228
@@ -27,8 +28,8 @@ prices:
     features: Enterprise Edition Premium <a href="/products/#comparison">features</a>*
     link: https://customers.gitlab.com/subscriptions/new?plan_id=2c92a0fd5a840403015aa6d9ea2c46d6
     link_text: Buy Now
-  - title: Gold Plan
-    support: 4-hour support response time
+  gold_plan:
+    title: Gold Plan
     paid: true
     monthly: $99
     yearly: $1188
@@ -52,7 +53,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.
@@ -83,10 +84,13 @@ questions:
   - 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 there a status page for GitLab.com?
+  - question: Is GitLab.com functioning OK?
     answer:
-      Yes, find it at [status.gitlab.com](https://status.gitlab.com/).
-  - question: What features are not included?
+      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,11 +2,15 @@ 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'
     desc: 'Official Helm repository'
+  - url: 'https://docs.gitlab.com/ee/install/google_cloud_platform/index.html'
+    name: 'Google Cloud Platform'
+    logo: '/images/logos/google-cloud-logo.svg'
+    desc: 'Official Google Cloud Launcher apps'
   - url: '/2016/06/28/get-started-with-openshift-origin-3-and-gitlab'
     name: 'RedHat OpenShift'
     logo: '/images/logos/openshift-logo.svg'
@@ -56,7 +60,7 @@ official:
     logo: '/images/logos/gitlab-logo.svg'
 community:
-  - url: 'http://packages.ubuntu.com/search?keywords=gitlab&searchon=names&suite=all&section=all'
+  - url: 'https://launchpad.net/ubuntu/+source/gitlab/'
     name: 'Ubuntu package'
     logo: '/images/logos/ubuntu-logo.svg'
     desc: 'by Masters of the Universe'
@@ -76,10 +80,6 @@ community:
     name: 'Ansible playbook'
     logo: '/images/logos/ansible-logo.svg'
     desc: 'by Ben Kochie'
-  - url: 'https://launchpad.net/ubuntu/+source/gitlab/'
-    name: 'Debian package'
-    logo: '/images/logos/debian-logo.svg'
-    desc: 'by Pirate Praveen'
   - url: 'http://www.freshports.org/www/gitlab'
     name: 'FreeBSD package'
     logo: '/images/logos/free-bsd-logo.svg'
@@ -92,10 +92,6 @@ community:
     name: 'Vagrant option'
     desc: 'by Tuomo Tanskanen'
     logo: '/images/logos/vagrant-logo.svg'
-  - url: 'https://gitlab.com/gitlab-org/gitlab-recipes/'
-    name: 'GitLab recipes'
-    desc: 'Using GitLab with different software'
-    logo: '/images/logos/gitlab-logo.svg'
   - url: 'https://jujucharms.com/u/spiculecharms/gitlab-server/1'
     name: 'GitLab Juju'
     desc: 'by Spicule IT Systems'
@@ -104,3 +100,7 @@ community:
     name: 'Fedora package'
     desc: 'Help contribute'
     logo: '/images/logos/fedora-logo.svg'
+  - url: 'https://gitlab.com/gitlab-org/gitlab-recipes/'
+    name: 'GitLab recipes'
+    desc: 'Using GitLab with different software'
+    logo: '/images/logos/gitlab-logo.svg'

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
@@ -199,8 +209,20 @@
   apply:
   open: false
+- title: "Federal Solutions Architect"
+  description: /jobs/federal-solutions-architect/
+  salary: 129311
+  apply: https://gitlab.workable.com/jobs/514880/candidates/new
+  open: true
+
 # 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 +250,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,9 +267,19 @@
   apply:
   open: false
+- title: "Performance Lead"
+  description: /jobs/performance-lead
+  apply:
+  open: false
+
 - title: "Senior Product Marketing Manager"
   description: /jobs/senior-product-marketing-manager/
-  apply: https://gitlab.workable.com/jobs/202183/candidates/new
+  apply:
+  open: false
+
+- title: "Director of Product Marketing"
+  description: /jobs/director-product-marketing
+  apply: https://gitlab.workable.com/jobs/512970/candidates/new
   open: true
 - title: "Product Manager"
@@ -294,15 +332,23 @@
 - title: "Support Engineer - EMEA "
   description: /jobs/support-engineer/
   salary: 75500
-  apply:
-  open: false
-- title: "Solutions Architect (Customer Success)"
+  apply: https://gitlab.workable.com/jobs/87722/candidates/new
+  open: true
+- title: "Solutions Architect - Customer Success"
   description: /jobs/solutions-architect/
   salary: 129311
   apply: https://gitlab.workable.com/jobs/242971/candidates/new
   open: true
+- title: "Solutions Architect - Customer Success (EMEA)"
+  description: /jobs/solutions-architect/
+  salary: 129311
+  apply: https://gitlab.workable.com/jobs/242971/candidates/new
+  open: true
+
+
+
 # Ordered alphabetically **by job description URL**
 - title: "Support Lead"
@@ -334,6 +380,12 @@
   apply:
   open: false
+- title: "Technical Writing Lead"
+  description: /jobs/technical-writing-lead/
+  salary:
+  apply: https://gitlab.workable.com/jobs/515784/candidates/new
+  open: true
+
 - title: "UX Lead"
   description: /jobs/ux-lead/
   salary: 85843
@@ -362,9 +414,9 @@
   apply:
   open: false
-- title: "Senior Web/UX Designer"
+- title: "Web/UX Designer"
   description: /jobs/web-ux-designer/
-  apply: https://gitlab.workable.com/jobs/494761/candidates/new
-  open: true
+  apply:
+  open: false
   # Ordered alphabetically **by job description URL**

data/pets.yml

@@ -169,6 +169,11 @@
   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

data/platforms.yml

@@ -16,7 +16,6 @@
   install_commands: |
                     sudo apt-get install gitlab-ce
   install_commands_manual: |
-                    curl -LJO https://packages.gitlab.com/gitlab/gitlab-ce/packages/ubuntu/xenial/gitlab-ce-XXX.deb/download
                     dpkg -i gitlab-ce-XXX.deb
   dependency_commands: |
                     sudo apt-get install curl openssh-server ca-certificates postfix
@@ -37,7 +36,6 @@
   install_commands: |
                     sudo apt-get install gitlab-ce
   install_commands_manual: |
-                    curl -LJO https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce-XXX.deb/download
                     dpkg -i gitlab-ce-XXX.deb
   dependency_commands: |
                     sudo apt-get install curl openssh-server ca-certificates postfix

data/press.yml

@@ -61,3 +61,7 @@
 - title: "GitLab adds Buddybuild to Global Partnership Program"
   link: https://about.gitlab.com/press/releases/2017-01-25-buddybuild-press-release.html
   date: 2017-01-25
+
+- title: "GitLab adds Creationline to Global Partnership Program"
+  link: 2017-06-26-creationline-press-release.html
+  date: 2017-06-26

data/projects.yml

@@ -73,6 +73,13 @@ gitlab-com-runbooks:
     Describes system components, triage procedures, and commands to use in scenarios commonly faced
     by Gitlab.com production support engineers
+infrastructure:
+  name: Gitlab.com - infrastructure issue tracker
+  path: gitlab-com/infrastructure
+  link: https://gitlab.com/gitlab-com/infrastructure
+  description: |
+    Used to track the infrastructure work of GitLab.com itself
+
 gitlab-cookbooks:
   name: Gitlab.com - infrastructure node provisioning by role
   path: gitlab-cookbooks

data/promo.yml

-text: "Join our webcast, 'Getting Started with Git' on June 14th!"
-link: 'http://get.gitlab.com/getting-started-with-git/'
+text: "GitLab 9.3 Released with Code Quality, Multi-Project Pipeline Graphs, Improved Internationalization, and much more!"
+link: '/2017/06/22/gitlab-9-3-released/'