Merge branch 'master' into 'patch-689'

# Conflicts:
#   data/team.yml

config.rb

@@ -110,6 +110,7 @@ page '/404.html', directory_index: false
 ignore '/templates/*'
 ignore '/direction/template.html'
+ignore '/direction/product-vision/template.html'
 ignore '/includes/*'
 ignore '/releases/template.html'
 ignore '/team/structure/org-chart/template.html'

data/applications.yml

@@ -406,13 +406,6 @@
           title: Video walk-through
         - url: http://support.hubstaff.com/gitlab-time-tracking-integration/
           title: Support
-    - 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.
-      links:
-        - url: https://poeditor.com/
-          title: POEditor
-        - url: https://poeditor.com/help/how_to_translate_a_language_file_from_a_gitlab_project
-          title: GitLab Integration
     - title: GitPitch - Slideshow Presentations for Developers
       content: No more PowerPoint. No more Keynote. Just Markdown. Then Git-Commit.
       links:
@@ -440,13 +433,6 @@
           title: GitLab + JIRA Integration guide
         - url: "https://bigbrassband.com/documentation.html#add_gitlab_server"
           title: GitLab integration documentation
-    - title: Crowdin
-      content: A web-based solution for developers created to streamline the localization process. Easy file sync between GitLab repository and a localization project in Crowdin. Provides translators and managers with an advanced tooling set.
-      links:
-        - url: "https://crowdin.com/"
-          title: Crowdin website
-        - url:  "https://support.crowdin.com/gitlab-integration/"
-          title: GitLab integration documentation
     - title: Zapier
       content: Zapier allows you to connect almost any application to almost any other application, GitLab included.
       links:
@@ -462,6 +448,36 @@
       links:
         - url: https://github.com/svtek/serverless-microsoft-teams-gitlab-connector
           title: Serverless Microsoft Teams Connector
+    - title: Autosync Asana - GitLab by Unito 
+      content: 2-way sync to Asana, connecting assignee, due date, & more. Filter syncs for custom workflows.
+      links:
+        - url: https://unito.io/sync/gitlabcom/asana?utm_source=gitlab&utm_medium=marketplace&utm_campaign=&utm_content=asana
+          title: Unito.io
+    - title: Autosync Wrike - GitLab by Unito
+      content: 2-way sync to Wrike, connecting assignee, due date, & more. Filter syncs for custom workflows.
+      links:
+        - url: https://unito.io/sync/gitlabcom/wrike?utm_source=gitlab&utm_medium=marketplace&utm_campaign=&utm_content=wrike
+          title: Unito.io
+    - title: Autosync Basecamp - GitLab by Unito
+      content: 2-way sync to Basecamp, connecting assignee, due date, & more. Filter syncs for custom workflows.
+      links:
+        - url: https://unito.io/sync/gitlabcom/basecamp?utm_source=gitlab&utm_medium=marketplace&utm_campaign=&utm_content=basecamp
+          title: Unito.io
+    - title: Autosync BitBucket - GitLab by Unito
+      content: Simplify bug management between repos. Powerful filters can sync a few issues or the whole repo!
+      links:
+        - url: https://unito.io/sync/gitlabcom/bitbucket?utm_source=gitlab&utm_medium=marketplace&utm_campaign=&utm_content=bitbucket
+          title: Unito.io
+    - title: Autosync GitHub - GitLab by Unito
+      content: Simplify bug management between repos. Powerful filters can sync a few issues or the whole repo!
+      links:
+        - url: https://unito.io/sync/gitlabcom/github?utm_source=gitlab&utm_medium=marketplace&utm_campaign=&utm_content=github
+          title: Unito.io
+    - title: GitLab Issue Sync by Unito
+      content: Simplify bug management between repos. Powerful filters can sync a few issues or the whole repo!
+      links:
+        - url: https://unito.io/sync/gitlabcom/gitlabcom?utm_source=gitlab&utm_medium=marketplace&utm_campaign=&utm_content=gitlab
+          title: Unito.io
     - title: Cosango GitLab Reports
       content: Small open source app to easily create milestone and time tracking reports in GitLab
       links:
@@ -474,6 +490,15 @@
       links:
         - url: https://GitMate.io/
           title: GitMate.io
+    - title: Relution
+      content: Integrate GitLab with Relution for distributing and managing multiple iOS and/or Android mobile applications built with GitLab CI/CD. You can use Relution to set up Git repositories and CI/CD pipelines for your projects on your GitLab infrastructure.
+      links:
+        - url: 'https://www.relution.io'
+          title: "Relution website"
+        - url: 'https://www.relution.io/en/insights-news/automate-app-projects/'
+          title: "GitLab + Relution integration overview"
+        - url: 'http://repo.relution.io/package/latest/manual.html#development-hub'
+          title: "Relution documentation"
 - title: Continuous Integration
   id: continuous-integration
   applications:
@@ -662,6 +687,11 @@
       links:
         - url: https://www.vivifyscrum.com/
           title: Vivify Scrum
+    - title: Autosync Trello - GitLab by Unito
+      content: 2-way sync to Trello, connecting assignee, due date, & more. Filter syncs for custom workflows.
+      links:
+        - url: https://unito.io/sync/gitlabcom/trello?utm_source=gitlab&utm_medium=marketplace&utm_campaign=&utm_content=trello
+          title: Unito.io
 - title: Built with GitLab
   id: built-with-gitlab
   applications:
@@ -685,3 +715,21 @@
       links:
         - url: https://www.penflip.com/
           title: penflip.com
+- title: Translation Tools
+  id: translation-tools
+  applications:
+    - title: Crowdin
+      content: 'A web-based solution for developers created to streamline the localization process. Easy file sync between GitLab repository and a localization project in Crowdin. Provides translators and managers with an advanced tooling set.
+      GitLab uses Crowdin to <a href="http://translate.gitlab.com/">add and support multiple languages</a>.'
+      links:
+        - url: "https://crowdin.com/"
+          title: Crowdin website
+        - 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.
+      links:
+        - url: https://poeditor.com/
+          title: POEditor
+        - url: https://poeditor.com/help/how_to_translate_a_language_file_from_a_gitlab_project
+          title: GitLab Integration

data/contract_types.yml

-- country: Belgium
-  employee_factor: 0.8
-- country: China
-  employee_factor: 0.66
+# Countries with a GitLab entity or payroll established
+# will have an `employee_factor` of 1
+
+# Please list all countries that fit that criteria here
+
+- country: United States
+  employee_factor: 1
 - country: India
-  employee_factor: 0.75
+  employee_factor: 1
+- country: China
+  employee_factor: 1
 - country: Netherlands
-  employee_factor: 0.8
+  employee_factor: 1
+- country: Belgium
+  employee_factor: 1
 - country: United Kingdom
-  employee_factor: 0.8
+  employee_factor: 1
 - country: Germany
-  employee_factor: 0.9
-- country: United States
   employee_factor: 1
 - country: '*'
   contractor_factor: 1.17

data/country_factors.yml

+- country: Belgium
+  country_factor: 1
+- country: China
+  country_factor: 0.66
+- country: India
+  country_factor: 0.75
+- country: Netherlands
+  country_factor: 0.85
+- country: United Kingdom
+  country_factor: 0.85
+- country: Germany
+  country_factor: 1
+- country: United States
+  country_factor: 1
+- country: Israel
+  country_factor: 1.1
+- country: Brazil
+  country_factor: 0.85
+- country: Poland
+  country_factor: 0.8
+- country: Russia
+  country_factor: 0.6
+- country: Portugal
+  country_factor: 0.95
+- country: Ukraine
+  country_factor: 0.65
+- country: Czech Republic
+  country_factor: 0.9
+- country: Mexico
+  country_factor: 0.65
+- country: Chile
+  country_factor: 0.85
+- country: '*'
+  country_factor: 1

data/events.yml

@@ -593,12 +593,31 @@
 - topic: Women Who Code PDX IoT Hackathon 2018
   type: Diversity
-  date: 26 Januar, 2018
+  date: 26 January, 2018
   date_ends: 26 Januar, 2018
   location: Portland, OR
   social_tags: GitLabDiversity
   event_url: https://www.meetup.com/Women-Who-Code-Portland/events/234636808/
