.gitlab-ci.yml

 # Note that the rspec job below uses a different image that also
 # includes chromedriver. If we update the Ruby version for this image,
 # we should also update it for the rspec job.
-image: dev.gitlab.org:5005/gitlab/gitlab-build-images:www-gitlab-com-2.4
+image: dev.gitlab.org:5005/gitlab/gitlab-build-images:www-gitlab-com-2.6
 variables:
   GIT_DEPTH: "10"
@@ -23,7 +23,7 @@ variables:
 before_script: [*install]
 cache:
-  key: "web_ruby-2.4.4"
+  key: "web_ruby-2.6"
   paths:
     - tmp/cache
     - vendor
@@ -90,7 +90,7 @@ rubocop:
     - gitlab-org
 .rspec_job: &rspec_job
-  image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.5-git-2.18-chrome-69.0-docker-18.06.1
+  image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-git-2.21-chrome-74.0-docker-18.06.1
   stage: build
   script:
     - bundle exec rspec
@@ -163,16 +163,7 @@ generate-handbook-changelog:
   stage: build
   script:
     - bundle exec bin/generate_handbook_changelog
-  only:
-    - schedules
-  tags:
-    - gitlab-org
-
-generate-handbook-changelog-rss:
-  stage: build
-  script:
     - bundle exec bin/generate_handbook_changelog_rss
-  allow_failure: true
   only:
     - schedules
   tags:

.gitlab/CODEOWNERS

@@ -2,12 +2,12 @@
 /source/handbook/ceo/kpis @tayloramurphy @tlapiana @emilie @amrvaljevich @cathyr @eli_kastelein
 # Product
-/source/direction/ @markpundsack @jobv
-/source/handbook/product/ @markpundsack
-/source/handbook/product/categories/ @markpundsack@edjdev @sytses
-/data/depts.yml @markpundsack @edjdev @sytses
-/data/stages.yml @markpundsack @edjdev @sytses
-/data/categories.yml @markpundsack @sytses
+/source/direction/ @markpundsack @sfwgitlab
+/source/handbook/product/ @markpundsack @sfwgitlab
+/source/handbook/product/categories/ @markpundsack@edjdev @sfwgitlab @sytses
+/data/depts.yml @markpundsack @sfwgitlab @edjdev @sytses
+/data/stages.yml @markpundsack @sfwgitlab @edjdev @sytses
+/data/categories.yml @markpundsack @sfwgitlab @sytses
 # Engineering
@@ -15,10 +15,12 @@
 /source/handbook/engineering/development/ @clefelhocz1
 /source/handbook/engineering/development/dev/ @timzallmann
 /source/handbook/engineering/development/dev/plan/ @smcgivern
+/source/handbook/engineering/development/dev/create-source-code-be/ @DouweM
+/source/handbook/engineering/development/dev/create-knowledge-be/ @dsatcher
+/source/handbook/engineering/development/dev/create-editor-be/ @dsatcher
 /source/handbook/engineering/development/enablement/geo/ @rnienaber
 /source/handbook/engineering/development/enablement/distribution/ @twk3
 /source/handbook/engineering/development/enablement/fulfillment/ @jameslopez
-/source/handbook/engineering/dev-backend/create/ @DouweM
 /source/handbook/engineering/dev-backend/manage/ @lmcandrew
 /source/handbook/engineering/frontend/ @timzallmann
 /source/handbook/engineering/infrastructure/ @glopezfernandez

.gitlab/issue_templates/Blog post.md

-<!-- See https://about.gitlab.com/handbook/marketing/blog/ for details on the blog process -->
+<!-- PLEASE READ: See https://about.gitlab.com/handbook/marketing/blog/ for details on the blog process. Unless you are just suggesting a blog post idea, you will need to create the formatted merge request for your blog post in order for it to be reviewed and published. -->
 ### Proposal
@@ -8,7 +8,7 @@
 - [ ] If you have a specific publish date in mind
   - [ ] Include it in the issue title
