Compare revisions

0665b26d · 2672e327 · 9a7b4fd4 · 618b1b2b · cacfb686 · 8399b4c8
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,8 @@ image: dev.gitlab.org:5005/gitlab/gitlab-build-images:www-gitlab-com
 variables:
  GIT_DEPTH: "4"
+  # Speed up middleman
+  NO_CONTRACTS: "true"
 before_script:
  - bundle install --jobs 4 --path vendor

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

--- a/Gemfile.lock
+++ b/Gemfile.lock
-GIT
-  remote: https://github.com/middleman/middleman-blog.git
-  revision: c7650db4a49c9cad07b9f55b0493108d7255eb16
-  specs:
-    middleman-blog (4.0.1)
-      addressable (~> 2.3)
-      middleman-core (>= 4.0.0)
-      tzinfo (>= 0.3.0)
 GEM
  remote: https://rubygems.org/
  specs:
-    activesupport (5.0.2)
+    activesupport (5.0.3)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (~> 0.7)
      minitest (~> 5.1)
@@ -19,7 +10,7 @@ GEM
      public_suffix (~> 2.0, >= 2.0.2)
    autoprefixer-rails (6.7.7.1)
      execjs
-    backports (3.7.0)
+    backports (3.8.0)
    builder (3.2.3)
    coffee-script (2.4.1)
      coffee-script-source
@@ -31,7 +22,7 @@ GEM
    contracts (0.13.0)
    diff-lcs (1.3)
    docopt (0.5.0)
-    dotenv (2.2.0)
+    dotenv (2.2.1)
    em-websocket (0.5.1)
      eventmachine (>= 0.12.9)
      http_parser.rb (~> 0.6.0)
@@ -68,6 +59,10 @@ GEM
    middleman-autoprefixer (2.7.1)
      autoprefixer-rails (>= 6.5.2, < 7.0.0)
      middleman-core (>= 3.3.3)
+    middleman-blog (4.0.2)
+      addressable (~> 2.3)
+      middleman-core (~> 4.0)
+      tzinfo (>= 0.3.0)
    middleman-cli (4.2.1)
      thor (>= 0.17.0, < 2.0)
    middleman-core (4.2.1)
@@ -106,7 +101,7 @@ GEM
    mini_portile2 (2.1.0)
    mini_racer (0.1.9)
      libv8 (~> 5.3)
-    minitest (5.10.1)
+    minitest (5.10.2)
    multi_xml (0.6.0)
    nokogiri (1.7.1)
      mini_portile2 (~> 2.1.0)
@@ -116,9 +111,9 @@ GEM
      tilt (>= 1.4.1, < 3)
    padrino-support (0.13.3.3)
      activesupport (>= 3.1)
-    parallel (1.11.1)
+    parallel (1.11.2)
    public_suffix (2.0.5)
-    rack (2.0.1)
+    rack (2.0.3)
    rack-livereload (0.3.16)
      rack
    rake (12.0.0)
@@ -139,7 +134,11 @@ GEM
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.5.0)
    rspec-support (3.5.0)
-    sass (3.4.23)
+    sass (3.4.24)
+    sassc (1.11.1)
+      bundler
+      ffi (~> 1.9.6)
+      sass (>= 3.3.0)
    scss_lint (0.52.0)
      rake (>= 0.9, < 13)
      sass (~> 3.4.20)
@@ -150,7 +149,7 @@ GEM
    tilt (2.0.7)
    tzinfo (1.2.3)
      thread_safe (~> 0.1)
-    uglifier (3.1.11)
+    uglifier (3.2.0)
      execjs (>= 0.3.0, < 3)
    yaml-lint (0.0.9)
@@ -164,13 +163,14 @@ DEPENDENCIES
  kramdown (~> 1.10)
  middleman (~> 4.2)
  middleman-autoprefixer
-  middleman-blog!
+  middleman-blog (~> 4.0)
  middleman-livereload
  middleman-minify-html
  middleman-syntax
  mini_racer (~> 0.1)
  nokogiri
  rspec (~> 3.5)
+  sassc
  scss_lint
  stringex
  tzinfo-data
@@ -178,4 +178,4 @@ DEPENDENCIES
  yaml-lint
 BUNDLED WITH
-   1.14.6
+   1.15.0
--- a/data/applications.yml
+++ b/data/applications.yml
@@ -450,6 +450,11 @@
      links:
        - url: http://dropfort.com
          title: www.dropfort.com
+    - title: Confluence
+      content: This plugin aims to provide a connection between Confluence and your GitLab server instance. It enables you to view issues, builds, merge requests and project information with simple to use macros.
+      links:
+        - url: https://rumpelcoders.atlassian.net/wiki/display/PLUG/GitLab+Connector+Plugin
+          title: GitLab Connector Plugin
 - title: GUI Git Clients
  id: gui-git-clients
  applications:

--- a/data/issue_bash.yml
+++ b/data/issue_bash.yml
+- name: 2016 GitLab Issue Bash
+  start_date: 2016-12-3
+  end_date: 2016-12-4
+  contacts:
+    - markglenfletcher
+    - haynes
+    - ClemMakesApps
+  proposal: https://gitlab.com/gitlab-org/gitlab-ce/issues/17815
+- name: GitLab Issue Bash Q1 2017
+  start_date: 2017-3-4
+  end_date: 2017-3-5
+  contacts:
+    - markglenfletcher
+    - haynes
+    - ClemMakesApps
+  proposal: https://gitlab.com/gitlab-org/gitlab-ce/issues/27272
+- name: GitLab Issue Bash Q2 2017
+  start_date: 2017-6-3
+  end_date: 2017-6-4
+  contacts:
+    - markglenfletcher
+    - haynes
+    - blackst0ne
+  proposal: https://gitlab.com/gitlab-org/gitlab-ce/issues/29256
+- name: GitLab Issue Bash Q3 2017
+  start_date: 2017-9-2
+  end_date: 2017-9-3
+  contacts:
+    - markglenfletcher
+    - TBC
+- name: GitLab Issue Bash Q4 2017
+  start_date: 2017-12-2
+  end_date: 2017-12-3
+  contacts:
+    - markglenfletcher
+    - TBC
--- a/data/platforms.yml
+++ b/data/platforms.yml
 - name: ubuntu1404
  long_name: Ubuntu 14.04
  subtitle: (for 15.04 select and download the package manually)
-  download_command: curl -sS https://packages.gitlab.com/install/repositories/gitlab/gitlab-ee/script.deb.sh | sudo bash
+  download_command: curl -sS https://packages.gitlab.com/install/repositories/gitlab/gitlab-ce/script.deb.sh | sudo bash
  install_commands: |
-                    sudo apt-get install gitlab-ee
+                    sudo apt-get install gitlab-ce
  install_commands_manual: |
-                    curl -LJO https://packages.gitlab.com/gitlab/gitlab-ee/packages/ubuntu/trusty/gitlab-ee-XXX.deb/download
+                    curl -LJO https://packages.gitlab.com/gitlab/gitlab-ce/packages/ubuntu/trusty/gitlab-ce-XXX.deb/download
-                    dpkg -i gitlab-ee-XXX.deb
+                    dpkg -i gitlab-ce-XXX.deb
  dependency_commands: |
                    sudo apt-get install curl openssh-server ca-certificates postfix
 - name: ubuntu1604
  long_name: Ubuntu 16.04
  subtitle: (recommended)
-  download_command: curl -sS https://packages.gitlab.com/install/repositories/gitlab/gitlab-ee/script.deb.sh | sudo bash
+  download_command: curl -sS https://packages.gitlab.com/install/repositories/gitlab/gitlab-ce/script.deb.sh | sudo bash
  install_commands: |
-                    sudo apt-get install gitlab-ee
+                    sudo apt-get install gitlab-ce
  install_commands_manual: |