+  topic: BYU Marketing Career Fair 
+  type: Career Fair 
+  date: 26 January, 2018
+  date_ends: 26 January, 2018
+  location: Orem, Utah            
+  social_tags: GitLabDiversity 
+  event_url: https://ucs.byu.edu/career-fair-main-page 
+  
+
+- topic: "AFCEA West"
+  type: Conference
+  date: February 6 - February 8, 2017
+  date_ends: February 8, 2018 # Month DD, YYYY
+  description: |
+               The premier Sea Service conference and exposition on the West Coast that brings military, government and industry leaders together.
+  location: San Diego, CA USA
+  social_tags: AFCEAWest
+  event_url: http://www.westconference.org/West18/Public/enter.aspx
+
 - topic: Rails Girls Leiden 2018
   type: Diversity
   date: February 16, 2018
@@ -614,6 +633,16 @@
   location: VIT University, Vellore
   social_tags: GitLabDiversity
   event_url: http://c2c.acmvit.in/
+
+- topic: "IBM Think"
+  type: Cloud, Conference
+  date: March 19 - March 22, 2017
+  date_ends: March 22, 2018 # Month DD, YYYY
+  description: |
+               The event where the problems of tomorrow meet the minds of today. Discover how you can realize exponential outcomes through the power of IBM.
+  location: Las Vegas, NV USA
+  social_tags: IBMthink2018
+  event_url: https://www.ibm.com/events/think/
   
 - topic: Rails Girls Nsukka
   type: Diversity

data/features.yml

@@ -1876,7 +1876,7 @@ features:
       It automatically detects, builds, tests, deploys, and monitors applications.
     link_description: "Read more about Auto DevOps in the documentation"
     link: 'https://docs.gitlab.com/ee/topics/autodevops/'
-    solution: verify
+    solution: configure
     gitlab_ce: true
     gitlab_ees: true
     gitlab_eep: true

data/jobs.yml

@@ -4,52 +4,35 @@
 - title: "Executive Assistant"
   description: /jobs/executive-assistant/
-  salary: 53000
+  salary: 97000
+  salary source: Aventador
   apply:
   open: false
 - title: "People Operations Administrator"
   description: /jobs/people-ops-administrator/
+  salary: 76432
+  salary source: Aventador
   apply:
   open: false
 - title: "Accountant"
   description: /jobs/accountant/
-  salary: 62515
+  salary: 93000
+  salary source: Aventador
   apply:
   open: false
-- title: "Account Executive - Mid-Market (East)"
+- title: "Account Executive"
   description: /jobs/account-executive/
-  apply: https://jobs.lever.co/gitlab/865e112a-1acf-4d49-a352-f77ccdf33750
-  open: false
-
-- title: "Account Executive (East)"
-  description: /jobs/account-executive/
-  apply: https://jobs.lever.co/gitlab/fff27ba3-38a9-4755-99cf-26c2bfbe2348
-  open: false
-
-- title: "Account Executive (EMEA)"
-  description: /jobs/account-executive/
-  apply: https://jobs.lever.co/gitlab/d465ac05-13fb-4a0c-8f02-7a70fd2a0acf
-  open: false
-
-- title: "Federal Strategic Account Executive - DOD"
-  description: /jobs/federal-strategic-account-executive/
-  apply: https://jobs.lever.co/gitlab/2e077d5e-3ad2-4be8-956e-9ff28c09bba1
-  open: false
-
-- title: "Federal Strategic Account Executive - Intel"
-  description: /jobs/federal-strategic-account-executive/
-  apply: https://jobs.lever.co/gitlab/3e3dd7ca-aa7f-41e3-8940-8815b99bb704
+  apply:
   open: false
-- title: "Federal Strategic Account Executive - Civilian"
+- title: "Federal Strategic Account Executive"
   description: /jobs/federal-strategic-account-executive/
-  apply: https://jobs.lever.co/gitlab/7dc21a27-6d56-415a-bdd0-a452fbd09cf3
+  apply:
   open: false
-
 - title: "Strategic Account Leader"
   description: /jobs/strategic-account-leader/
   apply:
@@ -62,25 +45,15 @@
 - title: "Accounting Manager"
   description: /jobs/accounting-manager/
-  salary: 78900
-  apply:
-  open: false
-
-- title: "Backend Developer"
-  description: /jobs/developer/
-  salary: 87337
-  apply:
-  open: false
-
-- title: "Backend Lead"
-  description: /jobs/backend-lead/
-  salary: 87337
+  salary: 119010
+  salary source: F1
   apply:
   open: false
 - title: "Billing Specialist"
   description: /jobs/billing-specialist/
-  salary:
+  salary: 67500
+  salary source: F1
   apply: https://jobs.lever.co/gitlab/c80f7c1d-8e4d-491e-8df0-9c4eaba4680c
   open: false
@@ -88,116 +61,51 @@
   description: /jobs/director-backend/
   open: false
-- title: "Build Engineer"
-  description: /jobs/build-engineer/
-  salary: 87337
-  apply: https://jobs.lever.co/gitlab/0b7f460f-fb29-494b-a5b1-21cbb446bcca
-  open: false
-
-- title: "Build Lead"
-  description: /jobs/build-lead/
-  salary: 87337
-  apply:
-  open: false
-
 - title: "Business Development Representative"
-  description: /jobs/business-development-representative/
+  description:
   apply: https://jobs.lever.co/gitlab/73b0dd91-cd87-4845-9918-aeb6e0feec2e
   open: false
-- title: "Sales Development Representative (East & West Coast, US)"
-  description: /jobs/sales-development-representative/
-  salary: 92000
-  apply: https://jobs.lever.co/gitlab/71a6265e-c6ec-462e-86ab-79a0f9995631
-  open: false
-
-- title: "Sales Development Representative (EMEA)"
+- title: "Sales Development Representative"
   description: /jobs/sales-development-representative/
-  salary: 92000
-  apply:
-  open: false
-
-- title: "Sales Development Representative Lead"
-  description: /jobs/sales-development-representative-lead/
-  salary: 92000
-  apply:
-  open: false
-
-- title: "Senior Backend Developer"
-  description: /jobs/senior-developer/
-  salary: 87337
-  apply:
-  open: false
-
-- title: "CI/CD Lead"
-  description: /jobs/ci-cd-lead/
-  salary: 87337
   apply:
   open: false
 - title: "Channel Sales Manager"
   description: /jobs/channel-sales-manager/
-  salary:
-  apply: https://jobs.lever.co/gitlab/d615e4f1-fe69-4cbf-bd72-fefb402793fb
+  apply:
   open: false
 - title: "Community Advocate"
   description: /jobs/community-advocate/
-  salary: 55823
+  salary: 85000
+  salary source: Marketing Compensation Survey
   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
+  salary: 85000
+  salary source: Marketing Compensation Survey
   apply:
   open: false
 - title: "Controller"
   description: /jobs/controller/
-  salary: 90520
   apply:
   open: false
-- title: "Data and Analytics Architect - Americas"
+- title: "Data and Analytics Architect"
   description: /jobs/data-analytics-architect/
-  salary: 115000
-  apply: https://jobs.lever.co/gitlab/ae5af159-e651-4d2a-a13f-f43896745afd
+  salary: 135000
+  salary source: E-team
+  apply:
   open: false
 - title: "Developer"
   description: /jobs/developer/
-  salary: 87337
-  apply:
-  open: false
-
-- title: "Developer Advocate"
-  description: /jobs/developer-advocate/
-  salary: 70200
-  apply:
-  open: false
-
-- title: "Security Specialist"
-  description: /jobs/security-specialist
-  salary: 87337
-  apply: https://jobs.lever.co/gitlab/fac5198e-20e7-47a4-8b53-e8df48491c8b
-  open: false
-
-- title: "Backend Developer, Edge"
-  description: /jobs/developer-edge/
-  salary: 87337
-  apply:
-  open: false
-
-- title: "Backend Developer, CI/CD Pipelines"
-  description: /jobs/developer-ci-cd/
-  salary: 87337
+  salary: 120000
+  salary source: Aventador
   apply:
   open: false
@@ -206,11 +114,6 @@
   apply:
   open: false
