.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

Gemfile

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

Gemfile.lock

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

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:

data/gitlab_com.yml

@@ -82,12 +82,11 @@ questions:
       The project and wiki repository, Git LFS files, attachments, build artifacts, and images in the container registry.
   - question: Where can I find detailed information on GitLab.com's settings, such as SSH host keys and its runners?
     answer:
-      Please refer to [GitLab.com settings](https://about.gitlab.com/gitlab-com/settings/) for information about SSH host keys, Runners and Pages settings.
+      Please refer to [GitLab.com settings](/settings/) for information about SSH host keys, Runners and Pages settings.
   - question: Is there a status page for GitLab.com?
     answer:
       Yes, find it at [status.gitlab.com](https://status.gitlab.com/).
-  - question: >
-      *What features are not included?
+  - question: What features are not included?
     answer: >
       GitLab features that pertain to running your own instance and the following features:
       Geo, LDAP (<a href="https://gitlab.com/gitlab-org/gitlab-ee/issues/1987">issue</a>), Audit user, Log forwarding, Limit project size, Pivotal Tile and MySQL support.

data/issue_bash.yml

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

data/organizations.yml

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

data/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
-                    dpkg -i gitlab-ee-XXX.deb
+                    curl -LJO https://packages.gitlab.com/gitlab/gitlab-ce/packages/ubuntu/trusty/gitlab-ce-XXX.deb/download
+                    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
-                    dpkg -i gitlab-ee-XXX.deb
+                    curl -LJO https://packages.gitlab.com/gitlab/gitlab-ce/packages/ubuntu/xenial/gitlab-ce-XXX.deb/download
+                    dpkg -i gitlab-ce-XXX.deb
   dependency_commands: |
                     sudo apt-get install curl openssh-server ca-certificates postfix
 - 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
-                    dpkg -i gitlab-ee-XXX.deb
+                    curl -LJO https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/wheezy/gitlab-ce-XXX.deb/download
+                    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
-                    dpkg -i gitlab-ee-XXX.deb
+                    curl -LJO https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce-XXX.deb/download
+                    dpkg -i gitlab-ce-XXX.deb
   dependency_commands: |
                     sudo apt-get install curl openssh-server ca-certificates postfix
 - 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
-                    rpm -i gitlab-ee-XXX.rpm
+                    curl -LJO https://packages.gitlab.com/gitlab/gitlab-ce/packages/el/6/gitlab-ce-XXX.rpm/download
+                    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
-                    rpm -i gitlab-ee-XXX.rpm
+                    curl -LJO https://packages.gitlab.com/gitlab/gitlab-ce/packages/el/7/gitlab-ce-XXX.rpm/download
+                    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
-                    rpm -i gitlab-ee-XXX.rpm
+                    curl -LJO https://packages.gitlab.com/gitlab/gitlab-ce/packages/opensuse/42.1/gitlab-ce-XXX.rpm/download
+                    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
-                    dpkg -i gitlab-ee-XXX.deb
+                    curl -LJO https://packages.gitlab.com/gitlab/raspberry-pi2/packages/raspbian/jessie/gitlab-ce-XXX.deb/download
+                    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 -

data/promo.yml

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

data/resellers.yml

 #
-#- name: Emerasoft
-#  image: /images/resellers/emerasoft.png
-#  region: EMEA
-#  content: | 
-#   
-#    Emerasoft offer products, consulting and training services for Application Lifecycle Management, DevOps, Business Process Management, Service Oriented Architecture, Software Testing and Cyber Security.
-#    We work with Commercial and Open Source technologies, able to guarantee transparency, interoperability and proven ROI.
-#    
-#    Le diverse esperienze si riflettono nella capacità di affrontare problemi eterogenei e complessi in modo professionale e qualificato.  
-#    La capacità di produrre e selezionare tecnologie allo stato dell’arte e stringere accordi di collaborazione continua nell’esplorazione di aree di frontiera nello sviluppo applicativo, stimolo e sfida a continuare un percorso di eccellenza e qualità.
-#
-#  email: GitLab@Emerasoft.com
-#  contact:
-#    - address: Turino, Italia
-#      phone: +39 (011) 012 0370
-#    - address: Roma, Italia
-#      phone: +39 (06) 8781 1323
-#    - website: https://www.emerasoft.com
-#  social:
-#    - type: twitter
-#      url: https://twitter.com/emerasoft
-#    - type: linkedin
-#      url: https://www.linkedin.com/company-beta/1203309/
-#    - type: facebook
-#      url: https://www.facebook.com/emerasoft
-#    - type: youtube
-#      url: https://www.youtube.com/user/Emerasoft
-#    - type: google-plus
-#      url: https://plus.google.com/u/1/+Emerasoft_solutionstocollaborate
-#  
+- name: Emerasoft
+  image: /images/resellers/emerasoft.png
+  region: EMEA
+  content: | 
+   
+    Emerasoft is an Italian company providing IT products and services. We specialize in solving complex technical challenges, especially in the areas of ALM, DevOps, UX, OS, SOA, BPM, Software Testing & Security, Embedded Software Development, IT Service Management, Digital Publishing & App Development.
+    
+    Da oltre 10 anni Emerasoft offre prodotti, servizi di consulenza e formazione su tematiche quali ALM, DevOps, UX, OS, SOA, BPM, Software Testing e Security, Embedded Software Development, IT Service Management, Digital Publishing & App Development.
+
+  email: GitLab@Emerasoft.com
+  contact:
+    - address: Torino, Italia
+      phone: +39 (011) 012 0370
+    - address: Roma, Italia
+      phone: +39 (06) 8781 1323
+    - website: http://www.emerasoft.com/devops-servizi-consulenza-strumenti/gitlab/
+  social:
+    - type: twitter
+      url: https://twitter.com/emerasoft
+    - type: linkedin
+      url: https://www.linkedin.com/company-beta/1203309/
+    - type: facebook
+      url: https://www.facebook.com/emerasoft
+    - type: youtube
+      url: https://www.youtube.com/user/Emerasoft
+    - type: google-plus
+      url: https://plus.google.com/u/1/+Emerasoft_solutionstocollaborate
+    - type: gitlab   
+      url: https://gitlab.com/Emerasoft
+    - type: other
+      url: https://www.slideshare.net/emerasoft
 #
 #- 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/

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
+      url: /2015/02/06/why-move-to-a-single-code-collaboration-tool/
+    - 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

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
@@ -1763,7 +1764,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 +2073,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.
@@ -2459,16 +2462,18 @@
   story:  |
           Joining May 15th
-- name: J.W.
-  locality:
-  country:
+- name: John Woods
+  locality: Victoria, BC
+  country: Canada
   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
-  twitter:
-  gitlab:
+  picture: johnwoods.jpg
+  twitter: JohnWoods06
+  gitlab: jwoods06
   story:  |
-          Joining May 15th
+          John is an experienced IT specialist who is passionate about the customer experience.
+          Having graduated with a degree is Political Science and Philosophy, John has done a great job of putting that to any use.
+          Outside of work, John is passionate about boardgames, wine, hockey and his family (not necessarily in that order).
 - name: Jeffrey Broussard
   locality: Boulder, CO
@@ -2480,27 +2485,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.
-  locality:
-  country:
+- name: Chenje Katanda
+  locality: Harare
+  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
-  twitter:
-  gitlab:
-  story:  |
-          Joining May 29th
-- name: J.S.
-  locality:
-  country:
+  picture: chenje.jpg
+  twitter: ckatanda
+  gitlab: ckatanda
+  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.
+- name: Joe Scheuermann
+  locality: Granite Bay, CA
+  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
-  twitter:
-  gitlab:
+  picture: joes.jpg
+  twitter: JAScheuermann
+  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
@@ -2559,6 +2563,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:

generators/direction.rb

@@ -94,10 +94,6 @@ end
 def generate_direction
   print "Generating direction..."
-  com = GitLabInstance.new('https://gitlab.com', PRIVATE_TOKEN, 'GitLab.com')
-  ce = GitLabProject.new('gitlab-org%2Fgitlab-ce',com)
-  ee = GitLabProject.new('gitlab-org%2Fgitlab-ee',com)
-  edition = [ce,ee]
   direction_output = ''
   edition.each do |project|
@@ -138,7 +134,8 @@ def edition
     com = GitLabInstance.new('https://gitlab.com', PRIVATE_TOKEN, 'GitLab.com')
     ce = GitLabProject.new('gitlab-org%2Fgitlab-ce',com)
     ee = GitLabProject.new('gitlab-org%2Fgitlab-ee',com)
-    [ce,ee]
+    omnibus = GitLabProject.new('gitlab-org%2Fomnibus-gitlab',com)
+    [ce,ee,omnibus]
   end
 end

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

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.

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|

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
-      %updated article.date.to_time.iso8601
+      %published= article.date.to_datetime.rfc3339
+      %updated= article.date.to_datetime.rfc3339
       %author
         %name= article.data.author

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

source/gitlab-com/settings/index.html.md

@@ -132,7 +132,9 @@ The full contents of our `config.toml` are:
 ```
 ## Sidekiq
-GitLab.com runs [Sidekiq][sidekiq] with arguments `--timeout=4 --concurrency=4` and the following environment variables:
+
+GitLab.com runs [Sidekiq][sidekiq] with arguments `--timeout=4 --concurrency=4`
+and the following environment variables:
 | Setting                                 | GitLab.com | Default   |
 |--------                                 |----------- |--------   |
@@ -140,6 +142,14 @@ GitLab.com runs [Sidekiq][sidekiq] with arguments `--timeout=4 --concurrency=4`
 | `SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL` | `SIGKILL`  | -         |
 | `SIDEKIQ_LOG_ARGUMENTS`                 | `1`        | -         |
+## Cron jobs
+
+Periodically executed jobs by Sidekiq, to self-heal Gitlab, do external
+synchronizations, run scheduled pipelines, etc.:
+
+| Setting                     | GitLab.com   | Default      |
+|--------                     |------------- |------------- |
+| `pipeline_schedule_worker`  | `19 * * * *` | `19 * * * *` |
 [runners-post]: /2016/04/05/shared-runners/ "Shared Runners on GitLab.com"
 [do-post]: /2016/04/19/gitlab-partners-with-digitalocean-to-make-continuous-integration-faster-safer-and-more-affordable/ "GitLab Partners with DigitalOcean"

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?
-
-  GitHost will always install the latest version of GitLab when a new server is
-  created.
-
-  ### 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**:
-
-  - GitLab Pages
-  - Kerberos based login
-  - ChatOps (Mattermost cannot be run in a GitHost instance)
-  - Global code search with ElasticSearch
-  - Log forwarding
-  - GitLab Geo
-  - High Availability
-  - MySQL database
-  - Redis Sentinel
-  - Backup uploading to custom S3
-  - Custom email configuration
-  - Reply by email
-  - Custom `gitlab.rb` file changes
-
+### What version of GitLab Enterprise Edition does GitHost support?
+
+GitHost will always install the latest version of GitLab when a new server is
+created.
+
+### 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**:
+
+- GitLab Pages
+- Kerberos based login
+- ChatOps (Mattermost cannot be run in a GitHost instance)
+- Global code search with ElasticSearch
+- Log forwarding
+- GitLab Geo
+- High Availability
+- MySQL database
+- Redis Sentinel
+- Backup uploading to custom S3
+- Custom email configuration
+- Reply by email
+- Custom `gitlab.rb` file changes
 ### What regions does GitHost operate in?