-                    curl -LJO https://packages.gitlab.com/gitlab/gitlab-ee/packages/ubuntu/xenial/gitlab-ee-XXX.deb/download
+                    curl -LJO https://packages.gitlab.com/gitlab/gitlab-ce/packages/ubuntu/xenial/gitlab-ce-XXX.deb/download
-                    dpkg -i gitlab-ee-XXX.deb
+                    dpkg -i gitlab-ce-XXX.deb
  dependency_commands: |
                    sudo apt-get install curl openssh-server ca-certificates postfix
 - name: debian7
  long_name: Debian 7
-  download_command: curl -sS https://packages.gitlab.com/install/repositories/gitlab/gitlab-ee/script.deb.sh | sudo bash
+  download_command: curl -sS https://packages.gitlab.com/install/repositories/gitlab/gitlab-ce/script.deb.sh | sudo bash
  install_commands: |
-                    sudo apt-get install gitlab-ee
+                    sudo apt-get install gitlab-ce
  install_commands_manual: |
-                    curl -LJO https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/wheezy/gitlab-ee-XXX.deb/download
+                    curl -LJO https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/wheezy/gitlab-ce-XXX.deb/download
-                    dpkg -i gitlab-ee-XXX.deb
+                    dpkg -i gitlab-ce-XXX.deb
  dependency_commands: |
                    sudo apt-get install curl openssh-server ca-certificates postfix
 - name: debian8
  long_name: Debian 8
-  download_command: curl -sS https://packages.gitlab.com/install/repositories/gitlab/gitlab-ee/script.deb.sh | sudo bash
+  download_command: curl -sS https://packages.gitlab.com/install/repositories/gitlab/gitlab-ce/script.deb.sh | sudo bash
  install_commands: |
-                    sudo apt-get install gitlab-ee
+                    sudo apt-get install gitlab-ce
  install_commands_manual: |
-                    curl -LJO https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/jessie/gitlab-ee-XXX.deb/download
+                    curl -LJO https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce-XXX.deb/download
-                    dpkg -i gitlab-ee-XXX.deb
+                    dpkg -i gitlab-ce-XXX.deb
  dependency_commands: |
                    sudo apt-get install curl openssh-server ca-certificates postfix
 - name: centos6
  long_name: CentOS 6
  subtitle: (and RedHat/Oracle/Scientific Linux 6)
-  download_command: curl -sS https://packages.gitlab.com/install/repositories/gitlab/gitlab-ee/script.rpm.sh | sudo bash
+  download_command: curl -sS https://packages.gitlab.com/install/repositories/gitlab/gitlab-ce/script.rpm.sh | sudo bash
  install_commands: |
-                    sudo yum install gitlab-ee
+                    sudo yum install gitlab-ce
  install_commands_manual: |
-                    curl -LJO https://packages.gitlab.com/gitlab/gitlab-ee/packages/el/6/gitlab-ee-XXX.rpm/download
+                    curl -LJO https://packages.gitlab.com/gitlab/gitlab-ce/packages/el/6/gitlab-ce-XXX.rpm/download
-                    rpm -i gitlab-ee-XXX.rpm
+                    rpm -i gitlab-ce-XXX.rpm
  dependency_commands: |
                    sudo yum install curl openssh-server openssh-clients postfix cronie
                    sudo service postfix start
@@ -59,12 +59,12 @@
 - name: centos7
  long_name: CentOS 7
  subtitle: (and RedHat/Oracle/Scientific Linux 7)
-  download_command: curl -sS https://packages.gitlab.com/install/repositories/gitlab/gitlab-ee/script.rpm.sh | sudo bash
+  download_command: curl -sS https://packages.gitlab.com/install/repositories/gitlab/gitlab-ce/script.rpm.sh | sudo bash
  install_commands: |
-                    sudo yum install gitlab-ee
+                    sudo yum install gitlab-ce
  install_commands_manual: |
-                    curl -LJO https://packages.gitlab.com/gitlab/gitlab-ee/packages/el/7/gitlab-ee-XXX.rpm/download
+                    curl -LJO https://packages.gitlab.com/gitlab/gitlab-ce/packages/el/7/gitlab-ce-XXX.rpm/download
-                    rpm -i gitlab-ee-XXX.rpm
+                    rpm -i gitlab-ce-XXX.rpm
  dependency_commands: |
                    sudo yum install curl policycoreutils openssh-server openssh-clients
                    sudo systemctl enable sshd
@@ -77,12 +77,12 @@
                    sudo systemctl reload firewalld
 - name: opensuse421
  long_name: OpenSUSE 42.1
-  download_command: curl -sS https://packages.gitlab.com/install/repositories/gitlab/gitlab-ee/script.rpm.sh | sudo bash
+  download_command: curl -sS https://packages.gitlab.com/install/repositories/gitlab/gitlab-ce/script.rpm.sh | sudo bash
  install_commands: |
-                    sudo zypper install gitlab-ee
+                    sudo zypper install gitlab-ce
  install_commands_manual: |
-                    curl -LJO https://packages.gitlab.com/gitlab/gitlab-ee/packages/opensuse/42.1/gitlab-ee-XXX.rpm/download
+                    curl -LJO https://packages.gitlab.com/gitlab/gitlab-ce/packages/opensuse/42.1/gitlab-ce-XXX.rpm/download
-                    rpm -i gitlab-ee-XXX.rpm
+                    rpm -i gitlab-ce-XXX.rpm
  dependency_commands: |
                    sudo zypper install curl openSSH postfix
                    sudo systemctl enable sshd
@@ -97,10 +97,10 @@
  download_command: |
                    sudo curl -sS https://packages.gitlab.com/install/repositories/gitlab/raspberry-pi2/script.deb.sh | sudo bash
  install_commands: |
-                    sudo apt-get install gitlab-ee
+                    sudo apt-get install gitlab-ce
  install_commands_manual: |
-                    curl -LJO https://packages.gitlab.com/gitlab/raspberry-pi2/packages/raspbian/jessie/gitlab-ee-XXX.deb/download
+                    curl -LJO https://packages.gitlab.com/gitlab/raspberry-pi2/packages/raspbian/jessie/gitlab-ce-XXX.deb/download
-                    dpkg -i gitlab-ee-XXX.deb
+                    dpkg -i gitlab-ce-XXX.deb
  dependency_commands: |
                    sudo apt-get install curl openssh-server ca-certificates postfix apt-transport-https
                    curl https://packages.gitlab.com/gpg.key | sudo apt-key add -
--- a/data/promo.yml
+++ b/data/promo.yml
-text: "GitLab 9.2 Released with Multiple Assignees For Issues, Pipeline Schedules, and much more!"
+text: "Join our webcast, 'Getting Started with Git' on June 14th!"
-link: '/2017/05/22/gitlab-9-2-released/'
+link: 'http://get.gitlab.com/getting-started-with-git/'
--- a/data/resellers.yml
+++ b/data/resellers.yml
 #