-- title: "Director of Developer Relations"
-  description: /jobs/director-developer-relations/
-  apply:
-  open: false
-
 - title: "Director Federal Sales"
   description: /jobs/director-federal-sales/
   apply:
@@ -226,11 +129,6 @@
   apply:
   open: false
-- title: "Director of Lead Generation"
-  description: /jobs/director-of-leadgen/
-  apply:
-  open: false
-
 - title: "Director of Legal Affairs"
   description: /jobs/director-legal-affairs/
   apply:
@@ -243,151 +141,93 @@
 - title: "Director of Security"
   description: /jobs/director-of-security/
-  apply: https://jobs.lever.co/gitlab/107ea9fc-753f-4b96-b62c-d2358da59cf6
-  open: false
-
-- title: "Edge Lead"
-  description: /jobs/edge-lead/
-  salary: 87337
   apply:
   open: false
-- title: "Federal Solutions Architect - Customer Success"
-  description: /jobs/federal-solutions-architect/
-  apply: https://jobs.lever.co/gitlab/8263aeca-a80c-49dd-a152-bfd8839e8075
-  open: false
-
 - title: "Federal Channel Manager"
   description: /jobs/federal-channel-manager/
   salary:
-  apply: https://jobs.lever.co/gitlab/216da077-5b19-4ef8-b38c-efae1ce17b29
+  apply:
   open: false
-# Ordered alphabetically **by job description URL**
-
 - title: "Field Marketing Manager"
   description: /jobs/field-marketing-manager/
-  salary: 63434
+  salary: 92000
+  salary source: Aventador
   apply:
   open: false
 - title: "Frontend Engineer"
   description: /jobs/frontend-engineer/
-  salary: 83132
-  apply: https://jobs.lever.co/gitlab/15d296bd-b766-4afd-8ee8-48d6fb0b9dba
-  open: false
-
-- title: "Frontend Lead"
-  description: /jobs/frontend-lead/
-  salary: 83132
-  apply:
-  open: false
-
-- title: "Growth Product Manager"
-  description: /jobs/growth-product-manager/
-  salary: 117530
+  salary: 120000
+  salary source: Same as Developer
   apply:
   open: false
 - title: "Implementation Specialist"
   description: /jobs/implementation-specialist/
-  apply: https://jobs.lever.co/gitlab/b1b478c5-446c-4d9c-a920-9c1466f88e36
+  apply:
   open: false
 - title: "Designer"
   description: /jobs/designer/
-  salary: 61000
-  apply:
-  open: false
-
-- title: "Marketing Frontend Engineer"
-  description: /jobs/marketing-frontend-engineer/
+  salary: 107000
+  salary source: Aventador
   apply:
   open: false
 - title: "Marketing Program Manager"
   description: /jobs/marketing-program-manager/
-  apply: https://jobs.lever.co/gitlab/8c4c6599-46bb-472b-afd9-3fb9351ad273
+  salary: 116000
+  salary source: Aventador
+  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:
-  open: false
-
-- title: "Gitaly Lead"
-  description: /jobs/gitaly-lead/
-  salary: 87337
-  apply:
-  open: false
-
-- title: "Executive Recruiter"
-  description: /jobs/recruiter/
-  apply:
-  open: false
-
-- title: "Performance Lead"
-  description: /jobs/performance-lead
+  salary: 132000
+  salary source: Marketing Compensation Survey
   apply:
   open: false
 - title: "Product Marketing Manager"
   description: /jobs/product-marketing-manager/
-  salary: 87500
-  apply: https://jobs.lever.co/gitlab/219014ac-196e-47d7-90fd-7f3e4033ce46
+  salary: 148000
+  salary source: Marketing Compensation Survey
+  apply:
   open: false
 - title: "Director of Product Marketing"
   description: /jobs/director-product-marketing
-  apply: https://jobs.lever.co/gitlab/d36f3b7c-6754-4624-8835-55b6b5ff8cf7
+  apply:
   open: false
 - title: "Product Manager"
   description: /jobs/product-manager/
-  salary: 117530
-  apply:
-  open: false
-
-- title: "Senior Product Manager, CI/CD Pipelines"
-  description: /jobs/product-manager-ci/
-  salary: 117530
+  salary: 177500
+  salary source: Aventador
   apply:
   open: false
 - title: "Production Engineer"
   description: /jobs/production-engineer/
-  salary: 110295
-  apply: https://jobs.lever.co/gitlab/a9ec2996-b7b6-4d87-aed0-1fc2ce3f8faa
-  open: false
-
-- title: "Production Lead"
-  description: /jobs/production-lead/
-  salary: 110295
-  apply:
-  open: false
-
-- title: "Prometheus Lead"
-  description: /jobs/prometheus-lead/
-  salary: 138000
+  salary: 140000
+  salary source: E-team
   apply:
   open: false
 - title: "Prometheus Engineer"
   description: /jobs/prometheus-engineer/
-  salary: 138000
+  salary: 184000
+  salary source: E-team
   apply:
   open: false
 - title: "Recruiter"
   description: /jobs/recruiter/
-  salary: 71337
-  apply: https://jobs.lever.co/gitlab/21d606b5-cfea-435a-bf79-ded9688e96c6
+  salary: 102698
+  salary source: Aventador
+  apply:
   open: false
 - title: "Regional Sales Director"
@@ -397,105 +237,61 @@
 - title: "Security Engineer"
   description: /jobs/security-engineer/
-  salary: 87337
-  apply: https://jobs.lever.co/gitlab/771fc022-568d-47ae-9f2b-55042e92539d
-  open: false
-
-- title: "Security Lead"
-  description: /jobs/security-lead/
-  salary: 87337
+  salary: 140000
+  salary source: E-team
   apply:
   open: false
-- title: "Support Engineer - EMEA "
-  description: /jobs/support-engineer/
-  salary: 87337
-  apply: https://jobs.lever.co/gitlab/bf6b8d93-e87e-4ba2-a05e-ab36bac0226f
-  open: false
-
-- title: "Support Engineer - APAC "
-  description: /jobs/support-engineer/
-  salary: 87337
-  apply: https://jobs.lever.co/gitlab/5727ca49-b549-4d5e-8789-f30d3b5b1a2e
-  open: false
-
-- title: "Support Engineer - Americas "
+- title: "Support Engineer"
   description: /jobs/support-engineer/
-  salary: 87337
-  apply: https://jobs.lever.co/gitlab/c5bcb75f-e390-44ee-bc3d-b9e4ef0ac55d
-  open: false
-
-- title: "Solutions Architect - Customer Success"
-  description: /jobs/solutions-architect/
+  salary: 120000
+  salary source: Same as Developer
   apply:
   open: false
-- title: "Solutions Architect - Customer Success (EMEA)"
+- title: "Solutions Architect"
   description: /jobs/solutions-architect/
-  apply: https://jobs.lever.co/gitlab/31861843-bf48-4af6-993e-8829ab44daed
-  open: false
-
-
-
-# Ordered alphabetically **by job description URL**
-
-- title: "Support Lead"
-  description: /jobs/support-lead/
-  salary: 87337
   apply:
   open: false
 - title: "Database Specialist"
   description: /jobs/specialist/database/
-  salary: 95000
-  apply: https://jobs.lever.co/gitlab/8b711f1c-d378-4383-a027-bac550aeee6d
-  open: false
-
-- title: "Senior Backend Developer, Distributed Systems Specialist"
-  description: /jobs/specialist/distributed-systems/
+  salary: 124000
+  salary source: Stack Overflow
   apply:
   open: false
 - title: "Issue Triage Specialist"
   description: /jobs/specialist/issue-triage/
-  salary: 87337
+  salary: 120000
+  salary source: Same as Developer
   apply:
   open: false
 - title: "Technical Writer"
   description: /jobs/technical-writer/
-  salary: 65803
-  apply:
-  open: false
-
-- title: "Technical Writing Lead"
-  description: /jobs/technical-writing-lead/
-  salary: 65803
-  apply: https://jobs.lever.co/gitlab/945d2740-cdd1-429f-9e2b-ea84022549c0
-  open: false
-
-- title: "UX Lead"
-  description: /jobs/ux-lead/
-  salary: 85843
+  salary: 102981
+  salary source: Aventador
   apply:
   open: false
 - title: "UX Designer"
   description: /jobs/ux-designer/