-  - [ ] Give the issue a due date of 2 working days prior
+  - [ ] Give the issue a due date of a minimum of 2 working days prior
 - [ ] If [time sensitive](https://about.gitlab.com/handbook/marketing/blog/#time-sensitive-posts-official-announcements-company-updates-breaking-changes-and-news)
   - [ ] Added ~"priority" label
   - [ ] Mentioned `@rebecca` to give her a heads up ASAP

.gitlab/issue_templates/Development retro.md

@@ -34,4 +34,4 @@ Please try to group by *topic* rather than by *team*, as suggested in #3416. Let
 | Secure              | @plafoucriere + @leipert + @twoodham   |  |  |
 | UX                  | @clenneville    |  |  |
 | Verify              | @erushton + @jhampton |  |  |
-| Release             | @darbyfrey + @jhampton |  |  |
+| Release             | @darbyfrey + @jhampton |  |  |
\ No newline at end of file

.gitlab/merge_request_templates/Applications.md

@@ -7,7 +7,8 @@ For the contribution process and guidelines, please check
 Checklist:
-1. [ ] Application's data added to [`data/applications.yml`](https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/data/applications.yml)
+1. [ ] Application's data added to [`data/applications.yml`](https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/data/applications.yml) (to the end of the category)
 1. [ ] Application's logo added to [`source/images/applications/apps/`](https://gitlab.com/gitlab-com/www-gitlab-com/tree/master/source/images/applications/apps) (optional, but recommended)
-1. [ ] Eliran's review - cc/ @eliran.mesika
+1. [ ] Label the MR with ~"Partners (== Applications)" ~"Community Contribution"  and assign the current milestone
+1. [ ] Mayank Tahilramani's review - cc/ @mayanktahil
 1. [ ] Tech writer's review

.gitlab/merge_request_templates/Blog post.md

-<!-- See https://about.gitlab.com/handbook/marketing/blog/ for details on the blog process -->
-### What is this blog post about?
-
-<!-- What do you want to blog about? Add your description here -->
-
-### What are the relevant issue numbers?
-
-<!-- All blog posts should have a corresponding issue. Create an issue now if needed and add the link below -->
+<!-- PLEASE READ: See https://about.gitlab.com/handbook/marketing/blog/ for details on the blog process -->
+<!-- All blog posts should have a corresponding issue. Create an issue now if you haven't already, and add the link in place of the placeholder link below -->
 Closes https://gitlab.com/gitlab-com/www-gitlab-com/issues/XXXX
 ### Checklist
 - [ ] Link to issue added, and set to close when this MR is merged
-- [ ] Due date and milestone added for the desired publish date
+- [ ] Due date and milestone (if applicable) added for the desired publish date
 - [ ] If [time sensitive](https://about.gitlab.com/handbook/marketing/blog/#time-sensitive-posts-official-announcements-company-updates-breaking-changes-and-news)
   - [ ] Added ~"priority" label
   - [ ] Mentioned `@rebecca` to give her a heads up ASAP
-- [ ] Reviewed by team member
+- [ ] Blog post file formatted correctly, including any accompanying images
+- [ ] Review app checked for any formatting issues
+- [ ] Reviewed by fellow team member
 - [ ] Reviewed by [content team](https://about.gitlab.com/handbook/marketing/blog/#editorial-reviews)
 /label ~"blog post"

.gitlab/merge_request_templates/Release-Post.md

@@ -24,9 +24,9 @@ _People:_
 - Release Post Managers: https://about.gitlab.com/handbook/marketing/blog/release-posts/managers/
 - Release Managers: https://about.gitlab.com/community/release-managers/
-| Release post manager | Tech writer | Copy edit | Messaging | Social |
-| --- | --- | --- | --- | --- |
-| `@mention` | `@mention` | `@mention` | `@mention` | `@mention` |
+| Release post manager | Tech writer | Messaging | Social |
+| --- | --- | --- | --- |
+| `@mention` | `@mention` |`@mention` | `@mention` |
 ### General contributions
@@ -79,7 +79,6 @@ owning the related area:
 - [ ] Add GitLab Runner improvements: `@brendan`
 - [ ] Add Omnibus improvements: `@ebrinkman`
 - [ ] Add Mattermost update to the Omnibus improvements section: `@ebrinkman`
-- [ ] Add Performance improvements: `@DouweM`, `@smcgivern`, `@ayufan`, `@yorickpeterse`
 #### Feature blocks
@@ -184,7 +183,7 @@ The [structural review](https://about.gitlab.com/handbook/marketing/blog/release
   Review app: https://release-X-Y.about-src.gitlab.com/YYYY/MM/DD/gitlab-X-Y-released/
   ```
 - [ ] Remove the label ~review-structure.
-- [ ] Assign the MR to the next reviewer (copyedit).
+- [ ] Assign the MR to the next reviewer (Marketing).
 #### Further reviews

.gitlab/route-map.yml

@@ -4,7 +4,7 @@
 # Team data
 - source: 'data/team.yml' # data/team.yml
-  public: 'team/' # team/
+  public: 'company/team/' # company/team/
 # Pets data
 - source: 'data/pets.yml'

.ruby-version

-2.4.4
+2.6.3

CONTRIBUTING.md

@@ -19,7 +19,7 @@ Thank you for your interest and help!
 We don't mind people inside and outside the company making suggestions to change significant things.
 Feel free to make a proposal, we can discuss anything and if we don't agree we'll feel free not to merge it and we'll thank you for caring about it.
-We want to create a welcoming environment for everyone who is interested in contributing. Please visit our [Code of Conduct page](https://about.gitlab.com/contributing/code-of-conduct) to learn more about our committment to an open and welcoming environment.
+We want to create a welcoming environment for everyone who is interested in contributing. Please visit our [Code of Conduct page](https://about.gitlab.com/contributing/code-of-conduct) to learn more about our commitment to an open and welcoming environment.
 If you submit blog post contributions, those contributions are also governed by the Contributor License Agreements linked to below. This means that copyright of submitted materials will belong to GitLab, but under the Creative Commons license you are free to re-use the material with attribution.

Gemfile

@@ -48,4 +48,5 @@ group :development, :test do
   gem 'capybara'
   gem 'capybara-screenshot'
   gem 'selenium-webdriver'
+  gem 'webmock'
 end

Gemfile.lock

@@ -37,6 +37,8 @@ GEM
       i18n_data (~> 0.8.0)
       sixarm_ruby_unaccent (~> 1.1)
       unicode_utils (~> 1.4)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
     docopt (0.6.1)
     dotenv (2.6.0)
@@ -69,6 +71,7 @@ GEM
       tilt
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
+    hashdiff (0.3.9)
     hashie (3.6.0)
     html-proofer (3.10.2)
       activesupport (>= 4.2, < 6.0)
@@ -210,6 +213,7 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.10.0)
     rubyzip (1.2.2)
+    safe_yaml (1.0.5)
     sassc (2.0.0)
       ffi (~> 1.9.6)
       rake
@@ -233,6 +237,10 @@ GEM
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.4.1)
     unicode_utils (1.4.0)
+    webmock (3.5.1)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yell (2.0.7)
@@ -269,6 +277,7 @@ DEPENDENCIES
   stringex
   tzinfo-data
   wdm (~> 0.1.0)
+  webmock
 BUNDLED WITH
    1.17.3

bin/sync-employee-number

+#!/usr/bin/env ruby
+
+require 'csv'
+require 'optparse'
+require 'set'
+require 'yaml'
+
+require_relative '../lib/bamboohr'
+
+TEAM_YML = 'data/team.yml'.freeze
+
+# Parse command-line options
+options = {}
+OptionParser.new do |opts|
+  opts.on('--csv FILE', 'Write results to a CSV file') do |v|
+    options[:csv] = v
+  end
+  opts.on('-n', '--dry-run', 'Only show what would happen') do |v|
+    options[:dryrun] = v
+  end
+end.parse!
+
+# Load team.yml
+raise "File #{TEAM_YML} not found!" unless FileTest.exist? TEAM_YML
+
+team_entries = YAML.load_file(TEAM_YML)
+
+# Load BambooHR data
+api_token = ENV['BAMBOOHR_API_TOKEN']
+if api_token.nil?
+  puts 'Please enter your BambooHR API token:'
+  api_token = STDIN.gets.chomp
+end
+raise 'No BambooHR API token!' if api_token.nil?
+
+client = BambooHR::Client.new(api_token)
+bamboo_entries = client.employees
+
+matches, misses = BambooHR::Matcher.match(bamboo_entries, team_entries)
+
+matches.each do |(bamboo_entry, team_entry)|
+  team_entry['bamboohr_id'] = bamboo_entry.bamboohr_id
+  puts "Match: #{bamboo_entry.name} (#{bamboo_entry.bamboohr_id}) = #{team_entry['name']} (#{team_entry['slug']})"
+end
+misses.each do |miss|
+  puts "Miss: #{miss.name} (#{miss.bamboohr_id})"
+end
+
+puts "#{matches.length} Match(es), #{misses.length} Miss(es)"
+
+if options[:csv]
+  headers = %w[type bamboohr_id bamboohr_name team_name team_slug]
+  CSV.open(options[:csv], 'wb', write_headers: true, headers: headers) do |csv|
+    matches.each do |(bamboo_entry, team_entry)|
+      csv << ['match', bamboo_entry.bamboohr_id, bamboo_entry.name, team_entry['name'], team_entry['slug']]
+    end
+    misses.each do |miss|
+      csv << ['miss', miss.bamboohr_id, miss.name, '', '']
+    end
+  end
+end
+
+File.write(TEAM_YML, YAML.dump(team_entries)) unless options[:dryrun]

config.rb

@@ -79,6 +79,7 @@ configure :build do
       wishlist = {}
       product_vision_content = {}
       direction_all_content = nil
+      direction_cicd_content = nil
       # Create threads to fetch content for shared pages
       direction = Generators::Direction.new
@@ -87,6 +88,7 @@ configure :build do
       threads << Thread.new { wishlist = direction.generate_wishlist } # wishlist, shared by most pages
       threads << Thread.new { product_vision_content = direction.generate_product_vision } # /direction/product-vision/
       threads << Thread.new { direction_all_content = direction.generate_direction(Generators::Direction::TEAMS) } # /direction/
+      threads << Thread.new { direction_cicd_content = direction.generate_direction(Generators::Direction::CICD_TEAMS) } # /direction/cicd/
       Generators::Direction::TEAMS.each do |name|
         # Create threads to fetch content for per-team pages
         threads << Thread.new { content[name] = direction.generate_direction(%W[#{name}]) } # /direction/name/
@@ -98,6 +100,7 @@ configure :build do
       proxy '/direction/product-vision/index.html', '/direction/product-vision/template.html', locals: { product_vision: product_vision_content }, ignore: true
       proxy '/direction/index.html', '/direction/template.html', locals: { direction: direction_all_content, wishlist: wishlist }, ignore: true
       proxy '/upcoming-releases/index.html', '/upcoming-releases/template.html', locals: { direction: direction_all_content }, ignore: true
+      proxy '/direction/cicd/index.html', '/direction/cicd/template.html', locals: { direction: direction_cicd_content }, ignore: true
       Generators::Direction::TEAMS.each do |name|
         # And for team pages
@@ -141,7 +144,7 @@ end
 # Category pages for /product
 data.categories.each do |key, category|
   next if category.alt_link
-  next unless category.available && (category.available <= Date.today)
+  next unless category.maturity && (category.maturity != "planned")
   proxy "/product/#{key.dup.tr('_', '-').downcase}/index.html", '/product/template.html', locals: {
     category: category,
@@ -231,6 +234,7 @@ ignore '/direction/product-vision/template.html'
 ignore '/direction/manage/template.html'
 ignore '/direction/plan/template.html'
 ignore '/direction/create/template.html'
+ignore '/direction/cicd/template.html'
 ignore '/direction/verify/template.html'
 ignore '/direction/package/template.html'
 ignore '/direction/release/template.html'

data/applications.yml

@@ -576,6 +576,11 @@
           title: About Zulip
         - url: https://zulipchat.com/integrations/#gitlab
           title: Zulip's GitLab integration
+    - title: Userback
+      content: Receive & manage your product bugs and UI/UX issues with annotated screenshots directly in GitLab.
+      links:
+        - url: https://www.userback.io/integration/gitlab
+          title: www.userback.io
 - title: Continuous Integration
   id: continuous-integration
   applications:
@@ -842,7 +847,7 @@
         - url:  "https://support.crowdin.com/gitlab-integration/"
           title: GitLab integration documentation
     - title: POEditor
-      content: Collaborative translation platform and localization management software. The integration with GitLab connects the translations in POEditor projects with language files in GitLab repos, simplifying translation management and syncronization.
+      content: Collaborative translation platform and localization management software. The integration with GitLab connects the translations in POEditor projects with language files in GitLab repos, simplifying translation management and synchronization.
       links:
         - url: https://poeditor.com/
           title: POEditor
@@ -995,3 +1000,10 @@
           title: Code Inspector Platform
         - url: http://doc.code-inspector.com
           title: Code Inspector Documentation
+    - title: Klaros Test Management
+      content: Klaros Test Management is a professional web based test management tool which tightly integrates issues in GitLab with testing activities.
+      links:
+        - url: "https://www.klaros-testmanagement.com"
+          title: Klaros Test Management website
+        - url:  "https://www.klaros-testmanagement.com/en_US/test-management-gitlab-integration"
+          title: Klaros Test Management GitLab integration documentation

data/case_studies/alteryx.yml

+title: Alteryx
+cover_image: '/images/blogimages/alteryx_case_study.jpg'
+cover_title: |
+  Removing multi-tool barriers to achieve 14 builds a day
+cover_description: |
+  GitLab gives Alteryx visibility to increase build speed 
+twitter_image: '/images/blogimages/alteryx_case_study.jpg'
+
+customer_logo: '/images/case_study_logos/alteryx.svg'
+customer_logo_css_class: brand-logo-tall
+customer_industry: Technology
+customer_location: Irvine, California
+customer_solution: Ultimate
+customer_employees: 900 Gloabally
+customer_overview: |
+    Alteryx offers an end-to-end analytics platform that empowers data analysts and scientists to break data barriers and deliver insights.
+customer_challenge: |
+  Slowed by a legacy SVN repository, Alteryx wanted to modernize their architecture and improve their software development process. 
+
+key_benefits:
+  - |
+    Jenkins build that took 3 hours, now takes 30 mins to run on GitLab: a 6x improvement
+  - |
+    Visibility has empowered engineers to contribute to the DevOps development cycle
+  - |
+    More than doubled the anticipated adoption rate
+    
+
+customer_stats:
+  - stat: 10,464
+    label: comits since 2016
+  - stat:  9x 
+    label: daily releases 
+  - stat: 769 
+    label: projects using GitLab
+
+customer_study_content:
+  - title: the customer
+    subtitle: Achieving the full potential of data
+    content:
+      - |
+       Alteryx offers an end-to-end analytics platform that empowers data 
+       analysts and scientists to break data barriers, deliver insights, and get 
+       to the answer faster. Organizations all over the world rely on Alteryx daily to deliver 
+       actionable insights. The end-to-end Alteryx analytics platform enables analysts and data 
+       scientists to discover, share and prep data, perform analysis, deploy and manage analytic models.
+  
+
+  - title: the challenge
+    subtitle: Modernizing to improve the development experience 
+    content:
+      - |
+       Alteryx knew their legacy system of using Subversion with Jenkins was not the optimal toolset to 
+       accomplish the goal of improving their Software Development Lifecycle. At that time, the repository 
+       was more than 500 gigabytes and was filled with legacy code making it difficult to manage. 
+      - |
+       They wanted to modernize the development experience to improve deployment and build pace. To achieve 
+       this they moved to Git, established an enterprise source code repository tool, and improved their CI 
+       and CD. They evaluated three tools: GitHub, Perforce and GitLab in this process.
+      - |
+
+  - title: the decision
+    subtitle: Evaluating how to best achieve the goal
+    content: 
+      - |
+        GitLab allowed Alteryx to truly have everything in one place and within one tool.  GitLab was selected 
+        because it is one place for CI, CD, source code, source code management, code reviews, and security scanning. 
+        Having everything in one place also made it easier for them to scale because teams can just be added to GitLab 
+        and have all the things that typically take them 3 or 4 months to get set up. 
+  
+
+  - title: the solution
+    subtitle: Success with a single application and double the anticipated users
+    content:
+      - |
+        Alteryx began with the Community Edition of GitLab in 2016 but quickly moved 
+        to the Enterprise Edition so they could scale. Teams soon realized the value of a single application to manage 
+        their work and they more than doubled their planned number of users in the first six months. Alteryx staff are 
+        inspired to use it because the CI is baked right into the repository, allowing developers to actively participate 
+        in the DevOps process. 
+
+ 
+
+  - title: the results 
+    subtitle:  Accelerating deployment with everything in one place
+    content:
+      - |
+        GitLab has allowed Alteryx to have code reviews, source control, continuous integration, and continuous deployment 
+        all tied together and speaking the same language. This capability allows each commit or merge request to get a code 
+        review-which wasn’t previously happening. That code review is tied to a deployment which is tied to a URL and so on 
+        and so forth. 
+      - |
+        The team took a build that was running legacy systems and moved it to GitLab. This build took 3 hours on the Jenkins 
+        machine and it took 30 minutes to run on GitLab after it was going. Engineers can actually look at the build and 
+        understand what's going on; they're able to debug it and make it successful.
+      
+  - title: the future
+    subtitle: Simplifying the toolset increases deployment rate
+    content: 
+      - |
+        Alteryx is automating everything through the GitLab YML file and the GitLab CI/CD file. This includes everything from builds to testing package deployments, and staging deployments, within their GitLab CI files. They then have triggers set up within the GitLab CI files that create deployments for different branches of code they are pushing. Those deployments do two things. First, it sets up an environment in AWS that is used to run all of the integration tests. Second, it creates an environment used for QA and Acceptance testing by the product management team. So it creates the infrastructure and then it provides a URL to those who need to experience the application, test it and validate its functionality. 

data/case_studies/anwb.yml

+title: ANWB
+cover_image: '/images/blogimages/anwb_case_study_image_2.jpg'
+cover_title: |
+  From Bicycles to Connected Driving
+cover_description: |
+  ANWB has innovated travel for the past 135 years and is actively preparing for the next 135
+twitter_image: '/images/blogimages/hemmersbach_case_study.jpg'
+
+customer_logo: '/images/case_study_logos/ANWB.svg'
+customer_logo_css_class: brand-logo-tall
+customer_industry: Roadside assistance / Travel / Insurances / Credit cards / leisure / retail
+customer_location: Netherlands
+customer_solution: Premium
+customer_employees: 3700 employees
+customer_overview: |
+   ANWB is the largest club in the Netherlands and works to keep its 4.4 million members on the road. 
+customer_challenge: |
+  The ANWB web and mobile team was struggling with an outdated toolchain that was pieced together with plugins and prayers. 
+
+key_benefits:
+  - |
+    Performing regular deploys
+  - |
+    Everyone is contributing to each other's code repositories
+  - |
+    Improved isolation of CI/CD pipelines
+  - |
+    Increased team autonomy
+
+customer_stats:
+  - stat: 100% 
+    label: dev teams using GitLab
+  - stat: 322 
+    label: projects
+  - stat: 57
+    label: groups
+
+customer_study_content:
+  - title: the customer
+    subtitle: Keeping the Netherlands rolling 
+    content:
+      - |
+       What started as a small community of bike enthusiasts has grown into a full-service 
+       mobility provider over the past 135 years. The Royal Dutch Touring Club, or Algemene Nederlandse 
+       Wielrijdersbond, was formed in 1883 when a few local cycling clubs merged. With the evolution of 
+       automobiles, the club shifted focus to roadside service. Nowadays, next to roadside services ANWB offers 
+       services around credit cards, car sales, bicycle maintenance, and travel services. 
+      - |
+       Some of the club’s most popular services include route planning software for mobile devices and connected 
+       car service which enables older cars to provide intelligence to the drivers.
+        
+
+
+  - title: the challenge
+    subtitle: Replacing multi-tools and plugins with a unified toolset
+    content:
+      - |
+       At the beginning of 2018, the product and development teams decided to make a strategic change to improve 
+       their development process. At that time, they had multiple interconnected tooling and services. This environment 
+       was driven by developer and administrator’s knowledge and background and wasn’t easily maintained. System breakdowns 
+       required someone to manually look at what was going on. These prolonged outages prevented people from doing their 
+       jobs properly. The company operated with an attitude of  "Okay, it's working. Don't touch. As long as we don't 
+       touch it, everything will be fine." 
+      - |
+        The toolchain consisted of some outdated tools including Jenkins version 1 as a build server, Stash (now known 
+        as Bitbucket Server) as a Git repository server. For artifact hosting, ANWB was using Artifactory and Nexus.
+      - |
+
+
+  - blockquote: We had developers that thought, Why would we do something else? Jenkins is fine. But I think those people need to see GitLab first and see what the difference is because GitLab is so much more than Jenkins. The power of GitLab is you can do so much more and you can make everything so much easier to manage.
+    attribution: Michiel Crefcoeur
+    attribution_title: Frontend Build and Release Engineer 
+
+  - title: the solution
+    subtitle: Empowering developers with a one-stop, modern toolchain
+    content:
+      - |
+        ANWB wanted to increase team autonomy and obliterate process isolation. Previously, their teams were using 
+        pipelines that were pieced together with various plugins. Every once in a while, a plug-in would break after 
+        a Jenkins update. Because of this, pipelines were kept as simple as possible. Now with some process shifts and 
+        using GitLab, developers run their jobs in separate pipelines and can upgrade in their own time.
+      - |
+        GitLab has made it easier for ANWB to manage separate teams and their individualized projects and for teams 
+        to choose their own pipelines and their own processes. Having the ability to choose their own workflows prevents 
+        teams from having to conform to a single way of working.
+      - | 
+        
+
+  - blockquote: We are just replacing these outdated tools bit by bit, doing it the agile way. We really wanted to replace Jenkins and immediately we saw that Stash was the first one to replace because it was logical to also host your Git repositories in GitLab, and now we have started looking at other tools (f.i. XL Deploy, Nexus) that we can replace with GitLab.
+    attribution: Ramon van de Velde
+    attribution_title: Product Owner Beheer | P&I Online
+
+  - title: the results 
+    subtitle: Looking to the future and the potential of a multi-cloud environment 
+    content:
+      - |
+        With sights set firmly on the future, The ANWB dev team is looking to migrate from outdated backend architecture 
+        to more of a cloud-centric framework. While the path to accomplishing this hasn’t been defined yet, they know 
+        GitLab is key to this next step. 
+      - |
+        “What we see is that GitLab really helps in seeing what's out there because of the integrations that GitLab 
+        already provides out-of-the-box,” Crefcoeur said. “Our company, ANWB, uses both AWS and Azure but our department is not making use of those services yet. What we are doing is we're currently experimenting with Google Cloud platform to see what GitLab has to offer on that.”
+      - |
+        Because of GitLab’s integrations with Knative, ANWB is exploring Google Cloud on Kubernetes.
+      - |
+        “We think that Kubernetes is the way to go and the integration with GitLab is really helping on that one. 
+        I think the findings are rather positive for now but we still have a long way to go because it's pretty huge 
+        what you can do with all those new techniques” van de Velde said.

data/compensation_roadmaps.yml

@@ -14,7 +14,7 @@
     external_comparables:
       grade: A
       comment: We are within 15% of our external compensation data
-    internal_comparables:
+    internal_comparables: 
       grade: A
       comment: This benchmark is at or above those of comparable roles such as Frontend Engineer
     bonus:
@@ -134,6 +134,32 @@
       - Change the title to Software Engineer in Test and revisit benchmark based on new title.
       - A cost-of-living increase in the next compensation review.
       - We will try to make the case for an incentive bonus for the Staff/Manager level before the end of 2019.
+- slug: security-analyst
+  name: Security Analyst
+  role_path: /job-families/engineering/security-analyst/
+  grades:
+    materials:
+      grade: B
+      comment: The differentiation between levels of this role need better definition.
+    recruiting:
+      grade: A
+      comment: We are attracting great candidates and routinely at or ahead of our plan.
+    employee_satisfaction:
+      grade: A
+      comment: We have heard little-to-no-complaints from individuals in this role about compensation.
+    external_comparables:
+      grade: B
+      comment: We are at the 50th percentile based on our compensation data. 
+    internal_comparables:
+      grade: C
+      comment: This benchmark is lower, compared to other Security Department benchmarks.
+    bonus:
+      grade: D
+      comment: We have not had any bonuses for this role
+  recommendation:
+    date: 2019-05-29
+    recommendations:
+      - We will try to make the case for an incentive bonus for the Staff/Manager level before the end of 2019
 - slug: security-engineer
   name: Security Engineer
   role_path: /job-families/engineering/security-engineer/

data/contract_factors.yml

@@ -43,8 +43,11 @@
   employee_factor: 1
   entity: Safeguard - Brazil
 - country: Poland
+  contractor_factor: 1.17
+  entity: CXC - Poland
+- country: Japan
   employee_factor: 1
-  entity: Safeguard - Poland
+  entity: Safeguard - Japan
 - country: Portugal
   contractor_factor: 1.17
   entity: C2C via GitLab BV
@@ -55,14 +58,17 @@
   employee_factor: 1
   entity: Safeguard - South Africa
 - country: Ukraine
-  employee_factor: 1
-  entity: Safeguard - Ukraine
+  contractor_factor: 1.17
+  entity: CXC - Ukraine
 - country: Nigeria
   employee_factor: 1
   entity: Safeguard - Nigeria
 - country: South Korea
   employee_factor: 1
   entity: Safeguard - South Korea
+- country: Switzerland
+  employee_factor: 1
+  entity: Safeguard - Switzerland
 - country: New Zealand
   employee_factor: 1
   entity: CXC - New Zealand