-#- name: Emerasoft
+- name: Emerasoft
-#  image: /images/resellers/emerasoft.png
+  image: /images/resellers/emerasoft.png
-#  region: EMEA
+  region: EMEA
-#  content: | 
+  content: | 
-#   
-#    Emerasoft offer products, consulting and training services for Application Lifecycle Management, DevOps, Business Process Management, Service Oriented Architecture, Software Testing and Cyber Security.
+    Emerasoft is an Italian company providing IT products and services. We specialize in solving complex technical challenges, especially in the areas of ALM, DevOps, UX, OS, SOA, BPM, Software Testing & Security, Embedded Software Development, IT Service Management, Digital Publishing & App Development.
-#    We work with Commercial and Open Source technologies, able to guarantee transparency, interoperability and proven ROI.
-#    
+    Da oltre 10 anni Emerasoft offre prodotti, servizi di consulenza e formazione su tematiche quali ALM, DevOps, UX, OS, SOA, BPM, Software Testing e Security, Embedded Software Development, IT Service Management, Digital Publishing & App Development.
-#    Le diverse esperienze si riflettono nella capacità di affrontare problemi eterogenei e complessi in modo professionale e qualificato.  
-#    La capacità di produrre e selezionare tecnologie allo stato dell’arte e stringere accordi di collaborazione continua nell’esplorazione di aree di frontiera nello sviluppo applicativo, stimolo e sfida a continuare un percorso di eccellenza e qualità.
+  email: GitLab@Emerasoft.com
-#
+  contact:
-#  email: GitLab@Emerasoft.com
+    - address: Torino, Italia
-#  contact:
+      phone: +39 (011) 012 0370
-#    - address: Turino, Italia
+    - address: Roma, Italia
-#      phone: +39 (011) 012 0370
+      phone: +39 (06) 8781 1323
-#    - address: Roma, Italia
+    - website: http://www.emerasoft.com/devops-servizi-consulenza-strumenti/gitlab/
-#      phone: +39 (06) 8781 1323
+  social:
-#    - website: https://www.emerasoft.com
+    - type: twitter
-#  social:
+      url: https://twitter.com/emerasoft
-#    - type: twitter
+    - type: linkedin
-#      url: https://twitter.com/emerasoft
+      url: https://www.linkedin.com/company-beta/1203309/
-#    - type: linkedin
+    - type: facebook
-#      url: https://www.linkedin.com/company-beta/1203309/
+      url: https://www.facebook.com/emerasoft
-#    - type: facebook
+    - type: youtube
-#      url: https://www.facebook.com/emerasoft
+      url: https://www.youtube.com/user/Emerasoft
-#    - type: youtube
+    - type: google-plus
-#      url: https://www.youtube.com/user/Emerasoft
+      url: https://plus.google.com/u/1/+Emerasoft_solutionstocollaborate
-#    - type: google-plus
+    - type: gitlab   
-#      url: https://plus.google.com/u/1/+Emerasoft_solutionstocollaborate
+      url: https://gitlab.com/Emerasoft
-#  
+    - type: other
+      url: https://www.slideshare.net/emerasoft
 #
 #- name: Fierce Software
-#  image: /images/resellers/fierceSW.png
+#  image: /images/resellers/logo_fiercesoftware-horizontal.png
+# image: /images/resellers/fierceSW.png
 #  region: NA
 #  content: | 
 #   
@@ -140,7 +142,7 @@
 #
 - name: Lyra Infosystems
-  image: /images/resellers/lyra-logo.svg
+  image: /images/resellers/LyraLogo.png
  region: APAC
  content: |
    Lyra is a recognized leader as Open Source Solution Enabler in Asia. We offer comprehensive suite of best-in-class technologies, solutions, support and services to software consuming organizations. Leading enterprises rely on our expertise to maximize their productivity and minimize risk by optimizing their SDLC processes. Our strategic consulting and services deliver high quality, on-demand solutions.
@@ -272,7 +274,7 @@
  contact:
    - address: 서울, 대한민국
      phone: +82 (02) 555-4847
-    - website: http://architectgroup.com/portfolio-item/gitlab/
+    - website: https://www.architectgroup.com/docs/gitlab/Introduction/Overview.html
  social:
    - type: facebook
      url: https://www.facebook.com/openarchitect/

--- a/data/resources.yml
+++ b/data/resources.yml
@@ -58,6 +58,8 @@
      url: /2017/04/10/our-secret-to-tackling-thousands-of-open-issues/
    - 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]'
+      url: 'http://get.gitlab.com/managing-production-deployments-on-kubernetes/'
 - title: 'Collaboration'
  data:
@@ -84,4 +86,6 @@
    - 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]'
      url: /2015/02/06/why-move-to-a-single-code-collaboration-tool/
\ No newline at end of file
+    - title: 'Innovate Faster Without Sacrificing Security or Quality [webcast]'
+      url: 'https://www.youtube.com/watch?v=9_yicOrtbqM&t=627s'
\ No newline at end of file
--- a/data/team.yml
+++ b/data/team.yml
@@ -328,7 +328,7 @@
         tea connoisseur, and a cat enthusiast.
 - name: Gabriel Mazetto
-  locality: Utrecht
+  locality: Amsterdam
  country: The Netherlands
  role: <a href="https://about.gitlab.com/jobs/developer/">Developer</a>
  reports_to: Platform Lead
@@ -574,6 +574,7 @@
             <li><a href="https://gitlab.com/help/user/project/cycle_analytics">Cycle Analytics</a> <a href="/jobs/expert/">expert</a></li>
             <li><a href="https://gitlab.com/gitlab-org/gitlab-development-kit">GitLab Development Kit</a> <a href="/jobs/expert/">expert</a></li>
             <li><a href="https://about.gitlab.com/handbook/support/#support-turbo">Support Turbo</a></li>
+             <li>Deployment Expert</li>
  story:  |
          James is an experienced developer coming from the corporate world
          of Vodafone in the UK. He has contributed to the open source
@@ -1449,8 +1450,9 @@
  expertise:  |
              <li>On-call hero!</li>
              <li>Enterprise Edition Specialist</li>
+              <li><a href="http://docs.gitlab.com/ee/api/">GitLab API</a> <a href="/jobs/expert/">expert</a></li>
  story:  |
-          Athar likes programming in Python and Go. In his spare time, he enjoys checking out random courses on Coursera and hanging out with friends.
+          Athar likes programming in Python and Go. In his spare time, he enjoys checking out different MOOCs and hanging out with friends.
 - name: Villi Iltchev
  locality: San Francisco, CA
@@ -1763,7 +1765,7 @@
 - name: Cindy Pallares
  locality: Texas
  country: USA
-  role: <a href="https://about.gitlab.com/jobs/support-engineer/">Jr. Support Engineer</a>
+  role: <a href="https://about.gitlab.com/jobs/support-engineer/">Support Engineer</a>
  reports_to: Support Lead
  picture: cindy.jpg
  twitter:
@@ -2072,6 +2074,8 @@
  picture: daniele.jpg
  twitter: escociao
  gitlab: omame
+  expertise: |
+             <li>Deployment Expert</li>
  story:  |
          Daniele fell in love with computers when he started to use a Vic 20 very early in his life and never looked back.
          In his teenage years he replaced lego with pc components and suddenly his room became a messy computer lab.
@@ -2482,27 +2486,26 @@
  gitlab: djeffeos
  story: Jeffrey has 7 years of experience working with developer communities introducing new tools and methodologies that increase productivity and decrease time to market. When Jeffrey isn’t geeking out, training for hockey tournaments, mountain bike races or rock climbing trips with his friends, he’s enjoying the company of his amazing wife, Kate.
- name: C.K.
+- name: Chenje Katanda
-  locality:
+  locality: Harare
-  country:
+  country: Zimbabwe
  role: <a href="https://about.gitlab.com/jobs/support-engineer/">Support Engineer Intern</a>
  reports_to: Support Lead
-  picture: logo-extra-whitespace.png
+  picture: chenje.jpg
-  twitter:
+  twitter: ckatanda
-  gitlab:
+  gitlab: ckatanda
-  story:  |
+  story: Chenje is a software developer with a strong passion for sharing knowledge and is always working towards improving ease of access to this knowledge for all. Before joining GitLab Chenje worked with a non-profit college access program in Harare. In his spare time, Chenje enjoys fast paced sports and wildlife photography.
-          Joining May 29th
- name: J.S.
+- name: Joe Scheuermann
-  locality:
+  locality: Granite Bay, CA
-  country:
+  country: USA
  role: <a href="https://about.gitlab.com/jobs/vp-of-marketing/">Chief Marketing Officer (CMO)</a>
  reports_to: CEO