-  salary: 85843
+  salary: 120000
+  salary source: Marketing Compensation Survey
   apply:
   open: false
 - title: "UX Researcher"
   description: /jobs/ux-designer/
-  salary: 82000
+  salary: 106610
+  salary source: E-team
   apply:
   open: false
-
 - title: "VP of Engineering"
   description: /jobs/vp-of-engineering/
-  apply: https://jobs.lever.co/gitlab/afc7ce7c-ccc8-4769-983a-617106efc48f
+  apply:
   open: false
 - title: "VP of Partnerships"
@@ -513,20 +309,71 @@
   apply:
   open: false
-- title: "Web/UX Designer"
-  description: /jobs/web-ux-designer/
-  salary: 85843
-  apply: https://jobs.lever.co/gitlab/2f13eace-2bde-477d-bb58-2eb53997111c
+- title: "Marketing Web Developer/Designer"
+  description: /jobs/marketing-web-developer-designer/
+  salary: 120000
+  salary source: Marketing Compensation Survey
+  apply:
+  open: false
+
+- title: "People Operations Analyst"
+  description: /jobs/people-ops-analyst/
+  salary: 100000
+  salary source: Aventador
+  apply:
+  open: false
+
+- title: "People Operations Specialist"
+  description: /jobs/people-ops-specialist/
+  salary: 88042
+  salary source: Aventador
+  apply:
+  open: false
+
+- title: "People Operations Generalist"
+  description: /jobs/people-ops-generalist/
+  salary: 95308
+  salary source: Aventador
+  apply:
+  open: false
+
+- title: "Marketing Operations Manager"
+  description: /jobs/marketing-operations-manager/
+  salary: 100000
+  salary source: Aventador
+  apply:
+  open: false
+
+- title: "Sales Administrator"
+  description: /jobs/sales-administrator/
+  salary: 72820
+  salary source: Aventador
+  apply:
   open: false
 - title: "People Business Partner"
   description: /jobs/people-business-partner/
-  apply: https://jobs.lever.co/gitlab/d92bc500-ac70-4fa6-b1f7-7413d7226594
+  apply:
+  open: false
+
+- title: "Services Support"
+  description: /jobs/services-support/
+  salary: 82000
+  salary source: Aventador
+  apply:
   open: false
 - title: "Services Support Lead"
   description: /jobs/services-support-lead/
-  apply: https://jobs.lever.co/gitlab/dd2c83dd-66f8-4c5e-bea7-2e16bbeb819d
+  apply:
   open: false
+- title: "Associate Social Marketing Manager"
+  description: /jobs/associate-social-marketing-manager/
+  salary: 76000
+  salary source: Aventador
+  apply:
+  open: false
+
+
   # Ordered alphabetically **by job description URL**

data/pets.yml

@@ -197,6 +197,10 @@
   picture: pickle.jpg
   human: smcgivern
   story: Pickle is a Scottish cat with a love of sitting on keyboards and trackpads, or anything her tin openers are paying attention to instead of her.
+- name: Petunia
+  picture: petunia.jpg
+  human: Celesta Smith
+  story: Petunia is a rescue from Mississippi. She was adopted by Celesta in 2016. Petunia was very ill and was in need of love and attention, however she is now very healthy and loves playing in local dog parks! 
 - name: You?
   picture: ../../gitlab-logo-extra-whitespace.png
   story:  |

data/promo.yml

-text: "Take our 2018 Developer Survey!"
-link: 'https://about.gitlab.com/2017/11/17/2018-global-developer-survey/'
+text: "Announcing a more balanced Proprietary Information and Assignment Agreement"
+link: 'https://about.gitlab.com/2017/12/18/balanced-piaa/'

data/resources.yml

-- title: 'Git & Getting Started'
+- title: 'Git and getting started'
   data:
     - title: 'Moving to Git [white paper]'
       url: 'http://get.gitlab.com/moving-to-git-whitepaper/'
-    - title: 'What to Look for in a Git Management Solution [blog post]'
+    - title: 'What to look for in a Git management solution [blog post]'
       url: /2017/04/20/choosing-git-management-solution/
-    - title: 'Why You Should Move to Git [webcast]'
+    - title: 'Why you should move to Git [webcast]'
       url: 'http://get.gitlab.com/moving-to-git/'
-    - title: 'How to Explain GitLab to Anyone [blog post]'
+    - title: 'How to explain GitLab to anyone [blog post]'
       url: /2016/11/30/how-to-explain-gitlab-to-anyone/
-    - title: 'Why More Companies Are Adopting Open Source Technology [blog post]'
+    - title: 'Why more companies are adopting open source technology [blog post]'
       url: /2017/03/03/why-choose-open-source/
-    - title: "Customer Story: Moving to GitLab! Yes, it's worth it! [blog post]"
+    - title: "Customer story: Moving to GitLab! Yes, it's worth it! [blog post]"
       url: /2016/08/04/moving-to-gitlab-yes-its-worth-it/
-    - title: "Customer Story: A creative agency's GitLab wishlist [blog post]"
+    - title: "Customer story: A creative agency's GitLab wishlist [blog post]"
       url: /2016/12/15/a-creative-agencys-gitlab-wishlist/
-    - title: 'Git Tips & Tricks [blog post]'
+    - title: 'Git tips and tricks [blog post]'
       url: /2016/12/08/git-tips-and-tricks/
-    - title: 'Comparing Confusing Terms in GitHub, Bitbucket, and GitLab [blog post]'
+    - title: 'Comparing confusing terms in GitHub, Bitbucket, and GitLab [blog post]'
       url: /2016/01/27/comparing-terms-gitlab-github-bitbucket/
-    - title: 'GitLab Workflow: An Overview [blog post]'
+    - title: 'GitLab workflow: An overview [blog post]'
       url: /2016/10/25/gitlab-workflow-an-overview/
-    - title: 'How GitLab Gets You From Idea to Production [blog post]'
+    - title: 'How GitLab gets you from idea to production [blog post]'
       url: /2016/11/14/idea-to-production/
-    - title: 'How to Evaluate GitLab During an EE Trial [blog post]'
+    - title: 'How to evaluate GitLab during an EE trial [blog post]'
       url: /2016/12/09/how-to-evaluate-gitlab-during-ee-trial/
-    - title: 'Getting Started With GitLab Development Kit [blog post]'
+    - title: 'Getting started with GitLab development kit [blog post]'
       url: /2016/06/08/getting-started-with-gitlab-development-kit/
-    - title: 'Getting Started With Git [webcast]'
+    - title: 'Getting started with Git [webcast]'
       url: 'http://get.gitlab.com/getting-started-with-git/'
-      
-- title: 'CI/CD and Continuous Workflows'
+
+- title: 'CI/CD and continuous workflows'
   data:
-    - title: 'Continuous Integration: From Jenkins to GitLab Using Docker [blog post]'
+    - title: 'Automate to Accelerate [webcast]'
+      url: 'https://youtu.be/dvayJWwzfPY'
+    - title: 'Cloud native apps from development to production [webcast]'
+      url: 'https://youtu.be/yOKmv6mFE68'
+    - title: 'Kubernetes, containers, cloud native – the basics [blog post]'
+      url: /2017/11/30/containers-kubernetes-basics/
+    - title: 'Autoscale GitLab CI runners and save 90% on EC2 costs [blog post]'
+      url: /2017/11/23/autoscale-ci-runners/
+    - title: 'HumanGeo switched from Jenkins to GitLab and cut costs by a 1/3 [blog post]'
+      url: /2017/11/14/humangeo-switches-jenkins-gitlab-ci/
+    - title: 'Continuous Integration: From Jenkins to GitLab using Docker [blog post]'
       url: /2017/07/27/docker-my-precious/
-    - title: "Customer Story: How GitLab CI Supported Ticketmaster's Ramp Up to Weekly Mobile Releases [blog post]"
+    - title: "Customer story: How GitLab CI supported Ticketmaster's ramp up to weekly mobile releases [blog post]"
       url: /2017/06/07/continous-integration-ticketmaster/
-    - title: 'Demo - CI/CD with GitLab in Action [blog post]'
+    - title: 'Demo - CI/CD with GitLab in action [blog post]'
       url: /2017/03/13/ci-cd-demo/
     - title: 'From Continous Integration to Continuous Everything [webcast]'
       url: 'https://page.gitlab.com/20170301_continuouseverything.html'
-    - title: 'Customer Story: Why we Chose GitLab CI for our CI/CD Solution [blog post]'
+    - title: 'Customer story: Why we chose GitLab CI for our CI/CD solution [blog post]'
       url: /2016/10/17/gitlab-ci-oohlala/
-    - title: 'Review Apps, A Continuous Case Study [blog post]' 
+    - title: 'Review Apps, a continuous case study [blog post]'
       url: /2017/03/21/review-apps-continuous-case-study/
-    - title: '3 Tips For Introducing Continuous Workflows to Your Development Process [blog post]'
+    - title: '3 tips for introducing continuous workflows to your development process [blog post]'
       url: /2017/03/06/introduce-continuous-workflows/
-    - title: 'Customer Story: Charge [blog post]'
+    - title: 'Customer story: Charge [blog post]'
       url: /2016/05/31/customer-story-charge-communications/
-    - title: 'Customer Story: Data Startup Cognitive Logic Talks Migrating to GitLab [blog post]'
+    - title: 'Customer story: Data startup Cognitive Logic talks migrating to GitLab [blog post]'
       url: /2016/11/22/cognitive-logic-talks-migrating-to-gitlab/
-    - title: 'Customer Story: GitLab adoption growing at CERN [blog post]'
+    - title: 'Customer story: GitLab adoption growing at CERN [blog post]'
       url: /2016/11/23/gitlab-adoption-growing-at-cern/
-    - title: 'Setting Up GitLab CI for Android Projects [blog post]'
+    - title: 'Setting up GitLab CI for Android projects [blog post]'
       url: /2016/11/30/setting-up-gitlab-ci-for-android-projects/
-    - title: 'GitLab Container Registry [blog post]'
+    - title: 'GitLab container registry [blog post]'
       url: /2016/05/23/gitlab-container-registry/
-    - title: 'Customer Story: Building our Web App on GitLab CI [blog post]'
+    - title: 'Customer story: Building our Web App on GitLab CI [blog post]'
       url: /2016/07/22/building-our-web-app-on-gitlab-ci/
 - title: 'DevOps'
   data:
-    - title: 'The DevOps Journey: Using Containers [webcast]'
+    - title: 'Complete DevOps is DevOps reimagined. [blog post]'
+      url: /2017/10/11/from-dev-to-devops/
+    - title: 'Beyond CI/CD: GitLab''s DevOps vision'
+      url: /2017/10/04/devops-strategy/
+    - title: 'How to spot development issues and fix them fast [blog post]'
+      url: /2017/10/16/how-to-spot-development-issues/
+    - title: 'The DevOps journey: Using containers [webcast]'
       url: 'https://get.gitlab.com/devops-journey-using-containers/'
-    - title: '2016 Developer Survey [report]'
+    - title: 'Global Developer Survey 2016 [report]'
       url: 'http://get.gitlab.com/global-developer-survey/'
-    - title: 'Managing the DevOps Culture Shift [webcast]'
+    - title: 'Managing the DevOps culture shift [webcast]'
       url: 'http://get.gitlab.com/managing-devops-culture-shift/'
-    - title: 'Our Secret to Tackling Thousands of Open Issues [blog post]'
+    - title: 'Our secret to tackling thousands of open issues [blog post]'
       url: /2017/04/10/our-secret-to-tackling-thousands-of-open-issues/
-    - title: 'Demo - Mapping Work Versus Time With Burndown Charts [blog post]'
+    - title: 'Demo - Mapping work versus time with burndown charts [blog post]'
       url: /2017/04/25/mapping-work-to-do-versus-time-with-burndown-charts/
-    - title: 'Managing Production Deployments on Kubernetes [webcast]'
+    - title: 'Managing production deployments on Kubernetes [webcast]'
       url: 'http://get.gitlab.com/managing-production-deployments-on-kubernetes/'
-    - title: 'The Logic Behind Deploying Early and Often [blog post]'
+    - title: 'The logic behind deploying early and often [blog post]'
       url: /2016/07/21/release-early-release-often/
-    - title: 'Trends in Version Control: Innersourcing [blog post]'
+    - title: 'Trends in version control: Innersourcing [blog post]'
       url: /2016/07/07/trends-version-control-innersourcing/
 - title: 'Collaboration'
   data:
-    - title: 'How GitLab Boosts Collaboration Through Visibility, Accountability, and Measurement [blog post]'
+    - title: 'Cross-functional ≠ dysfunctional [blog post]'
+      url: /2017/11/08/tasktop-webcast-recap/
+    - title: 'Don''t let process hold you back [webcast]'
+      url: 'https://youtu.be/8X6x54gaYRo'
+    - title: 'How GitLab boosts collaboration through visibility, accountability, and measurement [blog post]'
       url: /2017/04/14/enterprise-story-9-0/
     - title: 'Introducing GitLab 9.0 [webcast]'
       url: 'http://get.gitlab.com/gitlab-9/'
-    - title: 'Simplifying the Software Development Lifecycle [webcast]'
+    - title: 'Simplifying the software development lifecycle [webcast]'
       url: 'http://get.gitlab.com/simplifying-software-development-lifecycle/'
-    - title: 'Code Review: A Business Imperative [webcast]'
+    - title: 'Code review: A business imperative [webcast]'
       url: 'http://get.gitlab.com/code-review-webinar/'
-    - title: 'How Innersourcing Can Help Your Security Team [blog post]'
+    - title: 'How innersourcing can help your security team [blog post]'
       url: /2017/04/19/how-innersourcing-can-help-your-security-team/
-    - title: 'Demo - Mastering Code Review With GitLab [blog post]'
+    - title: 'Demo - Mastering code review with GitLab [blog post]'
       url: /2017/03/17/demo-mastering-code-review-with-gitlab/
-    - title: 'Why Collaboration Tools Matter More Than Ever [blog post]'
+    - title: 'Why collaboration tools matter more than ever [blog post]'
       url: /2017/04/04/why-collaboration-tools-matter/
-    - title: 'The Secret to Developer Happiness? Use Better Tools. [blog post]' 
+    - title: 'The secret to developer happiness? Use better tools. [blog post]'
       url: /2017/02/27/developers-crave-modern-tools/
-    - title: 'Customer Story: Why Vaadin Chose GitLab [blog post]'
+    - title: 'Customer story: Why Vaadin chose GitLab [blog post]'
       url: /2016/12/05/why-vaadin-chose-gitlab/
-    - title: 'Customer Story: Stack Overflow [blog post]'
+    - title: 'Customer story: Stack Overflow [blog post]'
       url: /2016/04/07/stack-overflow-support-network/
-    - title: 'What You Need to Know About Going Cloud Native [webcast]'
+    - title: 'What you need to know about going cloud native [webcast]'
       url: 'http://get.gitlab.com/cloud-native/'
-    - title: 'Why Move to a Single Collaboration Tool? [blog post]'
+    - title: 'Why move to a single collaboration tool? [blog post]'
       url: /2015/02/06/why-move-to-a-single-code-collaboration-tool/
-    - title: 'Innovate Faster Without Sacrificing Security or Quality [webcast]'
+    - title: 'Innovate faster without sacrificing security or quality [webcast]'
       url: 'https://www.youtube.com/watch?v=9_yicOrtbqM&t=627s'
-    - title: 'Case Study: Thomson Reuters shares their development process combining GitLab, Jenkins and Slack [partner provided video]'  
-      url: 'http://www.almtoolbox.com/blog/case-study-thomson-reuters-gitlab-jenkins-slack/'
\ No newline at end of file
+    - title: 'Case Study: Thomson Reuters shares their development process combining GitLab, Jenkins and Slack [partner provided video]'
+      url: 'http://www.almtoolbox.com/blog/case-study-thomson-reuters-gitlab-jenkins-slack/'

data/speakers.yml

@@ -289,3 +289,12 @@
     - https://www.youtube.com/watch?v=-69tKcl1oTE
     - https://www.slideshare.net/FilipaLacerda2/devops-porto-cicd-at-gitlab
   status: active