-  picture: logo-extra-whitespace.png
+  picture: joes.jpg
-  twitter:
+  twitter: JAScheuermann
-  gitlab:
+  gitlab: joe.s
  story:  |
-          Joining June 1st
+          Joe is a seasoned marketing practitioner and leader with over two decades of experience in the technology industry from hyper-growth startups to global enterprises. Prior to joining GitLab, Joe has held marketing leadership positions at companies including Trifacta, Mercury Interactive, Business Objects, Teradata and CA Technology. Outside of work, Joe is active in his community and in helping his wife wrangle his three young children and one very large Bernese Mountain Dog. A graduate of UCLA, Joe is also a passionate Bruins fan as well as a die hard San Jose Sharks and NHL fan. And once each year, you can find Joe in the middle of San Francisco Bay, dodging sea life and fellow swimmers in his annual escape from Alcatraz swim.
 - name: Courtland 'Courtlandia' Smith
  locality: San Francisco, CA
@@ -2561,6 +2564,17 @@
  story:  |
          Joining June 12th
+- name: S.M.
+  locality:
+  country:
+  role: <a href="https://about.gitlab.com/jobs/developer-ci/">CI/CD Developer Intern</a>
+  reports_to: CI/CD Lead
+  picture: logo-extra-whitespace.png
+  twitter:
+  gitlab:
+  story:  |
+          Joining June 12th
 - name: J.J.
  locality:
  country:

--- a/lib/custom_helpers.rb
+++ b/lib/custom_helpers.rb
@@ -23,7 +23,9 @@ module CustomHelpers
  end
  def markdown(text)
-    Tilt['markdown'].new { text }.render
+    # Scope parameter is necessary to make Markdown in YAML work properly
+    # See: https://github.com/middleman/middleman/issues/653#issuecomment-9954111
+    Tilt['markdown'].new { text }.render(scope: self)
  end
  def kramdown s

--- a/source/about/index.html.md
+++ b/source/about/index.html.md
@@ -59,7 +59,7 @@ We graduated in March of 2015 and had 9 people on our team.
 ### _2016: Growth_