+  
+- name: Brendan O'Leary
+  email: boleary@gitlab.com
+  specialty: DevOps, CI/CD & Cloud Technologies
+  region: US East
+  location: Annapolis, MD
+  presentations:
+    - https://www.youtube.com/watch?v=68rGlAihKFw
+  status: active

data/team.yml

@@ -606,7 +606,7 @@
 - name: James Lopez
   locality: A Coruña
   country: Spain
-  role: <a href="https://about.gitlab.com/jobs/developer/">Developer</a>
+  role: <a href="https://about.gitlab.com/jobs/developer/">Senior Developer</a>
   reports_to: Platform Engineering Manager
   picture: james.png
   twitter: jlopezofficial
@@ -921,7 +921,7 @@
   country: United Kingdom
   role: <a href="https://about.gitlab.com/jobs/developer/">Developer</a>
   reports_to: Edge Lead
-  picture: logo-extra-whitespace.png
+  picture: ../gitlab-logo-extra-whitespace.png
   gitlab: markglenfletcher
   specialty: <a href="https://about.gitlab.com/jobs/specialist/issue-triage/">Issue Triage</a>
   picture: mark.jpg
@@ -972,9 +972,9 @@
           When she's not typing, you will find her behind the camera, or in a plane, for being behind her camera somewhere else.
 - name: Fatih Acet
-  locality: Istanbul
-  country: Turkey
-  role: <a href="https://about.gitlab.com/jobs/frontend-engineer/">Sr. Frontend Engineer</a>
+  locality: Amsterdam
+  country: Netherlands
+  role: <a href="https://about.gitlab.com/jobs/frontend-engineer/">Senior Frontend Engineer</a>
   reports_to: Frontend Engineering Manager
   picture: fatih.png
   twitter: fatihacet
@@ -991,9 +991,9 @@
               <li><a href="https://docs.gitlab.com/ee/user/project/merge_requests/resolve_conflicts.html">Merge conflict</a> <a href="/jobs/expert/">expert</a></li>
               <li><a href="https://docs.gitlab.com/ee/development/fe_guide/vue.html">Vue.js</a> <a href="/jobs/expert/">expert</a></li>
   story:  |
-          Based on Istanbul, Fatih is a Frontend Engineer who is passionate about delivering solid Frontend code.
+          Fatih is a Frontend Engineer who is passionate about delivering solid Frontend code.
           He loves to see the things he created used by thousands of others.
-          When not working, Fatih likes playing video games and exploring new EDM hits.
+          When not working, Fatih likes spending time with his son and exploring new EDM hits.
           He also believes that one day he will be good at making Latte arts.
 - name: Eliran Mesika