-In 2016 the number of [people that contributed to GitLab] grew to more than 1000.
+In 2016 the number of [people that contributed to GitLab](http://contributors.gitlab.com/) grew to more than 1000.
 More than 100,000 organizations and millions of users are using GitLab.
 Our team grew with 100 people to more than 140.
 In September we announce [our master plan](https://about.gitlab.com/2016/09/13/gitlab-master-plan/) and raising $20m in our B round of financing.
@@ -146,7 +146,7 @@ Apart from making new features GitLab Inc. does a lot of work that benefits both
 When someone contributes a feature to CE that is already in EE we have a hard decision to make.
 We hope that people focus on contributing features that are neither in CE nor EE.
-This way both edits benefit from a new feature and GitLab Inc. don't have to make a hard decision.
+This way both editions benefit from a new feature and GitLab Inc. don't have to make a hard decision.
 The features we plan to build for EE are shared on our [direction page](https://about.gitlab.com/direction/) and we welcome people to contribute features to CE that are planned for future EE releases, if you pick one from the upcoming release please ask in the issue if someone is already working on it.
 When someone does contribute a feature to CE that is already in EE we weigh a couple of factors in that decision:

--- a/source/applications/index.html.haml
+++ b/source/applications/index.html.haml
@@ -13,9 +13,6 @@ extra_js:
 .wrapper
  .application-container
    %h1 Our Application Partners
-    %p
-      :markdown
-        Every application that supports Git will work with GitLab. Below are some of the applications we wanted to highlight. To learn more about integrating with GitLab and read how to add an application to this page, please head to our [partners page](https://about.gitlab.com/integrations/).
  .search-container
    .container
      %input.js-search-apps{ type: "search", placeholder: "Search for an application by name" }
@@ -24,6 +21,8 @@ extra_js:
    %ul.suggestions
      .container.js-suggestions
  .container
+    %p.application-info
+      Every application that supports Git will work with GitLab. Below are some of the applications we wanted to highlight. To learn more about integrating with GitLab and read how to add an application to this page, please head to our <a href="https://about.gitlab.com/integrations/">partners page</a>.
    %h2.categories-header Application categories
    .app-categories
      - data.applications.each do |category|

--- a/source/atom.xml.haml
+++ b/source/atom.xml.haml
@@ -8,7 +8,7 @@
  %link{:href => site_url}
  - unless blog.articles.empty?
-    %updated= blog.articles.first.date.to_time.iso8601
+    %updated= blog.articles.first.date.to_datetime.rfc3339
  %author
    %name The GitLab Team
@@ -17,8 +17,8 @@
      %title=article.title
      %link{:rel => "alternate", :href => URI.join(site_url, article.url)}
      %id= URI.join(site_url, article.url)
-      %published= article.date.to_time.iso8601
+      %published= article.date.to_datetime.rfc3339
-      %updated article.date.to_time.iso8601
+      %updated= article.date.to_datetime.rfc3339
      %author
        %name= article.data.author

--- a/source/community/issue-bash/index.html.haml
+++ b/source/community/issue-bash/index.html.haml
+---
+layout: default
+title: Issue Bash
+suppress_header: true
+extra_css:
+  - issue_bash.css
+  - faq.css
+extra_js:
+  - issue_bash.js
+  - faq.js
+---
+.wrapper
+  .bash-summary
+    .bash-summary-content
+      %h1 Community Issue Bash
+      %p
+        Every quarter we hold a Community Event called an Issue bash. These events aim to promote collaboration within our Community and introduce new contributors to GitLab.
+      %p
+        We try to make the event accessible to contributors of all levels by collaborating on a range of tasks.
+      %ul
+        %li Finding issues in the tracker that can be easily closed
+        %li Categorizing existing issues that are lacking labels
+        %li Fixing known bugs and pain points
+        %li Shipping of existing feature proposals
+      %p
+        There is no shortage of tasks that contributors can try their hand at. Whether this is writing their first merge request to contribute a bug fix or a feature proposal or collaborating with the core team to track down and close some duplicate issues and streamline the issue tracker.
+      .events-link
+        %a.link-box{ href: '#bash-events' } Check out the Events
+  #bash-info
+  #bash-q-a.content-container.animated
+    .container
+      %h2.faq-title.light.text-center
+        Frequently Asked Questions
+      .faq-holder.clearfix
+        %ol.faq-container.list-unstyled
+          %li.faq-item
+            .faq-inner-item
+              %a.faq-question.js-faq-question{ href: "#" }
+                Where can I find out about upcoming issue bashes?
+                %i.fa.fa-angle-down.pull-right
+              .faq-answer
+                %p
+                Issue bashes are announced on the blog and on Twitter. You can find a list of the bashes that we have planned and the dates in the
+                %a{ href: '#bash-events' } section below
+          %li#comms-channels.faq-item
+            .faq-inner-item
+              %a.faq-question.js-faq-question{ href: "#" }
+                Where can I ask questions and look for Issue Bash help?
+                %i.fa.fa-angle-down.pull-right
+              .faq-answer
+                %p You can mention contacts for the Issue bash in issues or you can use one of our public communication channels to collaborate:
+                %ul
+                  %li
+                    %a{ href: 'https://gitter.im/gitlabhq/gitlabhq' } Gitter
+                  %li
+                    %a{ href: 'https://webchat.freenode.net/?channels=gitlab' } IRC
+          %li.faq-item
+            .faq-inner-item
+              %a.faq-question.js-faq-question{ href: "#" }
+                Where can I learn how the prize winners are calculated?
+                %i.fa.fa-angle-down.pull-right
+              .faq-answer
+                %a{ href: 'https://gitlab.com/gitlab-issue-bash/prize-winner-calculator'} GitLab Issue Bash / Prize Winner Calculator
+          %li.faq-item
+            .faq-inner-item
+              %a.faq-question.js-faq-question{ href: "#" }
+                I want to help close issues. Where do I get started?
+                %i.fa.fa-angle-down.pull-right
+              .faq-answer
+                #issue-closing
+                  %h4
+                    %strong Steps
+                  %ul
+                    %li Identifying duplicates issues and mentioning a member of the team
+                    %ul
+                      %li Team member will triage and possibly close as a duplicate
+                      %li (Non technical) Will need to be able to search through issues and identify duplicates
+                    %li Attempting to reproduce labelled bugs in a test project on GitLab.com and mention a team member with the results of their investigation (suggesting labels, suggesting closure, etc)
+                    %ul
+                      %li Team member will triage and close if the bug is no longer reproducible
+                      %li (Both Technical and Non technical) Some bugs are harder to reproduce than others, but the majority should be reproducible using a test project created on GitLab.com
+                      %li
+                        Please refrain from testing issues with the
+                        %span.label security
+                        label on GitLab.com
+                  %h4
+                    %strong Best place to start
+                  %ul
+                    %li Not really a suggestion for finding duplicates. Duplicates could exist for any issue and we don't have any particular view that makes finding them easier.
+                    %li
+                      %a{ href: "https://gitlab.com/gitlab-org/gitlab-ce/issues?scope=all&state=opened&label_name[]=bug" } Existing bugs view
+                      will help for determining if old bugs should be closed as non-reproducible or kept open
+                  %h4
+                    %strong Best way to help out
+                  %p Comment on issues about what you have found out and your suggestions for issues, whether to close or keep open and if you've found a duplicate, mention the issue ID. Mention a key contact so that the correct course of action can be taken.
+          %li.faq-item
+            .faq-inner-item
+              %a.faq-question.js-faq-question{ href: "#" }
+                How do I know which labels are right to apply?
+                %i.fa.fa-angle-down.pull-right
+              .faq-answer
+                %p
+                  We have
+                  %a{href: 'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#workflow-labels'} a guide for labels in the Contributing guide.
+        %ol.faq-container.list-unstyled
+          %li.faq-item
+            .faq-inner-item
+              %a.faq-question.js-faq-question{ href: "#" }
+                Who can participate?
+                %i.fa.fa-angle-down.pull-right
+              .faq-answer
+                %p Anyone and everyone! We aim to make the Issue Bash as accessible as possible and offer things to do for contributors with no experience or plenty of experience. We also hope that contributors of all technical abilities can find stuff to work on.
+          %li.faq-item
+            .faq-inner-item
+              %a.faq-question.js-faq-question{ href: "#" }
+                Where can I give feedback about the event itself?
+                %i.fa.fa-angle-down.pull-right
+              .faq-answer
+                %p We'd love to hear what you think about the event and whether you have any suggestion for changes that we can make.
+                %p
+                  Please raise an issue on the
+                  %a{href: 'https://gitlab.com/gitlab-issue-bash/feedback/issues'} Feedback tracker
+                  or raise an issue by
+                  %a{href: 'mailto:incoming+gitlab-issue-bash/feedback@gitlab.com'} sending an email.
+          %li.faq-item
+            .faq-inner-item
+              %a.faq-question.js-faq-question{ href: "#" }
+                I want to help categorise issues. Where do I get started?
+                %i.fa.fa-angle-down.pull-right
+              .faq-answer
+                #issue-categorising
+                  %h4
+                    %strong Steps
+                  %ul
+                    %li Investigate unlabelled issues with the aim of providing a suitable label and mentioning a team member
+                    %ul
+                      %li Team member will apply suggested label
+                      %li (Non technical) Unlabelled issues can be located and investigated by contributors of all technical abilities
+                  %h4
+                    %strong Best place to start
+                  %ul
+                    %li
+                      %a{ href: "https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name%5B%5D=No+Label&scope=all&sort=created_asc&state=opened" } Unlabelled issues
+                    %li These issues are all unlabelled and open, they haven't been triaged as of yet
+                    %li These issues are listed in order of first raised, so some may no longer be valid, some will be old
+                    %li These issues may contain interesting feature proposals or bugs that haven't yet been categorised
+                  %h4
+                    %strong Best way to help out
+                  %p Write a comment on the issue mentioning a key contact and the labels suggested using the label syntax ~label
+          %li.faq-item
+            .faq-inner-item
+              %a.faq-question.js-faq-question{ href: "#" }
+                I want to help fix issues. Where do I get started?
+                %i.fa.fa-angle-down.pull-right
+              .faq-answer
+                #issue-fixing
+                  %h4
+                    %strong Steps
+                  %p Fixing known bugs and pain points or shipping existing feature proposals
+                  %ul
+                    %li
+                      Look into the issues labelled as
+                      %span.label bug
+                      , attempt to reproduce and provide a merge request to fix
+                    %ul
+                      %li Team member will label the issues and merge requests as needed and mention other team members that can help progress the original issue to closure
+                      %li
+                        Some issues may just be filed under
+                        %span.label Documentation
+                      %li (Technical and Non technical) Some bugs are easier to fix and may only require changes to documentation which can be done via the Web Interface, some are much more difficult to fix
+                    %li
+                      Look into the issues labelled as
+                      %span.label Accepting Merge Requests
+                      %span.label feature proposal
+                      , understand the use case and create a merge request to provide the new functionality
+                    %ul
+                      %li Team member will label the issues and merge requests as needed and mention other team members that can help progress the original issue to closure
+                      %li (Technical and Non technical) Some feature proposals are easier to write and may only require changes to documentation which can be done via the Web Interface, some are much more difficult to satisfy
+                  %h4
+                    %strong Best place to start
+                  %ul
+                    %li
+                      %a{ href: "https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name[]=bug&scope=all&sort=created_asc&state=opened" } Existing bugs
+                    %ul
+                      %li These issues have all been categorised as bugs at one time or another
+                      %li These issues are ordered by oldest updated first
+                      %li These bugs may have been fixed and therefore the issues are no longer reproducible and should be closed
+                      %li These bugs may still stand and a contributor could pick up the issue and provide a fix in a merge request
+                      %li These bugs will touch on all sorts of categories from Documentation to style fixes to frontend and backend fixes. There's plenty for everyone
+                    %li
+                      %a{ href: "https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name[]=bug&label_name[]=Accepting+Merge+Requests&scope=all&sort=created_asc&state=opened" } Accepting Merge Requests - bugs
+                    %ul
+                      %li
+                        These issues have already been opened up for a
+                        %span.label Community Contribution
+                      %li These issues have been categorised as a bug
+                      %li These issues are listed in order of first raised
+                    %li
+                      %a{ href: "https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name[]=feature+proposal&label_name[]=Accepting+Merge+Requests&scope=all&sort=created_asc&state=opened" } Accepting Merge Requests - feature proposals
+                    %ul
+                      %li
+                        These issues have already been opened up for a
+                        %span.label Community Contribution
+                      %li These issues have been categorised as a feature proposal
+                      %li These issues are listed in order of first raised
+                    %li
+                      %a{ href: "https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name[]=Accepting+Merge+Requests&weight=1&scope=all&sort=created_asc&state=opened" } Ideal First Time Contribution issues
+                    %ul
+                      %li Ideal for new contributors!
+                  %h4
+                    %strong Best way to help out
+                  %p Submit a merge request with a potential fix for the issue and mention a key contact so that proper labels can be assigned. The normal review process for Community Contributions will then commence.
+          %li.faq-item
+            .faq-inner-item
+              %a.faq-question.js-faq-question{ href: "#" }
+                How do I get started making my first contribution?
+                %i.fa.fa-angle-down.pull-right
+              .faq-answer
+                %p
+                  We have
+                  %a{href: 'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md'} a guide for contributing to GitLab
+                  , please take a look there or ask questions in the
+                  %a.comm-channels-link{href: '#comms-channels'} Communication channels
+    #bash-events.content-container
+      %h2.faq-title.light.text-center
+        Events
+      - bashes = data.issue_bash
+      - bashes.each do |bash|
+        .bash-event
+          .bash-event-headers
+            %h3.bash-event-name
+              = bash.name
+            .bash-event-dates
+              %p #{bash.start_date} to #{bash.end_date}
+          .bash-contacts
+            %h4 Contacts
+            %ul
+              - bash.contacts.each do |contact|
+                %a{href:"https://gitlab.com/#{contact}"} @#{contact}
+          %div
+            - if bash.proposal
+              %p.event-description
+                %a{ href: bash.proposal } Issue Bash Proposal
+            .clearfix
--- a/source/gitlab-hosted/index.html.md
+++ b/source/gitlab-hosted/index.html.md
@@ -42,29 +42,28 @@ backing up customers own private and secure GitLab instances.
  will always be automatically updated to the latest GitLab version, or you can
  stay on your current version and choose when you want the upgrade to happen
-  ### What version of GitLab Enterprise Edition does GitHost support?
+### What version of GitLab Enterprise Edition does GitHost support?
-  GitHost will always install the latest version of GitLab when a new server is
+GitHost will always install the latest version of GitLab when a new server is
-  created.
+created.
-  ### Are all features of GitLab Enterprise Edition available on GitHost?
+### Are all features of GitLab Enterprise Edition available on GitHost?
-  No, unfortunately some features are not supported on GitHost. Specifically, the following features are **not supported**:
+No, unfortunately some features are not supported on GitHost. Specifically, the following features are **not supported**:
-  - GitLab Pages
+- GitLab Pages
-  - Kerberos based login
+- Kerberos based login
-  - ChatOps (Mattermost cannot be run in a GitHost instance)
+- ChatOps (Mattermost cannot be run in a GitHost instance)
-  - Global code search with ElasticSearch
+- Global code search with ElasticSearch
-  - Log forwarding
+- Log forwarding
-  - GitLab Geo
+- GitLab Geo
-  - High Availability
+- High Availability
-  - MySQL database
+- MySQL database
-  - Redis Sentinel
+- Redis Sentinel
-  - Backup uploading to custom S3
+- Backup uploading to custom S3
-  - Custom email configuration
+- Custom email configuration
-  - Reply by email
+- Reply by email
-  - Custom `gitlab.rb` file changes
+- Custom `gitlab.rb` file changes
 ### What regions does GitHost operate in?

--- a/source/handbook/benefits/index.html.md
+++ b/source/handbook/benefits/index.html.md
@@ -35,6 +35,7 @@ NOTE: Our contractor agreements and employment contracts are all on the [Contrac
           for example for a team member that works for GitLab 50% of the time,
           the lump sum would be $10,000.
 1. [Paid time off policy](https://about.gitlab.com/handbook/paid-time-off).
+1. [Tuition Reimbursement](https://about.gitlab.com/handbook/people-operations/#tuition-reimbursement)
 1. [GitLab Summit](https://about.gitlab.com/culture/summits)
   * Every nine months or so GitLabbers gather at an exciting new location to [stay connected](https://about.gitlab.com/2016/12/05/how-we-stay-connected-as-a-remote-company/), at what we like to call a GitLab Summit. It is important to spend time face to face to get to know your team and, if possible, meet everyone who has also [bought into the company vision](http://www.excitingrole.com/how-to-do-startup-due-diligence/#.h/). There are fun activities planned by our GitLab Summit Experts, work time, and presentations from different functional groups to make this an experience that you are unlikely to forget! Attendance is optional, but encouraged. For more information and compilations of our past summits check out our [summits page](https://about.gitlab.com/culture/summits).
 1. [Business Travel Accident Policy](https://drive.google.com/a/gitlab.com/file/d/0B4eFM43gu7VPVl9rYW4tXzIyeUlMR0hidWIzNk1sZjJyLUhB/view?usp=sharing)

--- a/source/handbook/ceo/index.html.md
+++ b/source/handbook/ceo/index.html.md
+---
+layout: markdown_page
+title: "CEO Preferences"
+---
+- TOC
+{:toc}
+## Intro
+{: #intro}
+This page is intended to be helpful, feel free to deviate from it and update this page if you think it makes sense.
+If there are things that might seem pretentious or overbearing please raise them so we can remove or adapt them.
+Many items further down this page are a guideline for our [Executive Assistants](https://about.gitlab.com/jobs/executive-assistant/) (EAs).
+## Flaws
+{: #flaws}
+Transparency and directness are part of our [values](https://about.gitlab.com/handbook/values) and I want to live them by sharing the flaws I know I have.
+I'm fully responsible for improving the things below, listing them is no excuse.
+They are listed here for two reasons.
+The fist one is so that people know it is not them but my fault.
+The second one is so I can improve, I hope that listing them lets people know I appreciate when people speak up about them.
+1. I look serious all the time, it is OK to say 'maybe you can smile more'.
+2. I love debating, it is OK to say 'please stop debating and start collaborating' or 'we should have a [dialectic](https://en.wikipedia.org/wiki/Dialectic) instead of a debate'.
+3. My English pronunciation, choice of words, and grammar are not great. I'm taking lessons but I welcome corrections when we're having a 1:1 conversation and/or when it might confuse people.
+4. When in a rush I will jump to conclusions, it is OK to ask 'can we take more time to discuss this'.
+5. I sometimes make reports feel like I'm scolding them, as in being angry for a percieved fault. It is OK to say, I don't mind you making that point but your tone doesn't make me feel respected.
+6. In my feedback I sometimes sound more like I'm giving an order instead of offering a suggestion, even when I mean the latter. It is OK to say 'that sounds like an order, I would have appreciated it more in the form of a suggestion'.
+If you speak up about them I should thank you for it, it is OK to say 'this was on your list of flaws so I kinda expected a thank you'.
+I'm sure I have more flaws that affect my professional life.
+Feel free to send a merge request to add them or communicate them anonymously to People Operations so they can send a merge request.
+## Communication
+{: #communication}
+Thanks to [Mårten Mickos](https://www.linkedin.com/in/martenmickos) for the inspiration for this section. All good idea's are his, all bad ones mine.
+I am a visual person much more than auditory, and I am a top-down person much more than bottom-up. This means that I love written communication: issues, email, Google Docs, and chat. Feel free to send me as many emails and chat messages as you like, and about whatever topics you like.
+If you have a great new idea or suggestion for me, I appreciate if you can convey it in a picture or in written words, because I learn by seeing more than I learn by hearing. I don't mind if you send me or point me to plans that are in draft mode or not ready. I am happy if I can give useful feedback early. It doesn’t have to be perfect and polished when presented to me.
+In written communication, I appreciate the top-down approach. Set the subject header to something descriptive. Start the email by telling me what the email is about. Only then go into details. Don't mix separate topics in the same email, it is perfectly fine to send two emails at almost the same time. Try to have a concrete proposal so I can just reply with OK if that is possible.
+I get many email on which I am only cc'd on, I would very much appreciate if you started emails intended specifically for me with "Sid," or some other salutation that makes it clear that the message is for me.
+I have accounts on [LinkedIn](https://www.linkedin.com/in/sijbrandij) and [Facebook](https://www.facebook.com/sytse). I will not send invites to team members on those networks since as the CEO I don't want to impose myself on anyone. But I would love to connect and I will happily accept your LinkedIn and Facebook friend request. You can also find me on Twitter as [@sytses](https://twitter.com/sytses).
+## Pick your brain meetings
+{: #pick-your-brain-meetings}
+If people want advice on open source, remote work, or other things related to GitLab we'll consider that. If Sid approves of the request we send the following email:
+We would love to help but we want to make sure the content is radiated as wide as possible. Can we do the following?
+1. We schedule a 50 minute Zoom video call or [visit to our office](https://about.gitlab.com/visiting/) that is recorded by us, uploaded to Youtube as a private video, and shared with you.
+1. You write up a draft post within 48 hours after the interview in a Google Doc and share that with us with suggestion or edit rights for anyone that knows the url.
+1. You can redact anything you don't want to publish.
+1. Our marketing department will work with you to publish the post.
+1. A great examples of this in action are the first two times we did this [https://about.gitlab.com/2016/07/14/building-an-open-source-company-interview-with-gitlabs-ceo/](https://news.ycombinator.com/item?id=12615723) and [https://news.ycombinator.com/item?id=12615723](https://news.ycombinator.com/item?id=12615723). Both got to nr. 1 on [Hacker News](https://news.ycombinator.com/).
+The EA will create an issue once it's scheduled with the label [ceo-interview on GitLab.com](https://gitlab.com/gitlab-com/www-gitlab-com/issues?label_name=ceo-interview&scope=all&state=all) should follow up to make sure the draft post is submitted.
+Reply to emails: Thanks for wanting to chat. I propose we meet in the format proposed on https://about.gitlab.com/handbook/people-operations/ceo-preferences/#pick-your-brain-meetings so that other people benefit from our conversation too. If you're up for that please work with Kirsten (cc:) to schedule a time and location.
+Alternatively we can also make it a YouTube live event, people can ask us questions in the chat during the event, and we can share the recording later.
+## Email
+{: #emails}
+* Labels: /archive, /respond or /urgent-important
+* Prepare draft responses
+* Standard reply for recruiters:
+“We do not accept solicitations by recruiters, recruiting agencies, headhunters, and outsourcing organizations. Please find all info [on our jobs page](https://about.gitlab.com/jobs/#no-recruiters)”
+## Scheduling
+{: #scheduling}
+* [everytimezone.com](http://www.everytimezone.com) can help determine the best time to schedule
+* You can add other [calendars](calendar.google.com) on the left, to see when GitLab team members are free to schedule a meeting with
+* The [agenda](https://docs.google.com/document/d/187Q355Q4IvrJ-uayVamoQmh0aXZ6eixAOE90jZspAY4/edit?ts=574610db&pli=1) of items to be handled by the EA for the CEO
+* Use for example a tool like [Skyscanner](www.skyscanner.com) to find different flight options with most airlines when needing to book travel
+* Keep 1 hour open in calendar per day for email
+* Schedule calls in European timezones in the morning (am) Pacific (Daylight) Time and US time zones in the afternoon (pm) Pacific (Daylight) Time
+* After each meeting with a potential investor, make sure to update the sheet with the information on these meetings (to be found in the agenda doc for EAs)
+### Formats for invites
+* MTG for meetings in person, either at the "office" or another location.
+    Example: MTG | Bruce Armstrong (Khosla) & Sid Sijbrandij (GitLab) @ [office/location]” or “Dinner/Lunch @ Bar Agricole - Kirsten Abma & Sid Sijbrandij”
+* INTERVIEW for interviews (looping in our PR partner)
+    Example: “INTERVIEW | Kirsten Abma (TechCrunch)” Make sure to block 10 min before for preparations and 10 min after for notes for Sid
+* PHONECALL for phone calls
+* VIDEOCALL for video conference calls using Zoom. Using the [Zoom plugin for Google Calendar](https://about.gitlab.com/handbook/communication/#video-calls) you can easily get the info you need in the invite.
+    Example: “(VIDEO)CALL | Kirsten Abma for Executive Assistant”
+Make sure to include in the description
+* (Video)calls
+<br>
+Please read our primer as preparation for this meeting: https://about.gitlab.com/primer
+(Calls in the hiring process also have: and please fill out this form a day in advance, to discuss during the call: https://docs.google.com/a/gitlab.com/forms/d/e/1FAIpQLScXUW07w36Ob2Y2XQuESBaYqU5_c1SoweGS1BzGHnbesISGXw/viewform to discuss during the call”)
+Phone number participant:
+<br>
+By using the Zoom extention [mentioned in our handbook](https://about.gitlab.com/handbook/communication/#video-calls) it will add the details how to join the Zoom call automatically. Make sure to remove the Hangout link first and then use the Zoom extention.
+<br>
+* Meetings at the office:
+<br>
+Please read our primer as preparation for the meeting: https://about.gitlab.com/primer<br>
+Phone number CEO: <br>
+Phone number other participant(s):<br>
+Accessing the GitLab office building<br>
+Enter the building through the double doors between the two Mike's Bikes locations.<br>
+On the intercom press the call button then press '206' (for GitLab) to have us buzz you in.<br>
+Proceed to the elevator at the rear of the foyer and go to the 2nd floor (strangely the elevator will show 3 when you stop at 2).<br>
+Exit the elevator and proceed to the right. The unit is the last door on the right at the end of the hall (2F).<br>
+More details are on our visiting page: https://about.gitlab.com/visiting/<br>
+<br>
+* For internal meetings such as 1:1 calls with the team, add "If you need to cancel/reschedule please ping the EA on Slack"
+* For all external meetings include [visiting info](https://about.gitlab.com/visiting) (for in-person meetings) and our [primer page](https://about.gitlab.com/primer). Make sure to add both a Zoom link and physical phone numbers.
+* For meetings or lunch/dinner appointments, always make sure to add the address in the invite of the location where it’s scheduled and make sure to plan travel time (in a separate calendar item, just for Sid) before and after the meeting in case another meeting or call should follow.
+* If Sid has a ride or walks to an appointment, make sure to add 5 minutes extra to find the address and sign in at reception.
+* If Sid is driving himself, make sure to add 15 minutes for random occurances such as travic, stopping for gas or parking.
+* Favorite lunch place: [Basil Thai in SoMa](http://www.basilthai.com/home.html)
+* Favorite dinner places: [Heirloom Cafe](https://heirloom-sf.com/), [Ozumo](http://www.ozumo.com/) (seated in the bar area), or a BBQ at our HQ
+* Favorite drinks place: [Odd Job](http://oddjobsf.com/)
+* Sales meetings are important, in case the CEO can help the process, feel free to include him in the meeting
+* Make sure to include background info what the call will be about to the invite. For example adding the relevant email thread in the notes of the invite
+* Due to a busy schedule the CEO has a preference of meeting setup: First try for a video call or  a meeting at the GitLab office. If the other party presses to meet at their location, confirm if that is OK before accepting.
+## Hiring process
+{: #hiring-process}
+* There are 2 types of calls with the CEO. First an introductory call which needs the [GitLab primer](https://about.gitlab.com/primer) and second a final interview which needs the form mentioned below.
+* PeopleOps makes sure that every candidate that the CEO talks with has a profile in our ATS with background info e.g. a resume or LinkedIn profile link
+* Managers will tag EA to schedule a call for the applicant with Sid
+* Template email with wording to schedule “Kirsten schedule Sid”
+* Add date/time and make sure to include timezones
+* For calls with candidates for a role of Director level or higher, make sure to plan 90 minutes for a call
+* Add responses of the [form](https://docs.google.com/a/gitlab.com/forms/d/1lBq_oXaqpQRs-SeEs3EvpxFGK55Enqn_nzkLq2l3Rwg/viewform) you sent out with the invite to our ATS; [Workable](https://gitlab.workable.com/backend)
+## Travel
+{: #travel}
+EA does research for the best option for a flight and propose this to the CEO before booking.
+Make sure to add a calendar item for 2 hours before take off for check in and add a separate one for travel time before that in the CEO's calendar
+If a flight was changed or not taken due to delays or other circumstances, make sure to check with the airline for the persons flight status
+Current preferences for flights are:
+* Aisle seat
+* Check a bag for all trips longer than one night
+* Frequent Flyer details of all (previously flown) airlines are in EA vault of 1Password as well as important passport/visa info
+## Mail
+{: #mail}
+* Check all incoming (physical) mail at 1233 Howard st and sort the urgent and important letters.
+* Inform AP if invoices came in
+* Inform other people/departments if mail is addressed for them and include a scan of the document
+## Expensify
+{: #expensify}
+* When you’re logged in, you can find wingman account access for other team members in the top right corner menu.
+* Check their email (if you have access), using the search bar in the top, to find any receipts for the postings in the current expense report.
+* And/or write down what receipts are missing and email to request them if needed
+## Sales meetings
+{: #sales-meetings}
+* I love to talk to users or potential users of GitLab anytime.
+* Traveling is not efficient because it can take 2 to 10 times the time of the meeting itself.
+Some general guidelines of what travel is appropriate, these guidelines are not fixed, feel free to ask for exceptions:
+1. I'll take any meeting via video conference or at our office.
+1. I'll take a meeting in the Bay Area as long as it is not an SMB organization.
+1. I'll take a meeting outside the Bay Area but in the US with large or strategic organizations
+1. I'll take a meeting outside the US with strategic organizations.
+Consider the following to increase efficiency:
+- Combine meetings with multiple organizations in the same location.
+- Get meetings with multiple stakeholders in the same company.
+- Apart from the formal meetings try to organize a meal with stakeholders.
+- Record the meeting so you can distribute it to others in the organization.
+- You can ask the EA and/or look at my calendar to leverage my existing travel plans.
+- Please plan audio only meetings only when the customer explicitly declines a video call.
+- Any meeting that requires travel should be properly prepared and any lessons relayed to the marketing team.
+## House
+{: house}
+If you are a GitLab team member you can use our house in Utrecht, the Netherlands for free with up to 5 guests.
+You can find more information [on AirBnB](https://www.airbnb.com/rooms/12581527).
+When it is not reserved on the AirBnB calendar you can reserve it, message Karen Sijbrandij in the #valley chat channel to do so.
+Our host Justus will check you in and out and will take care of the cleaning.
+Enjoy your stay!
--- a/source/handbook/engineering/issues/issue-triage-policies/index.html.md
+++ b/source/handbook/engineering/issues/issue-triage-policies/index.html.md
@@ -105,6 +105,11 @@ If you notice a common pattern amongst various issues (e.g. a new feature that d
 Douwe is the "Label King", make sure he approves of a label before adding it. This way we don't have a bunch of repetitive/unused/inconsistent labels.
+## Events
+We also hold regular, quarterly events where the Community, Core Team Members and Team Members can contribute to tackling some of our open issues. Please see [the dedicated page](/community/issue-bash) for further information and upcoming event dates
 ## Notes
 The original issue about these policies is [#17693][17693]. We'll be working to improve the situation from within GitLab itself as time goes on.

--- a/source/handbook/engineering/workflow/index.html.md
+++ b/source/handbook/engineering/workflow/index.html.md
@@ -137,8 +137,16 @@ are also found in the [monitoring performance handbook](/handbook/infrastructure
 GitLab Inc has to be selective in working on particular issues.
 We have a limited capacity to work on new things. Therefore, we have to
-schedule issues carefully. This is done primarily by product and
+schedule issues carefully. 
-engineering managers.
+Product Managers are responsible for scheduling all issues
+in their respective [product areas](/handbook/product/#who-to-talk-to-for-what),
+including features, bugs, and tech debt. Product managers work closely with
+the UX Lead and Engineering Leads as part of scheduling.
+The UX Lead and Engineering Leads are responsible for resource planning and allocation
+in their respective teams. (Product Managers are _not_ responsible for these activities.)
+Product Managers are responsible for balancing priorities in scheduling with input from all GitLab stakeholders.
 Each issue that is scheduled should meet most of these criteria:
@@ -156,9 +164,6 @@ Direction issues are the big, prioritized new features for each release.
 They are limited to a small number per release so that we have plenty of
 capacity to work on other important issues, bug fixes, etc.
-Issues that are not scheduled for a future milestone,
-but we are committed to doing, are put in the Backlog milestone.
 If you want to schedule an `Accepting Merge Requests` issue, please remove
 the label first.
@@ -166,28 +171,42 @@ Any scheduled issue should have a team label assigned, and at least one type lab
 ### Requesting something to be scheduled
-Only fleshed-out issues can be scheduled. If an issue is vague or has unclear requirements, we can not schedule it.
+To request scheduling an issue, ask the [responsible product manager](/handbook/product/#who-to-talk-to-for-what)
-To request a scheduling of an issue, ask the responsible lead.
-You can find the leads on the team page, and in the descriptions of the team labels.
-For (major) feature requests, ask the relevant product manager. Right now this is either Mark (for CI) or Job.
-We have much more requests for great features than we have capacity to work on.
+We have many more requests for great features than we have capacity to work on.
 There is a good chance we’ll not be able to work on something.
 Make sure the appropriate labels (such as `customer`) are applied so every issue is given the priority it deserves.
-### Scheduling issues into a milestone
-Engineering and product schedule (establish scope of) which issues are to be worked on in the following milestone. In particular:
-* Engineering leads are responsible for resource planning and allocation.
-* Engineering leads are responsible for prioritizing bugs and tech debt.
-* Product managers are responsible for prioritizing features, with feedback from all relevant stakeholders.
-* Based on the above, engineering leads and product managers collaborate and establish scope by the **4th** of a month, for the release in the subsequent month,
-according to the [scheduling timeline](https://about.gitlab.com/handbook/product/#scheduling-timeline-throughout-a-milestone).
-* The entire process happens asynchronously, and is mediated through individual issues themselves.
 ### Process improvement
 There is an informal scheduling process discussion in the #scheduling Slack channel.
 Anyone can join and suggest improvements to our scheduling process.
+## Product development timeline
+Teams (Product, UX, Engineering) continually work on issues according to their respective 
+workflows. There is no specified process whereby a particular resource should be working 
+on a set of issues in a given time period. However, there are specific deadlines that
+should inform team workflows and prioritization. Suppose we are talking about milestone `m`
+that will be shipped in month `M` (on the 22nd). We have the following deadlines:
+- By month `M-1, 4th`: Release scope is established | In-scope issues marked with milestone `m`.
+- By month `M-1, 7th`: `m` issues are updated with docs starter blurb | Release post (WIP merge request) created with `m` issues and docs starter blurbs
+- On month `M-1, 8th` (or next business day): Kickoff call with WIP release post
+- By month `M, 7th`: Completed `m` issues with docs have been merged into master | Unstarted or unfinished `m` issues are de-scoped from `m`, with `m` being removed from them
+- On month `M, 22nd`: Release shipped to production | Release post published
+Refer to [release post due dates](/handbook/marketing/blog/release-posts/#due-dates) 
+for additional deadlines.
+Note that release timelines are overlapping. For example, when a release is shipped 
+to production on the 22nd, the scope for the following release has already been established
+earlier in that same month.
+An in-scope issue already has a docs starter blurb (written by the PM) by the time 
+engineers start development. Engineers should create and merge in the updated docs 
+as part of completing an issue by the 7th. PMs revise the starter docs blurbs in the 
+release post appropriately before the release post is published.
+Refer to [Feature freeze on the 7th for the release on the 22nd](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/PROCESS.md#feature-freeze-on-the-7th-for-the-release-on-the-22nd)
+for further timeline details of code releases, including major/minor version releases, as well as patch releases.
No results found