@@ -1255,9 +1255,9 @@
           Chet has been in tech sales for the past three years and has grown passionate about performance, user experience, and business development. Originally from Idaho (no he didn't live on a farm...) Chet loves hunting, fishing, and spending time in the outdoors as well as traveling and trying out new restaurants with his wife.
 - name: Ahmad Sherif
-  locality: Cairo
-  country: Egypt
-  role: <a href="https://about.gitlab.com/jobs/production-engineer/">Intermediate Production Engineer</a>
+  locality: Amsterdam
+  country: The Netherlands
+  role: <a href="https://about.gitlab.com/jobs/production-engineer/">Production Engineer</a>
   reports_to: Gitaly Lead
   picture: ahmad.jpg
   twitter: ahmadsherif
@@ -1581,7 +1581,7 @@
 - name: Emily von Hoffmann
   locality: Sunnyvale, CA
   country: USA
-  role: <a href="https://about.gitlab.com/jobs/content-editor/">Jr. Content Editor</a>
+  role: <a href="https://about.gitlab.com/jobs/associate-social-marketing-manager/">Associate Social Marketing Manager</a>
   reports_to: Content Marketing Manager
   picture: emilyvonhoffmann.JPG
   twitter: emvonhoffmann
@@ -1898,7 +1898,7 @@
   reports_to: CI/CD Lead
   picture: matija.png
   twitter: matteeyah
-  gitlab: cmattrex
+  gitlab: matteeyah
   departments:
     - Engineering
     - Marketing
@@ -3252,7 +3252,7 @@
   country:
   role: <a href="https://about.gitlab.com/jobs/account-executive">Account Executive - EMEA</a>
   reports_to: Regional Sales Director - EMEA
-  picture: logo-extra-whitespace.png
+  picture: ../gitlab-logo-extra-whitespace.png
   twitter:
   gitlab:
   departments:
@@ -3273,12 +3273,27 @@
   story:  |
           Jessica is the HR Business Partner supporting Development & Product.  Before joining Gitlab she was held various HR roles at Cisco for 15 years and 2 years at SailPoint as a HRBP.  She currently lives in Austin, TX with her family and enjoys, scuba diving, hiking and eating Italian food.
+- name: Paul E. Duffy
+  locality: Boston, MA  
+  country: USA
+  role: <a href="about.gitlab.com/jobs/strategic-account-leader">Strategic Account Leader</a>
+  reports_to: Regional Sales Director - US East Coast
+  picture: paulduffy.jpg
+  twitter: pauleduffy
+  gitlab: paulduffy
+  departments:
+    - Sales
+  story:  |
+          Paul has spent the last 17 years helping clients implement and adopt 
+          new technology solutions that help drive business value. In his spare time he 
+          loves playing with his two young children, excercising and cheering on The Patriots!
+
 - name: B.W.
   locality:
   country:
   role: <a href="https://about.gitlab.com/jobs/sales-development-representative/">Sales Development Representative</a>
   reports_to: Sales Development Representative Lead
-  picture: logo-extra-whitespace.png
+  picture: ../gitlab-logo-extra-whitespace.png
   twitter:
   gitlab:
   departments:
@@ -3286,31 +3301,35 @@
   story:  |
           Joining December 4th
-- name: C.S.
-  locality:
-  country:
+- name: Celesta Smith
+  locality: Philadelphia, PA
+  country: USA
   role: <a href="https://about.gitlab.com/jobs/recruiter/">Recruiter</a>
   reports_to: Chief Culture Officer
-  picture: logo-extra-whitespace.png
+  picture: celestasmith.png
   twitter:
-  gitlab:
+  gitlab: cesmith
   departments:
     - People Operations
   story:  |
-          Joining December 11th
-- name: M.H.
-  locality:
-  country:
+          Prior to working at Gitlab, Celesta worked in the staffing world, where she obtained recruiting experience in multiple different fields.
+          Outside of work, you can find Celesta on the tennis court, visiting local breweries, or having a hiking adventure.
+          Make sure you check out my adorable puppy Petunia on our pets page!
+- name: Michael Hamilton
+  locality: Santa Barbara
+  country: USA
   role: <a href="https://about.gitlab.com/jobs/sales-development-representative/">Sales Development Representative</a>
   reports_to: Sales Development Representative Lead
-  picture: logo-extra-whitespace.png
+  picture: michaelhamilton.JPG
   twitter:
-  gitlab:
+  gitlab: mhamilton
   departments:
     - Marketing
   story:  |
-          Joining December 11th
+          Prior to working at Gitlab, Michael was developing his sales skills
+          at curvature. He loves to rock climb, play with his dog, and build
+          awesome things!
 - name: Adam Pestreich
   locality: New York, New York
@@ -3331,7 +3350,7 @@
   country:
   role: <a href="https://about.gitlab.com/jobs/support-engineer/">Support Engineer</a>
   reports_to: Support Lead
-  picture: logo-extra-whitespace.png
+  picture: ../gitlab-logo-extra-whitespace.png
   twitter:
   gitlab:
   departments:
@@ -3358,7 +3377,7 @@
   country:
   role: <a href="https://about.gitlab.com/jobs/recruiting-sourcer/">Recruiting Sourcer</a>
   reports_to: Chief Culture Officer
-  picture: logo-extra-whitespace.png
+  picture: ../gitlab-logo-extra-whitespace.png
   twitter:
   gitlab:
   departments:
@@ -3371,7 +3390,7 @@
   country:
   role: <a href="https://about.gitlab.com/jobs/solutions-architect/">Solutions Architect</a>
   reports_to: Director of WW Customer Success
-  picture: logo-extra-whitespace.png
+  picture: ../gitlab-logo-extra-whitespace.png
   twitter:
   gitlab:
   departments:
@@ -3384,7 +3403,7 @@
   country:
   role: <a href="https://about.gitlab.com/jobs/frontend-engineer/">Frontend Engineer</a>
   reports_to: Frontend Lead
-  picture: logo-extra-whitespace.png
+  picture: ../gitlab-logo-extra-whitespace.png
   twitter:
   gitlab:
   departments:
@@ -3392,12 +3411,25 @@
   story:  |
           Joining December 18th
+- name: P.H.
+  locality:
+  country:
+  role: <a href="https://about.gitlab.com/jobs/technical-account-manager/">Technical Account Manager</a>
+  reports_to: Director of WW Customer Success
+  picture: ../gitlab-logo-extra-whitespace.png
+  twitter:
+  gitlab:
+  departments:
+    - Customer Success
+  story:  |
+          Joining December 20th
+
 - name: K.O.
   locality:
   country:
   role: <a href="https://about.gitlab.com/jobs/ux-researcher/">Junior UX Researcher</a>
   reports_to: UX Manager
-  picture: logo-extra-whitespace.png
+  picture: ../gitlab-logo-extra-whitespace.png
   twitter:
   gitlab:
   departments:
@@ -3411,7 +3443,7 @@
   country:
   role: <a href="https://about.gitlab.com/jobs/build-engineer/">Build Engineer</a>
   reports_to: Build Engineering Manager
-  picture: logo-extra-whitespace.png
+  picture: ../gitlab-logo-extra-whitespace.png
   twitter:
   gitlab:
   departments:
@@ -3424,7 +3456,7 @@
   country:
   role: <a href="https://about.gitlab.com/jobs/account-executive/">Account Executive</a>
   reports_to: Regional Sales Director - EMEA
-  picture: logo-extra-whitespace.png
+  picture: ../gitlab-logo-extra-whitespace.png
   twitter:
   gitlab:
   departments:
@@ -3437,7 +3469,7 @@
   country:
   role: <a href="https://about.gitlab.com/jobs/frontend-engineer/">Senior Frontend Engineer</a>
   reports_to: Frontend Engineering Manager
-  picture: logo-extra-whitespace.png
+  picture: ../gitlab-logo-extra-whitespace.png
   twitter:
   gitlab:
   departments:
@@ -3450,7 +3482,7 @@
   country:
   role: <a href="https://about.gitlab.com/jobs/federal-strategic-account-executive/">Federal Strategic Account Leader</a>
   reports_to: Director of Federal Sales
-  picture: logo-extra-whitespace.png
+  picture: ../gitlab-logo-extra-whitespace.png
   twitter:
   gitlab:
   departments:
@@ -3463,7 +3495,7 @@
   country:
   role: <a href="https://about.gitlab.com/jobs/sales-development-representative/">Federal Sales Development Representative</a>
   reports_to: Sales Development Representative Lead
-  picture: logo-extra-whitespace.png
+  picture: ../gitlab-logo-extra-whitespace.png
   twitter:
   gitlab:
   departments:
@@ -3476,7 +3508,7 @@
   country:
   role: <a href="https://about.gitlab.com/jobs/technical-account-manager/">Technical Account Manager</a>
   reports_to: Director of WW Customer Success
-  picture: logo-extra-whitespace.png
+  picture: ../gitlab-logo-extra-whitespace.png
   twitter:
   gitlab:
   departments:
@@ -3484,27 +3516,63 @@
   story:  |
           Joining January 15th
+- name: D.T.
+  locality:
+  country:
+  role: <a href="https://about.gitlab.com/jobs/frontend-engineer/">Senior Frontend Engineer</a>
+  reports_to: Frontend Engineering Manager
+  picture: ../gitlab-logo-extra-whitespace.png
+  twitter:
+  gitlab:
+  departments:
+    - Engineering
+  story:  |
+          Joining January 15th
+
+- name: S.K.
+  locality:
+  country:
+  role: <a href="https://about.gitlab.com/jobs/recruiting-director/">Recruiting Director</a>
+  reports_to: Chief Culture Officer
+  picture: ../gitlab-logo-extra-whitespace.png
+  twitter:
+  gitlab:
+  departments:
+    - People Operations
+  story:  |
+          Joining January 15th
+
+- name: A.B.
+  locality:
+  country:
+  role: <a href="https://about.gitlab.com/jobs/specialist/database/">Senior Database Engineer</a>
+  reports_to: VP of Engineering
+  picture: ../gitlab-logo-extra-whitespace.png
+  twitter:
+  gitlab:
+  departments:
+    - Engineering
+  story:  |
+          Joining January 29th
+
 - name: Ernst (interim)
   placeholder: true
   locality:
   country:
   role: <a href="https://about.gitlab.com/jobs/engineering-manager-geo/">Engineering Manager, Geo</a>
   reports_to: Director Backend
-  picture: logo-extra-whitespace.png
+  picture: ../gitlab-logo-extra-whitespace.png
   twitter:
   gitlab:
   story:  |
           Open Position
-- name: Paul E. Duffy
-  locality: Boston, MA  
-  country: USA
-  role: Strategic Account Leader
-  reports_to: Regional Sales Director - US-East Coast
-  picture: paulduffy.jpg
-  twitter: pauleduffy
-  gitlab: paulduffy
-  story:  |
-          Paul has spent the last 17 years helping clients implement and adopt 
-          new technology solutions that help drive business value. In his spare time he 
-          loves playing with his two young children, excercising and cheering on The Patriots!
+- name: Eric J (interim)
+  placeholder: true
+  locality:
+  country:
+  role: Director of Infrastructure
+  reports_to: VP of Engineering
+  picture: ../gitlab-logo-extra-whitespace.png
+  twitter:
+  gitlab:

source/contributing/index.html.haml

@@ -7,43 +7,66 @@ extra_css:
   - contributing.css
 ---
 .wrapper
-  .contributing-container
-    .contributing-overlay
-      .contributing-content
-        %h1 Contributing to GitLab
-#content
-  .container-contributing
-    .row
-      .col-sm-6
-        %a{href: "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md"}
-          .link-box.single
-            %h4 Contributing Guidelines
-            If you want to contribute to GitLab, make sure to read and follow the contributing guidelines.
-      .col-sm-6
-        %a{href: "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/PROCESS.md"}
-          .link-box
-            %h4 Contributing Process
-            Contributors and maintainers should know what to expect from each other in the contribution process.
-            This is described here.
-    .row
-      .col-sm-6
-        %a{href: "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#feature-proposals"}
-          .link-box
-            %h4 Feedback and Feature Proposals
-            Do you have any feedback, a suggestion or want to hear what others have to say? Share in a feature proposal.
-      .col-sm-6
-        %a{href: "/development/"}
-          .link-box.single
-            %h4 Sponsor the development of new features
-            If you want us to implement a certain feature, you can sponsor us to do so.
-    .row
-      .col-sm-6
-        %a{href: "https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name=Accepting+Merge+Requests"}
-          .link-box.single
-            %h4 Accepting Merge Requests
-            You can find out if we are accepting merge requests for certain suggested features here.
-      .col-sm-6
-        %a{href: "/handbook/product/technical-writing/community-writers/"}
-          .link-box
-            %h4 Writing technical articles as a Guest Writer
-            Do you have any knowledge you'd like to share with our community? Find out how to write technical articles for the GitLab Docs.
+  .page-illustrated-header-container
+    .container
+      .header-container-content
+        %h1
+          Contributing to GitLab
+  #content
+    .wrapper.container.contributing-content{role: "main"}
+      .block
+        .block-content
+          %h2.block-title Introduction
+          %p.text-center
+            We want to make it as easy as possible for GitLab users to become GitLab contributors, so we’ve created this guide to help you get started. We have multiple tracks to cater to people of varying experience levels.
+          %p.text-center
+            If you’re uncomfortable getting into open source development right away, you may want to consider the Documentation or Translation tracks. Documentation and Translation are both just as important as code, and we'd be happy to have your contributions.
+      
+      .block
+        .block-content
+          %h2.block-title Development
+          :markdown
+            These instructions are for development of GitLab Community Edition specifically. Please note that use of the GitLab Development Kit is currently experimental on Windows. macOS or Linux are recommended for the best contribution experience.
+
+            1. Download and setup the [GitLab Development Kit](https://gitlab.com/gitlab-org/gitlab-development-kit), see the [GDK README](https://gitlab.com/gitlab-org/gitlab-development-kit/blob/master/README.md) for instructions on setting it up and [Troubleshooting](https://gitlab.com/gitlab-org/gitlab-development-kit/blob/master/doc/howto/troubleshooting.md) if you get stuck.
+            1. Fork the GitLab CE project.
+            1. Choose an issue to work on.
+                * You can find easy issues by [looking at issues labeled Accepting Merge Requests and sorting issues by weight](https://gitlab.com/gitlab-org/gitlab-ce/issues?assignee_id=0&label_name%5B%5D=Accepting%20Merge%20Requests&sort=weight_asc), low-weight issues will be the easiest to accomplish.
+                * Be sure to comment and verify no one else is working on the issue, and to make sure we’re still interested in a given contribution.
+                * You may also want to comment and ask for help if you’re new or if you get stuck. We’re happy to help!
+            1. Add the feature or fix the bug you’ve chosen to work on.
+            1. Open a merge request. The earlier you open a merge request, the sooner you can get feedback. You can mark it as a Work in Progress to signal that you’re not done yet.
+            1. Add tests and documentation if needed, as well as [a changelog entry](https://docs.gitlab.com/ee/development/changelog.html).
+            1. Make sure the test suite is passing.
+            1. Wait for a reviewer. You’ll likely need to change some things once the reviewer has completed a code review for your merge request. You may also need multiple reviews depending on the size of the change.
+            1. Get your changes merged!
+
+            For more information, please see the [Developer Documentation](https://docs.gitlab.com/ee/development/README.html).
+
+      .block
+        .block-content
+          %h2.block-title Documentation
+          :markdown
+            See the [Documentation Styleguide](https://docs.gitlab.com/ee/development/doc_styleguide.html) and [Writing Documentation](https://docs.gitlab.com/ee/development/writing_documentation.html) pages for important information on writing documentation for GitLab.
+
+            1. Visit [docs.gitlab.com](https://docs.gitlab.com) for the latest documentation for GitLab CE/EE, GitLab Runner, and GitLab Omnibus.
+            1. Find a page that’s lacking important information or that has a spelling/grammar mistake.
+            1. Click the "Edit this page" link at the bottom of the page.
+                * Note that this will most likely link you to the GitLab EE repository, most features are available in GitLab CE and you'll likely want to contribute to CE instead. Simply replace `gitlab-ee` in the URL with `gitlab-ce`, e.g. `https://gitlab.com/gitlab-org/gitlab-ee/blob/master/doc/administration/container_registry.md` would become `https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/administration/container_registry.md`.
+            1. Fork the relevant project and modify the documentation in GitLab’s web editor.
+            1. Open a merge request.
+            1. Wait for a review, you may need to change things if a reviewer requests it.
+            1. Get your changes merged!
+
+            For those interested in writing full technical articles, we also have a [GitLab Community Writers Program](https://about.gitlab.com/handbook/product/technical-writing/community-writers/) which includes compensation for writing technical articles.
+
+      .block
+        .block-content
+          %h2.block-title Translation
+          :markdown
+            Please note that GitLab is in the process of being internationalized. Not all pages have been updated to be translatable, and all languages other than English are incomplete. For more information visit [the documentation](https://docs.gitlab.com/ee/development/i18n/translation.html).
+
+            1. Visit our [Crowdin project](https://translate.gitlab.com/) and sign up.
+            1. Find a language you’d like to contribute to.
+            1. Improve existing translations, vote on new translations, and/or contribute new translations to your given language.
+            1. Once approved, your changes will automatically be included in the next version of GitLab!

source/courses/index.html.md

@@ -79,6 +79,7 @@ If you have any language courses you would like to recommend or links to website
 - [IC 140 Productivity Under Pressure (10 mins)](https://app.grovo.com/training?aid=64140)
 - [IC 141 Effective Productivity (30 mins)](https://app.grovo.com/training?aid=68383)
 - [IC 143 How to Manage Projects (36 mins)](https://app.grovo.com/training?aid=68138)
+- [IC 144 Exchange Feedback with Teammates (23 mins)](https://gitlab.grovo.com/tracks/03c3a2c3-9680-49b7-ad21-99d6e9c34494)
 ### Manager (MGR) courses

source/direction/template.html.md.erb

@@ -276,7 +276,7 @@ Moonshots are big hairy audacious goals that may take a long time to deliver.
 ## Scope
-[Our vision](#vision) is to replace disparate DevOps toolchains with a single integrated application that is pre-configured to work by default across the complete DevOps lifecycle.
+[Our vision](#vision) is to replace disparate DevOps toolchains with a single integrated application that is pre-configured to work by default across the complete DevOps lifecycle. Consider viewing [the presentation of our plan for 2018](https://about.gitlab.com/2017/10/11/from-dev-to-devops/).
 ### Inside out scope

source/eep-demo/index.html.haml

@@ -27,25 +27,11 @@ extra_css:
     %form#mktoForm_1419
     :javascript
       MktoForms2.loadForm("//app-ab13.marketo.com", "194-VVC-221", 1419, function(form) {
-          form.onSuccess(function(values, followUpUrl) {
-
-            form.getFormElem().hide();
-            document.getElementById('confirmform').style.visibility = 'visible';
-
-            dataLayer.push({event: 'mktoLead',mktoFormId: form.getId()});
-            return false;
-          });
-          function getgacid() {
-            try {
-              var tracker = ga.getAll()[0];
-              return tracker.get('clientId');
-            } catch (e) {
-              return 'n/a';
-            }
-          }
-          form.vals({
-            'gacid': getgacid()
-          });
+        form.onSuccess(function() {
+          form.getFormElem().hide();
+          $('.confirmform').attr('style', 'visibility: visible');
+          return false;
+        });
       });
     .confirmform{style: "visibility:hidden;"}
       .centered-form-info

source/gitlab-com/index.html.haml

@@ -22,7 +22,7 @@ extra_js:
       %h2
         Below is the GitLab.com hosted SaaS offering, you can host it yourself with our #{link_to 'Products', '/products'}
       %h2
-        We ❤️ open source. Public projects get all Gold plan features for free.
+        We ❤️ open source. Public projects and groups get all Gold plan features for free.
       %br/
       - data.gitlab_com.prices.free_plan do |plan|
         .col-md-4.col-lg-3.col-lg-offset-0.col-md-offset-2

source/handbook/build/index.html.md

@@ -159,32 +159,13 @@ Unless your work is related to the security, all other work is carried out in pr
 ## Resources
-When using any of the resources listed below, same rules apply:
-* Consider the cost and whether anything can be done to reduce the cost.
-* You can boot up as many machines as you need.
-* It is your responsibility to clean up after yourself; if a machine is not used,
-remove it.
-* If you observe any resource that is running for long periods of time,
-ask the person responsible whether the machine is still in use.
-* Prepend your username to any resource you start. Eg. if your name is Jane Doe, resource
-should be named `janedoe-machine-for-testing`.
-
-### GCP
-
-Every team member has access to `testground` project at [Google Cloud Platform](https://console.cloud.google.com/).
-If you don't have access, ask the team lead by creating issue in [Build team issue tracker][issue tracker] and label it `Access Request`.
-
-### Digital Ocean
-
-Every team member has access to [dev-resources project](https://gitlab.com/gitlab-com/dev-resources/) which allows everyone
-to create and delete machines on demand.
-
-### AWS
-
-Team does not have access to AWS accounts. In case you need an AWS
-resource, ask the team lead for access by creating issue in [Build team issue tracker][issue tracker] and label it `Access Request`. Please supply the details
-on what type of access you need.
+General resources available to developers are listed in the
+[Engineering handbook](/handbook/engineering/#resources).
+In the Build team specifically, everyone should have access to the `testground`
+project on [Google Cloud Platform](https://console.cloud.google.com/). If you
+don't have access, ask the team lead by creating issue in
+[Build team issue tracker][issue tracker] and label it `Access Request`.
 ## Cloud Images