Compare revisions

2c0f375f · b8cab61f · b2592f01 · a61c1977 · 2e3cbb69 · 7a399b70
--- a/.babelrc
+++ b/.babelrc
+{
+  "presets": [
+    ["latest", { "es2015": { "modules": false } }],
+    "stage-2"
+  ],
+  "env": {
+    "coverage": {
+      "plugins": [
+        ["istanbul", {
+          "exclude": [
+            "spec/javascripts/**/*"
+          ]
+        }],
+        ["transform-define", {
+          "process.env.BABEL_ENV": "coverage"
+        }]
+      ]
+    }
+  }
+}
--- a/.eslintignore
+++ b/.eslintignore
@@ -7,3 +7,4 @@
 /vendor/
 karma.config.js
 webpack.config.js
+/app/assets/javascripts/locale/**/*.js
--- a/.eslintrc
+++ b/.eslintrc
@@ -13,9 +13,12 @@
  },
  "plugins": [
    "filenames",
-    "import"
+    "import",
+    "html",
+    "promise"
  ],
  "settings": {
+    "html/html-extensions": [".html", ".html.raw", ".vue"],
    "import/resolver": {
      "webpack": {
        "config": "./config/webpack.config.js"
@@ -23,7 +26,8 @@
    }
  },
  "rules": {
-    "filenames/match-regex": [2, "^[a-z0-9_]+(.js)?$"],
-    "no-multiple-empty-lines": ["error", { "max": 1 }]
+    "filenames/match-regex": [2, "^[a-z0-9_]+$"],
+    "no-multiple-empty-lines": ["error", { "max": 1 }],
+    "promise/catch-or-return": "error"
  }
 }
--- a/.flayignore
+++ b/.flayignore
@@ -2,3 +2,4 @@
 lib/gitlab/sanitizers/svg/whitelist.rb
 lib/gitlab/diff/position_tracer.rb
 app/policies/project_policy.rb
+app/models/concerns/relative_positioning.rb
--- a/.gitattributes
+++ b/.gitattributes
-*.js.es6 gitlab-language=javascript
--- a/.gitignore
+++ b/.gitignore
 *.log
 *.swp
+*.mo
+*.edit.po
 .DS_Store
 .bundle
 .chef
@@ -16,6 +18,7 @@ eslint-report.html
 .sass-cache/
 /.secret
 /.vagrant
+/.yarn-cache
 /.byebug_history
 /Vagrantfile
 /backups/*
@@ -30,6 +33,7 @@ eslint-report.html
 /config/unicorn.rb
 /config/secrets.yml
 /config/sidekiq.yml
+/config/registry.key
 /coverage/*
 /coverage-javascript/
 /db/*.sqlite3
@@ -44,11 +48,14 @@ eslint-report.html
 /public/uploads.*
 /public/uploads/
 /shared/artifacts/
+/spec/javascripts/fixtures/blob/pdf/
+/spec/javascripts/fixtures/blob/balsamiq/
 /rails_best_practices_output.html
 /tags
 /tmp/*
 /vendor/bundle/*
-/builds/*
+/builds*
 /shared/*
 /.gitlab_workhorse_secret
 /webpack-report/
+/locale/**/LC_MESSAGES
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
-image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1"
+image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6"
  
 cache:
-  key: "ruby-233"
+  key: "ruby-233-with-yarn"
  paths:
  - vendor/ruby
+  - .yarn-cache/
  
 variables:
  MYSQL_ALLOW_EMPTY_PASSWORD: "1"
-  # retry tests only in CI environment
-  RSPEC_RETRY_RETRY_COUNT: "3"
  RAILS_ENV: "test"
+  NODE_ENV: "test"
  SIMPLECOV: "true"
-  SETUP_DB: "true"
-  USE_BUNDLE_INSTALL: "true"
  GIT_DEPTH: "20"
+  GIT_SUBMODULE_STRATEGY: "none"
  PHANTOMJS_VERSION: "2.1.1"
  GET_SOURCES_ATTEMPTS: "3"
+  KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json
+  KNAPSACK_SPINACH_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/spinach_report-master.json
  
 before_script:
-  - source ./scripts/prepare_build.sh
-  - cp config/gitlab.yml.example config/gitlab.yml
  - bundle --version
-  - '[ "$USE_BUNDLE_INSTALL" != "true" ] || retry bundle install --without postgres production --jobs $(nproc) $FLAGS'
-  - retry gem install knapsack
-  - '[ "$SETUP_DB" != "true" ] || bundle exec rake db:drop db:create db:schema:load db:migrate add_limits_mysql'
+  - source scripts/utils.sh
+  - source scripts/prepare_build.sh
  
 stages:
+- build
 - prepare
 - test
 - post-test
@@ -41,76 +40,157 @@ stages:
  variables:
    SETUP_DB: "false"
    USE_BUNDLE_INSTALL: "false"
+    KNAPSACK_S3_BUCKET: "gitlab-ce-cache"
  cache:
    key: "knapsack"
    paths:
-    - knapsack/
+      - knapsack/
  artifacts:
    expire_in: 31d
    paths:
-    - knapsack/
+      - knapsack/
  
-.use-db: &use-db
+.use-pg: &use-pg
+  services:
+    - postgres:latest
+    - redis:alpine
+
+.use-mysql: &use-mysql
  services:
    - mysql:latest
    - redis:alpine
  
+.only-master-and-ee-or-mysql: &only-master-and-ee-or-mysql
+  only:
+    - /mysql/
+    - master@gitlab-org/gitlab-ce
+    - master@gitlab/gitlabhq
+    - tags@gitlab-org/gitlab-ce
+    - tags@gitlab/gitlabhq
+    - //@gitlab-org/gitlab-ee
+    - //@gitlab/gitlab-ee
+
+# Skip all jobs except the ones that begin with 'docs/'.
+# Used for commits including ONLY documentation changes.
+# https://docs.gitlab.com/ce/development/writing_documentation.html#testing
+.except-docs: &except-docs
+  except:
+    - /(^docs[\/-].*|.*-docs$)/
+
 .rspec-knapsack: &rspec-knapsack
  stage: test
  <<: *dedicated-runner
-  <<: *use-db
  script:
-    - JOB_NAME=( $CI_BUILD_NAME )
-    - export CI_NODE_INDEX=${JOB_NAME[1]}
-    - export CI_NODE_TOTAL=${JOB_NAME[2]}
-    - export KNAPSACK_REPORT_PATH=knapsack/rspec_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
+    - JOB_NAME=( $CI_JOB_NAME )
+    - export CI_NODE_INDEX=${JOB_NAME[-2]}
+    - export CI_NODE_TOTAL=${JOB_NAME[-1]}
+    - export KNAPSACK_REPORT_PATH=knapsack/${CI_PROJECT_NAME}/${JOB_NAME[0]}_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
    - export KNAPSACK_GENERATE_REPORT=true
-    - cp knapsack/rspec_report.json ${KNAPSACK_REPORT_PATH}
+    - export CACHE_CLASSES=true
+    - cp ${KNAPSACK_RSPEC_SUITE_REPORT_PATH} ${KNAPSACK_REPORT_PATH}
    - knapsack rspec "--color --format documentation"
  artifacts:
    expire_in: 31d
+    when: always
    paths:
-    - knapsack/
-    - coverage/
+      - coverage/
+      - knapsack/
+      - tmp/capybara/
+
+.rspec-knapsack-pg: &rspec-knapsack-pg
+  <<: *rspec-knapsack
+  <<: *use-pg
+  <<: *except-docs
+
+.rspec-knapsack-mysql: &rspec-knapsack-mysql
+  <<: *rspec-knapsack
+  <<: *use-mysql
+  <<: *only-master-and-ee-or-mysql
+  <<: *except-docs
  
 .spinach-knapsack: &spinach-knapsack
  stage: test
  <<: *dedicated-runner
-  <<: *use-db
  script:
-    - JOB_NAME=( $CI_BUILD_NAME )
-    - export CI_NODE_INDEX=${JOB_NAME[1]}
-    - export CI_NODE_TOTAL=${JOB_NAME[2]}
-    - export KNAPSACK_REPORT_PATH=knapsack/spinach_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
+    - JOB_NAME=( $CI_JOB_NAME )
+    - export CI_NODE_INDEX=${JOB_NAME[-2]}
+    - export CI_NODE_TOTAL=${JOB_NAME[-1]}
+    - export KNAPSACK_REPORT_PATH=knapsack/${CI_PROJECT_NAME}/${JOB_NAME[0]}_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
    - export KNAPSACK_GENERATE_REPORT=true
-    - cp knapsack/spinach_report.json ${KNAPSACK_REPORT_PATH}
+    - export CACHE_CLASSES=true
+    - cp ${KNAPSACK_SPINACH_SUITE_REPORT_PATH} ${KNAPSACK_REPORT_PATH}
    - knapsack spinach "-r rerun" || retry '[[ -e tmp/spinach-rerun.txt ]] && bundle exec spinach -r rerun $(cat tmp/spinach-rerun.txt)'
  artifacts:
    expire_in: 31d
+    when: always
    paths:
-    - knapsack/
-    - coverage/
+      - coverage/
+      - knapsack/
+      - tmp/capybara/
+
+.spinach-knapsack-pg: &spinach-knapsack-pg
+  <<: *spinach-knapsack
+  <<: *use-pg
+  <<: *except-docs
+
+.spinach-knapsack-mysql: &spinach-knapsack-mysql
+  <<: *spinach-knapsack
+  <<: *use-mysql
+  <<: *only-master-and-ee-or-mysql
+  <<: *except-docs
+
+.only-canonical-masters: &only-canonical-masters
+  only:
+    - master@gitlab-org/gitlab-ce
+    - master@gitlab-org/gitlab-ee
+    - master@gitlab/gitlabhq
+    - master@gitlab/gitlab-ee
  
-# Prepare and merge knapsack tests
+# Trigger a package build on omnibus-gitlab repository
  
+build-package:
+  before_script: []
+  services: []
+  variables:
+    SETUP_DB: "false"
+    USE_BUNDLE_INSTALL: "false"
+  stage: build
+  when: manual
+  script:
+    - scripts/trigger-build
+
+# Prepare and merge knapsack tests
 knapsack:
  <<: *knapsack-state
  <<: *dedicated-runner
+  <<: *except-docs
  stage: prepare
  script:
-    - mkdir -p knapsack/
-    - '[[ -f knapsack/rspec_report.json ]] || echo "{}" > knapsack/rspec_report.json'
-    - '[[ -f knapsack/spinach_report.json ]] || echo "{}" > knapsack/spinach_report.json'
+    - mkdir -p knapsack/${CI_PROJECT_NAME}/
+    - wget -O $KNAPSACK_RSPEC_SUITE_REPORT_PATH http://${KNAPSACK_S3_BUCKET}.s3.amazonaws.com/$KNAPSACK_RSPEC_SUITE_REPORT_PATH || rm $KNAPSACK_RSPEC_SUITE_REPORT_PATH
+    - wget -O $KNAPSACK_SPINACH_SUITE_REPORT_PATH http://${KNAPSACK_S3_BUCKET}.s3.amazonaws.com/$KNAPSACK_SPINACH_SUITE_REPORT_PATH || rm $KNAPSACK_SPINACH_SUITE_REPORT_PATH
+    - '[[ -f $KNAPSACK_RSPEC_SUITE_REPORT_PATH ]] || echo "{}" > ${KNAPSACK_RSPEC_SUITE_REPORT_PATH}'
+    - '[[ -f $KNAPSACK_SPINACH_SUITE_REPORT_PATH ]] || echo "{}" > ${KNAPSACK_SPINACH_SUITE_REPORT_PATH}'
+
+update-knapsack:
+  <<: *knapsack-state
+  <<: *dedicated-runner
+  <<: *only-canonical-masters
+  stage: post-test
+  script:
+    - scripts/merge-reports ${KNAPSACK_RSPEC_SUITE_REPORT_PATH} knapsack/${CI_PROJECT_NAME}/rspec-pg_node_*.json
+    - scripts/merge-reports ${KNAPSACK_SPINACH_SUITE_REPORT_PATH} knapsack/${CI_PROJECT_NAME}/spinach-pg_node_*.json
+    - '[[ -z ${KNAPSACK_S3_BUCKET} ]] || scripts/sync-reports put $KNAPSACK_S3_BUCKET $KNAPSACK_RSPEC_SUITE_REPORT_PATH $KNAPSACK_SPINACH_SUITE_REPORT_PATH'
+    - rm -f knapsack/${CI_PROJECT_NAME}/*_node_*.json
  
 setup-test-env:
-  <<: *use-db
+  <<: *use-pg
  <<: *dedicated-runner
+  <<: *except-docs
  stage: prepare
  script:
    - node --version
-    - yarn --version
-    - yarn install --pure-lockfile
-    - yarn check # ensure that yarn.lock matches package.json
+    - yarn install --pure-lockfile --cache-folder .yarn-cache
    - bundle exec rake gitlab:assets:compile
    - bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init'
  artifacts:
@@ -120,82 +200,121 @@ setup-test-env:
      - public/assets
      - tmp/tests
  
-update-knapsack:
-  <<: *knapsack-state
-  <<: *dedicated-runner
-  stage: post-test
-  script:
-    - scripts/merge-reports knapsack/rspec_report.json knapsack/rspec_node_*.json
-    - scripts/merge-reports knapsack/spinach_report.json knapsack/spinach_node_*.json
-    - rm -f knapsack/*_node_*.json
-  only:
-    - master@gitlab-org/gitlab-ce
-    - master@gitlab-org/gitlab-ee
-    - master@gitlab/gitlabhq
-    - master@gitlab/gitlab-ee
-
-rspec 0 20: *rspec-knapsack
-rspec 1 20: *rspec-knapsack
-rspec 2 20: *rspec-knapsack
-rspec 3 20: *rspec-knapsack
-rspec 4 20: *rspec-knapsack
-rspec 5 20: *rspec-knapsack
-rspec 6 20: *rspec-knapsack
-rspec 7 20: *rspec-knapsack
-rspec 8 20: *rspec-knapsack
-rspec 9 20: *rspec-knapsack
-rspec 10 20: *rspec-knapsack
-rspec 11 20: *rspec-knapsack
-rspec 12 20: *rspec-knapsack
-rspec 13 20: *rspec-knapsack
-rspec 14 20: *rspec-knapsack
-rspec 15 20: *rspec-knapsack
-rspec 16 20: *rspec-knapsack
-rspec 17 20: *rspec-knapsack
-rspec 18 20: *rspec-knapsack
-rspec 19 20: *rspec-knapsack
-
-spinach 0 10: *spinach-knapsack
-spinach 1 10: *spinach-knapsack
-spinach 2 10: *spinach-knapsack
-spinach 3 10: *spinach-knapsack
-spinach 4 10: *spinach-knapsack
-spinach 5 10: *spinach-knapsack
-spinach 6 10: *spinach-knapsack
-spinach 7 10: *spinach-knapsack
-spinach 8 10: *spinach-knapsack
-spinach 9 10: *spinach-knapsack
-
-# Other generic tests
+rspec-pg 0 20: *rspec-knapsack-pg
+rspec-pg 1 20: *rspec-knapsack-pg
+rspec-pg 2 20: *rspec-knapsack-pg
+rspec-pg 3 20: *rspec-knapsack-pg
+rspec-pg 4 20: *rspec-knapsack-pg
+rspec-pg 5 20: *rspec-knapsack-pg
+rspec-pg 6 20: *rspec-knapsack-pg
+rspec-pg 7 20: *rspec-knapsack-pg
+rspec-pg 8 20: *rspec-knapsack-pg
+rspec-pg 9 20: *rspec-knapsack-pg
+rspec-pg 10 20: *rspec-knapsack-pg
+rspec-pg 11 20: *rspec-knapsack-pg
+rspec-pg 12 20: *rspec-knapsack-pg
+rspec-pg 13 20: *rspec-knapsack-pg
+rspec-pg 14 20: *rspec-knapsack-pg
+rspec-pg 15 20: *rspec-knapsack-pg
+rspec-pg 16 20: *rspec-knapsack-pg
+rspec-pg 17 20: *rspec-knapsack-pg
+rspec-pg 18 20: *rspec-knapsack-pg
+rspec-pg 19 20: *rspec-knapsack-pg
+
+rspec-mysql 0 20: *rspec-knapsack-mysql
+rspec-mysql 1 20: *rspec-knapsack-mysql
+rspec-mysql 2 20: *rspec-knapsack-mysql
+rspec-mysql 3 20: *rspec-knapsack-mysql
+rspec-mysql 4 20: *rspec-knapsack-mysql
+rspec-mysql 5 20: *rspec-knapsack-mysql
+rspec-mysql 6 20: *rspec-knapsack-mysql
+rspec-mysql 7 20: *rspec-knapsack-mysql
+rspec-mysql 8 20: *rspec-knapsack-mysql
+rspec-mysql 9 20: *rspec-knapsack-mysql
+rspec-mysql 10 20: *rspec-knapsack-mysql
+rspec-mysql 11 20: *rspec-knapsack-mysql
+rspec-mysql 12 20: *rspec-knapsack-mysql
+rspec-mysql 13 20: *rspec-knapsack-mysql
+rspec-mysql 14 20: *rspec-knapsack-mysql
+rspec-mysql 15 20: *rspec-knapsack-mysql
+rspec-mysql 16 20: *rspec-knapsack-mysql
+rspec-mysql 17 20: *rspec-knapsack-mysql
+rspec-mysql 18 20: *rspec-knapsack-mysql
+rspec-mysql 19 20: *rspec-knapsack-mysql
+
+spinach-pg 0 10: *spinach-knapsack-pg
+spinach-pg 1 10: *spinach-knapsack-pg
+spinach-pg 2 10: *spinach-knapsack-pg
+spinach-pg 3 10: *spinach-knapsack-pg
+spinach-pg 4 10: *spinach-knapsack-pg
+spinach-pg 5 10: *spinach-knapsack-pg
+spinach-pg 6 10: *spinach-knapsack-pg
+spinach-pg 7 10: *spinach-knapsack-pg
+spinach-pg 8 10: *spinach-knapsack-pg
+spinach-pg 9 10: *spinach-knapsack-pg
+
+spinach-mysql 0 10: *spinach-knapsack-mysql
+spinach-mysql 1 10: *spinach-knapsack-mysql
+spinach-mysql 2 10: *spinach-knapsack-mysql
+spinach-mysql 3 10: *spinach-knapsack-mysql
+spinach-mysql 4 10: *spinach-knapsack-mysql
+spinach-mysql 5 10: *spinach-knapsack-mysql
+spinach-mysql 6 10: *spinach-knapsack-mysql
+spinach-mysql 7 10: *spinach-knapsack-mysql
+spinach-mysql 8 10: *spinach-knapsack-mysql
+spinach-mysql 9 10: *spinach-knapsack-mysql
+
+# Static analysis jobs
 .ruby-static-analysis: &ruby-static-analysis
  variables:
    SIMPLECOV: "false"
    SETUP_DB: "false"
-    USE_BUNDLE_INSTALL: "true"
  
-.exec: &exec
+.rake-exec: &rake-exec
  <<: *ruby-static-analysis
  <<: *dedicated-runner
+  <<: *except-docs
  stage: test
  script:
-    - bundle exec $CI_BUILD_NAME
+    - bundle exec rake $CI_JOB_NAME
  
-rubocop:
+static-analysis:
  <<: *ruby-static-analysis
  <<: *dedicated-runner
+  <<: *except-docs
+  stage: test
+  script:
+    - scripts/static-analysis
+
+# Documentation checks:
+# - Check validity of relative links
+# - Make sure cURL examples in API docs use the full switches
+docs lint:
+  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:nanoc-bootstrap-ruby-2.4-alpine"
  stage: test
+  <<: *dedicated-runner
+  cache: {}
+  dependencies: []
+  before_script: []
  script:
-    - bundle exec "rubocop --require rubocop-rspec"
-
-rake haml_lint: *exec
-rake scss_lint: *exec
-rake config_lint: *exec
-rake brakeman: *exec
-rake flay: *exec
-license_finder: *exec
-rake downtime_check: *exec
-rake ee_compat_check:
-  <<: *exec
+    - scripts/lint-doc.sh
+    - mv doc/ /nanoc/content/
+    - cd /nanoc
+    # Build HTML from Markdown
+    - bundle exec nanoc
+    # Check the internal links
+    - bundle exec nanoc check internal_links
+
+downtime_check:
+  <<: *rake-exec
+  except:
+    - master
+    - tags
+    - /^[\d-]+-stable(-ee)?$/
+    - /(^docs[\/-].*|.*-docs$)/
+
+ee_compat_check:
+  <<: *rake-exec
  only:
    - branches@gitlab-org/gitlab-ce
  except:
@@ -204,28 +323,76 @@ rake ee_compat_check:
    - /^[\d-]+-stable(-ee)?$/
  allow_failure: yes
  cache:
-    key: "ruby233-ee_compat_check_repo"
+    key: "ee_compat_check_repo"
    paths:
-      - ee_compat_check/repo/
-      - vendor/ruby
+      - ee_compat_check/ee-repo/
  artifacts:
-    name: "${CI_BUILD_NAME}_${CI_BUILD_REF_NAME}_${CI_BUILD_REF}"
+    name: "${CI_JOB_NAME}_${CI_COMIT_REF_NAME}_${CI_COMMIT_SHA}"
    when: on_failure
    expire_in: 10d
    paths:
      - ee_compat_check/patches/*.patch
  
-rake db:migrate:reset:
+# DB migration, rollback, and seed jobs
+.db-migrate-reset: &db-migrate-reset
  stage: test
-  <<: *use-db
  <<: *dedicated-runner
+  <<: *except-docs
  script:
    - bundle exec rake db:migrate:reset
  
-rake db:seed_fu:
+db:migrate:reset-pg:
+  <<: *db-migrate-reset
+  <<: *use-pg
+
+db:migrate:reset-mysql:
+  <<: *db-migrate-reset
+  <<: *use-mysql
+
+.migration-paths: &migration-paths
+  stage: test
+  <<: *dedicated-runner
+  variables:
+    SETUP_DB: "false"
+  <<: *only-canonical-masters
+  script:
+    - git fetch origin v8.14.10
+    - git checkout -f FETCH_HEAD
+    - bundle install $BUNDLE_INSTALL_FLAGS
+    - bundle exec rake db:drop db:create db:schema:load db:seed_fu
+    - git checkout $CI_COMMIT_SHA
+    - bundle install $BUNDLE_INSTALL_FLAGS
+    - . scripts/prepare_build.sh
+    - bundle exec rake db:migrate
+
+migration:path-pg:
+  <<: *migration-paths
+  <<: *use-pg
+
+migration:path-mysql:
+  <<: *migration-paths
+  <<: *use-mysql
+
+.db-rollback: &db-rollback
+  stage: test
+  <<: *dedicated-runner
+  <<: *except-docs
+  script:
+    - bundle exec rake db:rollback STEP=120
+    - bundle exec rake db:migrate
+
+db:rollback-pg:
+  <<: *db-rollback
+  <<: *use-pg
+
+db:rollback-mysql:
+  <<: *db-rollback
+  <<: *use-mysql
+
+.db-seed_fu: &db-seed_fu
  stage: test
-  <<: *use-db
  <<: *dedicated-runner
+  <<: *except-docs
  variables:
    SIZE: "1"
    SETUP_DB: "false"
@@ -240,9 +407,19 @@ rake db:seed_fu:
    paths:
      - log/development.log
  
-rake gitlab:assets:compile:
+db:seed_fu-pg:
+  <<: *db-seed_fu
+  <<: *use-pg
+
+db:seed_fu-mysql:
+  <<: *db-seed_fu
+  <<: *use-mysql
+
+# Frontend-related jobs
+gitlab:assets:compile:
  stage: test
  <<: *dedicated-runner
+  <<: *except-docs
  dependencies: []
  variables:
    NODE_ENV: "production"
@@ -252,87 +429,41 @@ rake gitlab:assets:compile:
    SKIP_STORAGE_VALIDATION: "true"
    WEBPACK_REPORT: "true"
  script:
-    - bundle exec rake yarn:install gitlab:assets:compile
+    - yarn install --pure-lockfile --production --cache-folder .yarn-cache
+    - bundle exec rake gitlab:assets:compile
  artifacts:
    name: webpack-report
    expire_in: 31d
    paths:
    - webpack-report/
  
-rake karma:
-  cache:
-    paths:
-      - vendor/ruby
-      - node_modules
+karma:
  stage: test
-  <<: *use-db
+  <<: *use-pg
  <<: *dedicated-runner
+  <<: *except-docs
+  variables:
+    BABEL_ENV: "coverage"
  script:
    - bundle exec rake karma
+  coverage: '/^Statements *: (\d+\.\d+%)/'
  artifacts:
    name: coverage-javascript
    expire_in: 31d
    paths:
    - coverage-javascript/
  
-lint-doc:
-  stage: test
-  <<: *dedicated-runner
-  image: "phusion/baseimage:latest"
-  before_script: []
-  script:
-    - scripts/lint-doc.sh
-
-bundler:check:
-  stage: test
-  <<: *dedicated-runner
-  <<: *ruby-static-analysis
-  script:
-   - bundle check
-
-bundler:audit:
-  stage: test
-  <<: *ruby-static-analysis
-  <<: *dedicated-runner
-  only:
-    - master@gitlab-org/gitlab-ce
-    - master@gitlab-org/gitlab-ee
-    - master@gitlab/gitlabhq
-    - master@gitlab/gitlab-ee
-  script:
-    - "bundle exec bundle-audit check --update --ignore OSVDB-115941 CVE-2016-6316 CVE-2016-6317"
-
-migration paths:
-  stage: test
-  <<: *use-db
-  <<: *dedicated-runner
-  variables:
-    SETUP_DB: "false"
-  only:
-    - master@gitlab-org/gitlab-ce
-    - master@gitlab-org/gitlab-ee
-    - master@gitlab/gitlabhq
-    - master@gitlab/gitlab-ee
-  script:
-    - git fetch origin v8.5.9
-    - git checkout -f FETCH_HEAD
-    - cp config/resque.yml.example config/resque.yml
-    - sed -i 's/localhost/redis/g' config/resque.yml
-    - bundle install --without postgres production --jobs $(nproc) $FLAGS --retry=3
-    - bundle exec rake db:drop db:create db:schema:load db:seed_fu
-    - git checkout $CI_BUILD_REF
-    - source scripts/prepare_build.sh
-    - bundle exec rake db:migrate
-
 coverage:
  stage: post-test
  services: []
  <<: *dedicated-runner
+  <<: *except-docs
  variables:
    SETUP_DB: "false"
    USE_BUNDLE_INSTALL: "true"
  script:
    - bundle exec scripts/merge-simplecov
+  coverage: '/LOC \((\d+\.\d+%)\) covered.$/'
  artifacts:
    name: coverage
    expire_in: 31d
@@ -340,25 +471,13 @@ coverage:
    - coverage/index.html
    - coverage/assets/
  
-lint:javascript:
-  <<: *dedicated-runner
-  cache:
-    paths:
-      - node_modules/
-  stage: test
-  before_script: []
-  script:
-    - yarn run eslint
-
 lint:javascript:report:
  <<: *dedicated-runner
-  cache:
-    paths:
-      - node_modules/
+  <<: *except-docs
  stage: post-test
  before_script: []
  script:
-    - find app/ spec/ -name '*.js' -or -name '*.js.es6' -exec sed --in-place 's|/\* eslint-disable .*\*/||' {} \; # run report over all files
+    - find app/ spec/ -name '*.js' -exec sed --in-place 's|/\* eslint-disable .*\*/||' {} \; # run report over all files
    - yarn run eslint-report || true # ignore exit code
  artifacts:
    name: eslint-report
@@ -375,30 +494,15 @@ trigger_docs:
  before_script:
    - apk update && apk add curl
  variables:
-    GIT_STRATEGY: none
+    GIT_STRATEGY: "none"
  cache: {}
  artifacts: {}
  script:
-    - "curl -X POST -F token=${DOCS_TRIGGER_TOKEN} -F ref=master -F variables[PROJECT]=ce https://gitlab.com/api/v3/projects/1794617/trigger/builds"
+    - "HTTP_STATUS=$(curl -X POST -F token=${DOCS_TRIGGER_TOKEN} -F ref=master -F variables[PROJECT]=${CI_PROJECT_NAME} --silent --output curl.log --write-out '%{http_code}' https://gitlab.com/api/v3/projects/1794617/trigger/builds)"
+    - if [ "${HTTP_STATUS}" -ne "201" ]; then echo "Error ${HTTP_STATUS}"; cat curl.log; echo; exit 1; fi
  only:
    - master@gitlab-org/gitlab-ce
-
-# Notify slack in the end
-
-notify:slack:
-  stage: post-test
-  <<: *dedicated-runner
-  variables:
-    SETUP_DB: "false"
-    USE_BUNDLE_INSTALL: "false"
-  script:
-    - ./scripts/notify_slack.sh "#development" "Build on \`$CI_BUILD_REF_NAME\` failed! Commit \`$(git log -1 --oneline)\` See <https://gitlab.com/gitlab-org/$(basename "$PWD")/commit/"$CI_BUILD_REF"/pipelines>"
-  when: on_failure
-  only:
-    - master@gitlab-org/gitlab-ce
-    - tags@gitlab-org/gitlab-ce
    - master@gitlab-org/gitlab-ee
-    - tags@gitlab-org/gitlab-ee
  
 pages:
  before_script: []
@@ -406,8 +510,8 @@ pages:
  <<: *dedicated-runner
  dependencies:
    - coverage
-    - rake karma
-    - rake gitlab:assets:compile
+    - karma
+    - gitlab:assets:compile
    - lint:javascript:report
  script:
    - mv public/ .public/
@@ -421,6 +525,7 @@ pages:
      - public
  only:
    - master@gitlab-org/gitlab-ce
+    - master@gitlab-org/gitlab-ee
  
 # Insurance in case a gem needed by one of our releases gets yanked from
 # rubygems.org in the future.
@@ -437,3 +542,4 @@ cache gems:
      - vendor/cache
  only:
    - master@gitlab-org/gitlab-ce
+    - master@gitlab-org/gitlab-ee
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
+Please read this!
+
+Before opening a new issue, make sure to search for keywords in the issues
+filtered by the "regression" or "bug" label:
+
+- https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name%5B%5D=regression
+- https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name%5B%5D=bug
+
+and verify the issue you're about to submit isn't a duplicate.
+
+Please remove this notice if you're confident your issue isn't a duplicate.
+
+------
+
 ### Summary
  
 (Summarize the bug encountered concisely)
@@ -25,14 +39,25 @@ logs, and code as it's very hard to read otherwise.)
  
 #### Results of GitLab environment info
  
+<details>
+<summary>Expand for output related to GitLab environment info</summary>
+<pre>
+
 (For installations with omnibus-gitlab package run and paste the output of:
 `sudo gitlab-rake gitlab:env:info`)
  
 (For installations from source run and paste the output of:
 `sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production`)
  
+</pre>
+</details>
+
 #### Results of GitLab application Check
  
+<details>
+<summary>Expand for output related to the GitLab application check</summary>
+<pre>
+
 (For installations with omnibus-gitlab package run and paste the output of:
 `sudo gitlab-rake gitlab:check SANITIZE=true`)
  
@@ -41,6 +66,11 @@ logs, and code as it's very hard to read otherwise.)
  
 (we will only investigate if the tests are passing)
  
+</pre>
+</details>
+
 ### Possible fixes
  
 (If you can, link to the line of code that might be responsible for the problem)
+
+/label ~bug
--- a/.gitlab/issue_templates/Feature Proposal.md
+++ b/.gitlab/issue_templates/Feature Proposal.md
+Please read this!
+
+Before opening a new issue, make sure to search for keywords in the issues
+filtered by the "feature proposal" label:
+
+- https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name%5B%5D=feature+proposal
+
+and verify the issue you're about to submit isn't a duplicate.
+
+Please remove this notice if you're confident your issue isn't a duplicate.
+
+------
+
 ### Description
  
 (Include problem, use cases, benefits, and/or goals)
@@ -5,3 +18,15 @@
 ### Proposal
  
 ### Links / references
+
+### Documentation blurb
+
+(Write the start of the documentation of this feature here, include:
+
+1. Why should someone use it; what's the underlying problem.
+2. What is the solution.
+3. How does someone use this
+
+During implementation, this can then be copied and used as a starter for the documentation.)
+
+/label ~"feature proposal"
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -23,6 +23,7 @@ AllCops:
    - 'tmp/**/*'
    - 'bin/**/*'
    - 'generator_templates/**/*'
+    - 'builds/**/*'
  
 # Gems in consecutive lines should be alphabetically sorted
 Bundler/OrderedGems:
@@ -493,7 +494,13 @@ Style/TrailingBlankLines:
  
 # This cop checks for trailing comma in array and hash literals.
 Style/TrailingCommaInLiteral:
-  Enabled: false
+  Enabled: true
+  EnforcedStyleForMultiline: no_comma
+
+# This cop checks for trailing comma in argument lists.
+Style/TrailingCommaInArguments:
+  Enabled: true
+  EnforcedStyleForMultiline: no_comma
  
 # Checks for %W when interpolation is not needed.
 Style/UnneededCapitalW:
@@ -532,13 +539,17 @@ Style/WhileUntilModifier:
 Style/WordArray:
  Enabled: true
  
+# Use `proc` instead of `Proc.new`.
+Style/Proc:
+  Enabled: true
+
 # Metrics #####################################################################
  
 # A calculated magnitude based on number of assignments,
 # branches, and conditions.
 Metrics/AbcSize:
  Enabled: true
-  Max: 60
+  Max: 57.08
  
 # This cop checks if the length of a block exceeds some maximum value.
 Metrics/BlockLength:
@@ -557,7 +568,7 @@ Metrics/ClassLength:
 # of test cases needed to validate a method.
 Metrics/CyclomaticComplexity:
  Enabled: true
-  Max: 17
+  Max: 16
  
 # Limit lines to 80 characters.
 Metrics/LineLength:
@@ -949,10 +960,20 @@ RSpec/DescribeClass:
 RSpec/DescribeMethod:
  Enabled: false
  
+# Avoid describing symbols.
+RSpec/DescribeSymbol:
+  Enabled: true
+
 # Checks that the second argument to top level describe is the tested method
 # name.
 RSpec/DescribedClass:
-  Enabled: false
+  Enabled: true
+
+# Checks if an example group does not include any tests.
+RSpec/EmptyExampleGroup:
+  Enabled: true
+  CustomIncludeMethods:
+    - run_permission_checks
  
 # Checks for long example.
 RSpec/ExampleLength:
@@ -972,12 +993,18 @@ RSpec/ExampleWording:
 RSpec/ExpectActual:
  Enabled: true
  
+# Checks for opportunities to use `expect { … }.to output`.
+RSpec/ExpectOutput:
+  Enabled: true
+
 # Checks the file and folder naming of the spec file.
 RSpec/FilePath:
-  Enabled: false
-  CustomTransform:
-    RuboCop: rubocop
-    RSpec: rspec
+  Enabled: true
+  IgnoreMethods: true
+  Exclude:
+    - 'qa/**/*'
+    - 'spec/javascripts/fixtures/*'
+    - 'spec/requests/api/v3/*'
  
 # Checks if there are focused specs.
 RSpec/Focus:

--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
 # This configuration was generated by
 # `rubocop --auto-gen-config --exclude-limit 0`
-# on 2017-02-22 13:02:35 -0600 using RuboCop version 0.47.1.
+# on 2017-04-07 20:17:35 -0400 using RuboCop version 0.47.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
  
-# Offense count: 51
+# Offense count: 54
 RSpec/BeforeAfterAll:
  Enabled: false
  
-# Offense count: 15
-# Configuration parameters: CustomIncludeMethods.
-RSpec/EmptyExampleGroup:
+# Offense count: 233
+RSpec/EmptyLineAfterFinalLet:
  Enabled: false
  
-# Offense count: 1
-RSpec/ExpectOutput:
+# Offense count: 167
+RSpec/EmptyLineAfterSubject:
  Enabled: false
  
-# Offense count: 63
+# Offense count: 72
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: implicit, each, example
 RSpec/HookArgument:
@@ -31,19 +30,37 @@ RSpec/HookArgument:
 RSpec/ImplicitExpect:
  Enabled: false
  
-# Offense count: 36
-RSpec/RepeatedExample:
+# Offense count: 11
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: it_behaves_like, it_should_behave_like
+RSpec/ItBehavesLike:
+  Enabled: false
+
+# Offense count: 4
+RSpec/IteratedExpectation:
+  Enabled: false
+
+# Offense count: 3
+RSpec/OverwritingSetup:
  Enabled: false
  
 # Offense count: 34
+RSpec/RepeatedExample:
+  Enabled: false
+
+# Offense count: 43
+RSpec/ScatteredLet:
+  Enabled: false
+
+# Offense count: 32
 RSpec/ScatteredSetup:
  Enabled: false
  
 # Offense count: 1
-RSpec/SingleArgumentMessageChain:
+RSpec/SharedContext:
  Enabled: false
  
-# Offense count: 163
+# Offense count: 150
 Rails/FilePath:
  Enabled: false
  
@@ -53,7 +70,7 @@ Rails/FilePath:
 Rails/ReversibleMigration:
  Enabled: false
  
-# Offense count: 278
+# Offense count: 302
 # Configuration parameters: Blacklist.
 # Blacklist: decrement!, decrement_counter, increment!, increment_counter, toggle!, touch, update_all, update_attribute, update_column, update_columns, update_counters
 Rails/SkipsModelValidations:
@@ -64,26 +81,26 @@ Rails/SkipsModelValidations:
 Security/YAMLLoad:
  Enabled: false
  
-# Offense count: 55
+# Offense count: 59
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: percent_q, bare_percent
 Style/BarePercentLiterals:
  Enabled: false
  
-# Offense count: 1304
+# Offense count: 1403
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: leading, trailing
 Style/DotPosition:
  Enabled: false
  
-# Offense count: 6
+# Offense count: 5
 # Cop supports --auto-correct.
 Style/EachWithObject:
  Enabled: false
  
-# Offense count: 25
+# Offense count: 28
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: empty, nil, both
@@ -95,72 +112,72 @@ Style/EmptyElse:
 Style/EmptyLiteral:
  Enabled: false
  
-# Offense count: 56
+# Offense count: 59
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: compact, expanded
 Style/EmptyMethod:
  Enabled: false
  
-# Offense count: 184
+# Offense count: 214
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
 Style/ExtraSpacing:
  Enabled: false
  
-# Offense count: 8
+# Offense count: 9
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: format, sprintf, percent
 Style/FormatString:
  Enabled: false
  
-# Offense count: 268
+# Offense count: 285
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
  Enabled: false
  
-# Offense count: 14
+# Offense count: 16
 Style/IfInsideElse:
  Enabled: false
  
-# Offense count: 179
+# Offense count: 186
 # Cop supports --auto-correct.
 # Configuration parameters: MaxLineLength.
 Style/IfUnlessModifier:
  Enabled: false
  
-# Offense count: 57
+# Offense count: 99
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_brackets
 Style/IndentArray:
  Enabled: false
  
-# Offense count: 120
+# Offense count: 160
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
 Style/IndentHash:
  Enabled: false
  
-# Offense count: 45
+# Offense count: 50
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: line_count_dependent, lambda, literal
 Style/Lambda:
  Enabled: false
  
-# Offense count: 7
+# Offense count: 6
 # Cop supports --auto-correct.
 Style/LineEndConcatenation:
  Enabled: false
  
-# Offense count: 22
+# Offense count: 34
 # Cop supports --auto-correct.
 Style/MethodCallWithoutArgsParentheses:
  Enabled: false
  
-# Offense count: 9
+# Offense count: 10
 Style/MethodMissing:
  Enabled: false
  
@@ -169,26 +186,26 @@ Style/MethodMissing:
 Style/MultilineIfModifier:
  Enabled: false
  
-# Offense count: 22
+# Offense count: 24
 # Cop supports --auto-correct.
 Style/NestedParenthesizedCalls:
  Enabled: false
  
-# Offense count: 17
+# Offense count: 18
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
 # SupportedStyles: skip_modifier_ifs, always
 Style/Next:
  Enabled: false
  
-# Offense count: 31
+# Offense count: 37
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedOctalStyle, SupportedOctalStyles.
 # SupportedOctalStyles: zero_with_o, zero_only
 Style/NumericLiteralPrefix:
  Enabled: false
  
-# Offense count: 77
+# Offense count: 88
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles.
 # SupportedStyles: predicate, comparison
@@ -200,7 +217,7 @@ Style/NumericPredicate:
 Style/ParallelAssignment:
  Enabled: false
  
-# Offense count: 477
+# Offense count: 570
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
@@ -211,7 +228,7 @@ Style/PercentLiteralDelimiters:
 Style/PerlBackrefs:
  Enabled: false
  
-# Offense count: 72
+# Offense count: 83
 # Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
 # NamePrefix: is_, has_, have_
 # NamePrefixBlacklist: is_, has_, have_
@@ -219,26 +236,21 @@ Style/PerlBackrefs:
 Style/PredicateName:
  Enabled: false
  
-# Offense count: 39
+# Offense count: 45
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: short, verbose
 Style/PreferredHashMethods:
  Enabled: false
  
-# Offense count: 8
-# Cop supports --auto-correct.
-Style/Proc:
-  Enabled: false
-
-# Offense count: 62
+# Offense count: 65
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: compact, exploded
 Style/RaiseArgs:
  Enabled: false
  
-# Offense count: 4
+# Offense count: 5
 # Cop supports --auto-correct.
 Style/RedundantBegin:
  Enabled: false
@@ -254,19 +266,19 @@ Style/RedundantFreeze:
 Style/RedundantReturn:
  Enabled: false
  
-# Offense count: 365
+# Offense count: 382
 # Cop supports --auto-correct.
 Style/RedundantSelf:
  Enabled: false
  
-# Offense count: 108
+# Offense count: 111
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
 # SupportedStyles: slashes, percent_r, mixed
 Style/RegexpLiteral:
  Enabled: false
  
-# Offense count: 22
+# Offense count: 24
 # Cop supports --auto-correct.
 Style/RescueModifier:
  Enabled: false
@@ -282,7 +294,7 @@ Style/SelfAssignment:
 Style/SingleLineMethods:
  Enabled: false
  
-# Offense count: 155
+# Offense count: 168
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: space, no_space
@@ -295,14 +307,14 @@ Style/SpaceBeforeBlockBraces:
 Style/SpaceBeforeFirstArg:
  Enabled: false
  
-# Offense count: 38
+# Offense count: 46
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: require_no_space, require_space
 Style/SpaceInLambdaLiteral:
  Enabled: false
  
-# Offense count: 203
+# Offense count: 229
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces, SpaceBeforeBlockParameters.
 # SupportedStyles: space, no_space
@@ -310,58 +322,51 @@ Style/SpaceInLambdaLiteral:
 Style/SpaceInsideBlockBraces:
  Enabled: false
  
-# Offense count: 91
+# Offense count: 116
 # Cop supports --auto-correct.
 Style/SpaceInsideParens:
  Enabled: false
  
-# Offense count: 4
+# Offense count: 12
 # Cop supports --auto-correct.
 Style/SpaceInsidePercentLiteralDelimiters:
  Enabled: false
  
-# Offense count: 55
+# Offense count: 57
 # Cop supports --auto-correct.
 # Configuration parameters: SupportedStyles.
 # SupportedStyles: use_perl_names, use_english_names
 Style/SpecialGlobalVars:
  EnforcedStyle: use_perl_names
  
-# Offense count: 40
+# Offense count: 42
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiteralsInInterpolation:
  Enabled: false
  
-# Offense count: 57
+# Offense count: 64
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoredMethods.
 # IgnoredMethods: respond_to, define_method
 Style/SymbolProc:
  Enabled: false
  
-# Offense count: 5
+# Offense count: 6
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, AllowSafeAssignment.
 # SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex
 Style/TernaryParentheses:
  Enabled: false
  
-# Offense count: 43
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleForMultiline, SupportedStylesForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInArguments:
-  Enabled: false
-
-# Offense count: 13
+# Offense count: 18
 # Cop supports --auto-correct.
 # Configuration parameters: AllowNamedUnderscoreVariables.
 Style/TrailingUnderscoreVariable:
  Enabled: false
  
-# Offense count: 70
+# Offense count: 78
 # Cop supports --auto-correct.
 Style/TrailingWhitespace:
  Enabled: false
@@ -378,7 +383,7 @@ Style/TrivialAccessors:
 Style/UnlessElse:
  Enabled: false
  
-# Offense count: 22
+# Offense count: 24
 # Cop supports --auto-correct.
 Style/UnneededInterpolation:
  Enabled: false

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
+0.10.0
--- a/GITLAB_PAGES_VERSION
+++ b/GITLAB_PAGES_VERSION
-0.3.2
+0.4.2
--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
-4.1.1
+5.0.3
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
-1.3.0
+2.0.0
--- a/Gemfile
+++ b/Gemfile
@@ -15,28 +15,31 @@ gem 'default_value_for', '~> 3.0.0'
 gem 'mysql2', '~> 0.3.16', group: :mysql
 gem 'pg', '~> 0.18.2', group: :postgres
  
-gem 'rugged', '~> 0.24.0'
+gem 'rugged', '~> 0.25.1.1'
+
+gem 'faraday', '~> 0.11.0'
  
 # Authentication libraries
-gem 'devise',                 '~> 4.2'
-gem 'doorkeeper',             '~> 4.2.0'
-gem 'omniauth',               '~> 1.3.2'
-gem 'omniauth-auth0',         '~> 1.4.1'
-gem 'omniauth-azure-oauth2',  '~> 0.0.6'
-gem 'omniauth-cas3',          '~> 1.1.2'
-gem 'omniauth-facebook',      '~> 4.0.0'
-gem 'omniauth-github',        '~> 1.1.1'
-gem 'omniauth-gitlab',        '~> 1.0.2'
+gem 'devise', '~> 4.2'
+gem 'doorkeeper', '~> 4.2.0'
+gem 'doorkeeper-openid_connect', '~> 1.1.0'
+gem 'omniauth', '~> 1.4.2'
+gem 'omniauth-auth0', '~> 1.4.1'
+gem 'omniauth-azure-oauth2', '~> 0.0.6'
+gem 'omniauth-cas3', '~> 1.1.2'
+gem 'omniauth-facebook', '~> 4.0.0'
+gem 'omniauth-github', '~> 1.1.1'
+gem 'omniauth-gitlab', '~> 1.0.2'
 gem 'omniauth-google-oauth2', '~> 0.4.1'
-gem 'omniauth-kerberos',      '~> 0.3.0', group: :kerberos
+gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
 gem 'omniauth-oauth2-generic', '~> 0.2.2'
-gem 'omniauth-saml',          '~> 1.7.0'
-gem 'omniauth-shibboleth',    '~> 1.2.0'
-gem 'omniauth-twitter',       '~> 1.2.0'
-gem 'omniauth_crowd',         '~> 2.2.0'
-gem 'omniauth-authentiq',     '~> 0.3.0'
-gem 'rack-oauth2',            '~> 1.2.1'
-gem 'jwt',                    '~> 1.5.6'
+gem 'omniauth-saml', '~> 1.7.0'
+gem 'omniauth-shibboleth', '~> 1.2.0'
+gem 'omniauth-twitter', '~> 1.2.0'
+gem 'omniauth_crowd', '~> 2.2.0'
+gem 'omniauth-authentiq', '~> 0.3.0'
+gem 'rack-oauth2', '~> 1.2.1'
+gem 'jwt', '~> 1.5.6'
  
 # Spam and anti-bot protection
 gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
@@ -62,15 +65,18 @@ gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: 'omniauth-ldap'
 # Git Wiki
 # Required manually in config/initializers/gollum.rb to control load order
 gem 'gollum-lib', '~> 4.2', require: false
-gem 'gollum-rugged_adapter', '~> 0.4.2', require: false
+gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
  
 # Language detection
 gem 'github-linguist', '~> 4.7.0', require: 'linguist'
  
 # API
-gem 'grape',        '~> 0.18.0'
+gem 'grape', '~> 0.19.0'
 gem 'grape-entity', '~> 0.6.0'
-gem 'rack-cors',    '~> 0.4.0', require: 'rack/cors'
+gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
+
+# Disable strong_params so that Mash does not respond to :permitted?
+gem 'hashie-forbidden_attributes'
  
 # Pagination
 gem 'kaminari', '~> 0.17.0'
@@ -79,14 +85,14 @@ gem 'kaminari', '~> 0.17.0'
 gem 'hamlit', '~> 2.6.1'
  
 # Files attachments
-gem 'carrierwave', '~> 0.10.0'
+gem 'carrierwave', '~> 1.0'
  
 # Drag and Drop UI
 gem 'dropzonejs-rails', '~> 0.7.1'
  
 # for backups
 gem 'fog-aws', '~> 0.9'
-gem 'fog-core', '~> 1.40'
+gem 'fog-core', '~> 1.44'
 gem 'fog-google', '~> 0.5'
 gem 'fog-local', '~> 0.3'
 gem 'fog-openstack', '~> 0.1'
@@ -102,19 +108,19 @@ gem 'unf', '~> 0.1.4'
 gem 'seed-fu', '~> 2.3.5'
  
 # Markdown and HTML processing
-gem 'html-pipeline',        '~> 1.11.0'
-gem 'deckar01-task_list',   '1.0.6', require: 'task_list/railtie'
-gem 'gitlab-markup',        '~> 1.5.1'
-gem 'redcarpet',            '~> 3.3.3'
-gem 'RedCloth',             '~> 4.3.2'
-gem 'rdoc',                 '~> 4.2'
-gem 'org-ruby',             '~> 0.9.12'
-gem 'creole',               '~> 0.5.0'
-gem 'wikicloth',            '0.8.1'
-gem 'asciidoctor',          '~> 1.5.2'
+gem 'html-pipeline', '~> 1.11.0'
+gem 'deckar01-task_list', '1.0.6', require: 'task_list/railtie'
+gem 'gitlab-markup', '~> 1.5.1'
+gem 'redcarpet', '~> 3.4'
+gem 'RedCloth', '~> 4.3.2'
+gem 'rdoc', '~> 4.2'
+gem 'org-ruby', '~> 0.9.12'
+gem 'creole', '~> 0.5.0'
+gem 'wikicloth', '0.8.1'
+gem 'asciidoctor', '~> 1.5.2'
 gem 'asciidoctor-plantuml', '0.0.7'
-gem 'rouge',                '~> 2.0'
-gem 'truncato',             '~> 0.7.8'
+gem 'rouge', '~> 2.0'
+gem 'truncato', '~> 0.7.8'
  
 # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
 # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
@@ -138,11 +144,14 @@ gem 'after_commit_queue', '~> 1.3.0'
 gem 'acts-as-taggable-on', '~> 4.0'
  
 # Background jobs
-gem 'sidekiq', '~> 4.2.7'
-gem 'sidekiq-cron', '~> 0.4.4'
+gem 'sidekiq', '~> 5.0'
+gem 'sidekiq-cron', '~> 0.6.0'
 gem 'redis-namespace', '~> 1.5.2'
 gem 'sidekiq-limit_fetch', '~> 3.4'
  
+# Cron Parser
+gem 'rufus-scheduler', '~> 3.4'
+
 # HTTP requests
 gem 'httparty', '~> 0.13.3'
  
@@ -179,7 +188,7 @@ gem 'gemnasium-gitlab-service', '~> 0.2'
 gem 'slack-notifier', '~> 1.5.1'
  
 # Asana integration
-gem 'asana', '~> 0.4.0'
+gem 'asana', '~> 0.6.0'
  
 # FogBugz integration
 gem 'ruby-fogbugz', '~> 0.2.1'
@@ -222,32 +231,37 @@ gem 'oj', '~> 2.17.4'
 gem 'chronic', '~> 0.10.2'
 gem 'chronic_duration', '~> 0.10.6'
  
-gem 'webpack-rails', '~> 0.9.9'
+gem 'webpack-rails', '~> 0.9.10'
 gem 'rack-proxy', '~> 0.6.0'
  
 gem 'sass-rails', '~> 5.0.6'
 gem 'coffee-rails', '~> 4.1.0'
 gem 'uglifier', '~> 2.7.2'
  
-gem 'addressable',        '~> 2.3.8'
-gem 'bootstrap-sass',     '~> 3.3.0'
-gem 'font-awesome-rails', '~> 4.6.1'
-gem 'gemojione',          '~> 3.0'
-gem 'gon',                '~> 6.1.0'
+gem 'addressable', '~> 2.3.8'
+gem 'bootstrap-sass', '~> 3.3.0'
+gem 'font-awesome-rails', '~> 4.7'
+gem 'gemojione', '~> 3.0'
+gem 'gon', '~> 6.1.0'
 gem 'jquery-atwho-rails', '~> 1.3.2'
-gem 'jquery-rails',       '~> 4.1.0'
-gem 'jquery-ui-rails',    '~> 5.0.0'
-gem 'request_store',      '~> 1.3'
-gem 'select2-rails',      '~> 3.5.9'
-gem 'virtus',             '~> 1.0.1'
-gem 'net-ssh',            '~> 3.0.1'
-gem 'base32',             '~> 0.3.0'
+gem 'jquery-rails', '~> 4.1.0'
+gem 'request_store', '~> 1.3'
+gem 'select2-rails', '~> 3.5.9'
+gem 'virtus', '~> 1.0.1'
+gem 'net-ssh', '~> 3.0.1'
+gem 'base32', '~> 0.3.0'
  
 # Sentry integration
-gem 'sentry-raven', '~> 2.0.0'
+gem 'sentry-raven', '~> 2.4.0'
  
 gem 'premailer-rails', '~> 1.9.0'
  
+# I18n
+gem 'ruby_parser', '~> 3.8.4', require: false
+gem 'gettext_i18n_rails', '~> 1.8.0'
+gem 'gettext_i18n_rails_js', '~> 1.2.0'
+gem 'gettext', '~> 3.2.2', require: false, group: :development
+
 # Metrics
 group :metrics do
  gem 'allocations', '~> 1.0', require: false, platform: :mri
@@ -257,15 +271,13 @@ end
  
 group :development do
  gem 'foreman', '~> 0.78.0'
-  gem 'brakeman', '~> 3.4.0', require: false
+  gem 'brakeman', '~> 3.6.0', require: false
  
  gem 'letter_opener_web', '~> 1.3.0'
-  gem 'bullet', '~> 5.2.0', require: false
  gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
-  gem 'web-console', '~> 2.0'
  
  # Better errors handler
-  gem 'better_errors', '~> 1.0.1'
+  gem 'better_errors', '~> 2.1.0'
  gem 'binding_of_caller', '~> 0.7.2'
  
  # thin instead webrick
@@ -273,19 +285,21 @@ group :development do
 end
  
 group :development, :test do
+  gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
  gem 'pry-byebug', '~> 3.4.1', platform: :mri
  gem 'pry-rails', '~> 0.3.4'
  
  gem 'awesome_print', '~> 1.2.0', require: false
  gem 'fuubar', '~> 2.0.0'
  
-  gem 'database_cleaner',   '~> 1.5.0'
+  gem 'database_cleaner', '~> 1.5.0'
  gem 'factory_girl_rails', '~> 4.7.0'
-  gem 'rspec-rails',        '~> 3.5.0'
-  gem 'rspec-retry',        '~> 0.4.5'
-  gem 'spinach-rails',      '~> 0.2.1'
+  gem 'rspec-rails', '~> 3.5.0'
+  gem 'rspec-retry', '~> 0.4.5'
+  gem 'spinach-rails', '~> 0.2.1'
  gem 'spinach-rerun-reporter', '~> 0.0.2'
-  gem 'rspec_profiling',    '~> 0.0.5'
+  gem 'rspec_profiling', '~> 0.0.5'
+  gem 'rspec-set', '~> 0.1.3'
  
  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
  gem 'minitest', '~> 5.7.0'
@@ -293,20 +307,20 @@ group :development, :test do
  # Generate Fake data
  gem 'ffaker', '~> 2.4'
  
-  gem 'capybara',            '~> 2.6.2'
+  gem 'capybara', '~> 2.6.2'
  gem 'capybara-screenshot', '~> 1.0.0'
-  gem 'poltergeist',         '~> 1.9.0'
+  gem 'poltergeist', '~> 1.9.0'
  
-  gem 'spring',                   '~> 1.7.0'
-  gem 'spring-commands-rspec',    '~> 1.0.4'
-  gem 'spring-commands-spinach',  '~> 1.1.0'
+  gem 'spring', '~> 2.0.0'
+  gem 'spring-commands-rspec', '~> 1.0.4'
+  gem 'spring-commands-spinach', '~> 1.1.0'
  
  gem 'rubocop', '~> 0.47.1', require: false
-  gem 'rubocop-rspec', '~> 1.12.0', require: false
+  gem 'rubocop-rspec', '~> 1.15.0', require: false
  gem 'scss_lint', '~> 0.47.0', require: false
  gem 'haml_lint', '~> 0.21.0', require: false
-  gem 'simplecov', '0.12.0', require: false
-  gem 'flay', '~> 2.6.1', require: false
+  gem 'simplecov', '~> 0.14.0', require: false
+  gem 'flay', '~> 2.8.0', require: false
  gem 'bundler-audit', '~> 0.5.0', require: false
  
  gem 'benchmark-ips', '~> 2.3.0', require: false
@@ -323,14 +337,13 @@ group :test do
  gem 'shoulda-matchers', '~> 2.8.0', require: false
  gem 'email_spec', '~> 1.6.0'
  gem 'json-schema', '~> 2.6.2'
-  gem 'webmock', '~> 1.21.0'
+  gem 'webmock', '~> 1.24.0'
  gem 'test_after_commit', '~> 1.1'
  gem 'sham_rack', '~> 1.3.6'
  gem 'timecop', '~> 0.8.0'
+  gem 'concurrent-ruby', '~> 1.0.5'
 end
  
-gem 'newrelic_rpm', '~> 3.16'
-
 gem 'octokit', '~> 4.6.2'
  
 gem 'mail_room', '~> 0.9.1'
@@ -341,14 +354,19 @@ gem 'html2text'
 gem 'ruby-prof', '~> 0.16.2'
  
 # OAuth
-gem 'oauth2', '~> 1.2.0'
+gem 'oauth2', '~> 1.3.0'
  
 # Soft deletion
 gem 'paranoia', '~> 2.2'
  
 # Health check
-gem 'health_check', '~> 2.2.0'
+gem 'health_check', '~> 2.6.0'
  
 # System information
 gem 'vmstat', '~> 2.3.0'
 gem 'sys-filesystem', '~> 1.1.6'
+
+# Gitaly GRPC client
+gem 'gitaly', '~> 0.7.0'
+
+gem 'toml-rb', '~> 0.3.15', require: false
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
  remote: https://rubygems.org/
  specs:
    RedCloth (4.3.2)
-    ace-rails-ap (4.1.0)
+    ace-rails-ap (4.1.2)
    actionmailer (4.2.8)
      actionpack (= 4.2.8)
      actionview (= 4.2.8)
@@ -47,7 +47,7 @@ GEM
    akismet (2.0.0)
    allocations (1.0.5)
    arel (6.0.4)
-    asana (0.4.0)
+    asana (0.6.0)
      faraday (~> 0.9)
      faraday_middleware (~> 0.9)
      faraday_middleware-multi_json (~> 0.0)
@@ -75,18 +75,20 @@ GEM
    base32 (0.3.2)
    bcrypt (3.1.11)
    benchmark-ips (2.3.0)
-    better_errors (1.0.1)
+    better_errors (2.1.1)
      coderay (>= 1.0.0)
      erubis (>= 2.6.6)
+      rack (>= 0.9.0)
+    bindata (2.3.5)
    binding_of_caller (0.7.2)
      debug_inspector (>= 0.0.1)
    bootstrap-sass (3.3.6)
      autoprefixer-rails (>= 5.2.1)
      sass (>= 3.3.4)
-    brakeman (3.4.1)
+    brakeman (3.6.1)
    browser (2.2.0)
    builder (3.2.3)
-    bullet (5.2.0)
+    bullet (5.5.1)
      activesupport (>= 3.0.0)
      uniform_notifier (~> 1.10.0)
    bundler-audit (0.5.0)
@@ -100,13 +102,12 @@ GEM
      rack (>= 1.0.0)
      rack-test (>= 0.5.4)
      xpath (~> 2.0)
-    capybara-screenshot (1.0.11)
+    capybara-screenshot (1.0.14)
      capybara (>= 1.0, < 3)
      launchy
-    carrierwave (0.10.0)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-      json (>= 1.7)
+    carrierwave (1.0.0)
+      activemodel (>= 4.0.0)
+      activesupport (>= 4.0.0)
      mime-types (>= 1.16)
    cause (0.1)
    charlock_holmes (0.7.3)
@@ -114,8 +115,9 @@ GEM
    chronic_duration (0.10.6)
      numerizer (~> 0.1.1)
    chunky_png (1.3.5)
+    citrus (3.0.2)
    cliver (0.3.2)
-    coderay (1.1.0)
+    coderay (1.1.1)
    coercible (1.0.0)
      descendants_tracker (~> 0.0.1)
    coffee-rails (4.1.1)
@@ -126,7 +128,7 @@ GEM
      execjs
    coffee-script-source (1.10.0)
    colorize (0.7.7)
-    concurrent-ruby (1.0.4)
+    concurrent-ruby (1.0.5)
    connection_pool (2.2.1)
    crack (0.4.3)
      safe_yaml (~> 1.0.0)
@@ -166,6 +168,9 @@ GEM
      unf (>= 0.0.5, < 1.0.0)
    doorkeeper (4.2.0)
      railties (>= 4.2)
+    doorkeeper-openid_connect (1.1.2)
+      doorkeeper (~> 4.0)
+      json-jwt (~> 1.6)
    dropzonejs-rails (0.7.2)
      rails (> 3.1)
    email_reply_trimmer (0.1.6)
@@ -176,8 +181,10 @@ GEM
    equalizer (0.0.11)
    erubis (2.7.0)
    escape_utils (1.1.1)
+    et-orbi (1.0.3)
+      tzinfo
    eventmachine (1.0.8)
-    excon (0.52.0)
+    excon (0.55.0)
    execjs (2.6.0)
    expression_parser (0.9.0)
    extlib (0.9.16)
@@ -186,27 +193,30 @@ GEM
    factory_girl_rails (4.7.0)
      factory_girl (~> 4.7.0)
      railties (>= 3.0.0)
-    faraday (0.9.2)
+    faraday (0.11.0)
      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.10.0)
-      faraday (>= 0.7.4, < 0.10)
+    faraday_middleware (0.11.0.1)
+      faraday (>= 0.7.4, < 1.0)
    faraday_middleware-multi_json (0.0.6)
      faraday_middleware
      multi_json
+    fast_gettext (1.4.0)
    ffaker (2.4.0)
    ffi (1.9.10)
-    flay (2.6.1)
+    flay (2.8.1)
+      erubis (~> 2.7.0)
+      path_expander (~> 1.0)
      ruby_parser (~> 3.0)
      sexp_processor (~> 4.0)
    flowdock (0.7.1)
      httparty (~> 0.7)
      multi_json
-    fog-aws (0.11.0)
+    fog-aws (0.13.0)
      fog-core (~> 1.38)
      fog-json (~> 1.0)
      fog-xml (~> 0.1)
      ipaddress (~> 0.8)
-    fog-core (1.42.0)
+    fog-core (1.44.1)
      builder
      excon (~> 0.49)
      formatador (~> 0.2)
@@ -228,10 +238,10 @@ GEM
      fog-json (>= 1.0)
      fog-xml (>= 0.1)
      ipaddress (>= 0.8)
-    fog-xml (0.1.2)
+    fog-xml (0.1.3)
      fog-core
-      nokogiri (~> 1.5, >= 1.5.11)
-    font-awesome-rails (4.6.1.0)
+      nokogiri (>= 1.5.11, < 2.0.0)
+    font-awesome-rails (4.7.0.1)
      railties (>= 3.2, < 5.1)
    foreman (0.78.0)
      thor (~> 0.19.1)
@@ -244,7 +254,20 @@ GEM
    gemojione (3.0.1)
      json
    get_process_mem (0.2.0)
+    gettext (3.2.2)
+      locale (>= 2.0.5)
+      text (>= 1.3.0)
+    gettext_i18n_rails (1.8.0)
+      fast_gettext (>= 0.9.0)
+    gettext_i18n_rails_js (1.2.0)
+      gettext (>= 3.0.2)
+      gettext_i18n_rails (>= 0.7.1)
+      po_to_json (>= 1.0.0)
+      rails (>= 3.2.0)
    gherkin-ruby (0.3.2)
+    gitaly (0.7.0)
+      google-protobuf (~> 3.1)
+      grpc (~> 1.0)
    github-linguist (4.7.6)
      charlock_holmes (~> 0.7.3)
      escape_utils (~> 1.1.0)
@@ -277,9 +300,9 @@ GEM
      rouge (~> 2.0)
      sanitize (~> 2.1.0)
      stringex (~> 2.5.1)
-    gollum-rugged_adapter (0.4.2)
+    gollum-rugged_adapter (0.4.4)
      mime-types (>= 1.15)
-      rugged (~> 0.24.0, >= 0.21.3)
+      rugged (~> 0.25)
    gon (6.1.0)
      actionpack (>= 3.0)
      json
@@ -296,6 +319,7 @@ GEM
      multi_json (~> 1.10)
      retriable (~> 1.4)
      signet (~> 0.6)
+    google-protobuf (3.2.0.2)
    googleauth (0.5.1)
      faraday (~> 0.9)
      jwt (~> 1.4)
@@ -304,7 +328,7 @@ GEM
      multi_json (~> 1.11)
      os (~> 0.9)
      signet (~> 0.7)
-    grape (0.18.0)
+    grape (0.19.1)
      activesupport
      builder
      hashie (>= 2.1.0)
@@ -317,6 +341,9 @@ GEM
    grape-entity (0.6.0)
      activesupport
      multi_json (>= 1.3.2)
+    grpc (1.2.5)
+      google-protobuf (~> 3.1)
+      googleauth (~> 0.5.1)
    haml (4.0.7)
      tilt
    haml_lint (0.21.0)
@@ -328,8 +355,11 @@ GEM
      temple (~> 0.7.6)
      thor
      tilt
-    hashie (3.4.4)
-    health_check (2.2.1)
+    hashdiff (0.3.2)
+    hashie (3.5.5)
+    hashie-forbidden_attributes (0.1.1)
+      hashie (>= 3.0)
+    health_check (2.6.0)
      rails (>= 4.0)
    hipchat (1.5.2)
      httparty
@@ -353,8 +383,8 @@ GEM
      json (~> 1.8)
      multi_xml (>= 0.5.2)
    httpclient (2.8.2)
-    i18n (0.8.0)
-    ice_nine (0.11.1)
+    i18n (0.8.1)
+    ice_nine (0.11.2)
    influxdb (0.2.3)
      cause
      json
@@ -367,9 +397,13 @@ GEM
      rails-dom-testing (>= 1, < 3)
      railties (>= 4.2.0)
      thor (>= 0.14, < 2.0)
-    jquery-ui-rails (5.0.5)
-      railties (>= 3.2.16)
    json (1.8.6)
+    json-jwt (1.7.1)
+      activesupport
+      bindata
+      multi_json (>= 1.3)
+      securecompare
+      url_safe_base64
    json-schema (2.6.2)
      addressable (~> 2.3.8)
    jwt (1.5.6)
@@ -401,12 +435,13 @@ GEM
    licensee (8.7.0)
      rugged (~> 0.24)
    little-plugger (1.1.4)
-    logging (2.1.0)
+    locale (2.1.2)
+    logging (2.2.2)
      little-plugger (~> 1.1)
      multi_json (~> 1.10)
    loofah (2.0.3)
      nokogiri (>= 1.5.9)
-    mail (2.6.4)
+    mail (2.6.5)
      mime-types (>= 1.16, < 4)
    mail_room (0.9.1)
    memoist (0.15.0)
@@ -417,7 +452,7 @@ GEM
    minitest (5.7.0)
    mousetrap-rails (1.4.6)
    multi_json (1.12.1)
-    multi_xml (0.5.5)
+    multi_xml (0.6.0)
    multipart-post (2.0.0)
    mustermann (0.4.0)
      tool (~> 0.2)
@@ -427,21 +462,20 @@ GEM
    net-ldap (0.12.1)
    net-ssh (3.0.1)
    netrc (0.11.0)
-    newrelic_rpm (3.16.0.318)
    nokogiri (1.6.8.1)
      mini_portile2 (~> 2.1.0)
    numerizer (0.1.1)
    oauth (0.5.1)
-    oauth2 (1.2.0)
-      faraday (>= 0.8, < 0.10)
+    oauth2 (1.3.1)
+      faraday (>= 0.8, < 0.12)
      jwt (~> 1.0)
      multi_json (~> 1.3)
      multi_xml (~> 0.5)
      rack (>= 1.2, < 3)
    octokit (4.6.2)
      sawyer (~> 0.8.0, >= 0.5.3)
-    oj (2.17.4)
-    omniauth (1.3.2)
+    oj (2.17.5)
+    omniauth (1.4.2)
      hashie (>= 1.2, < 4)
      rack (>= 1.0, < 3)
    omniauth-auth0 (1.4.1)
@@ -503,7 +537,10 @@ GEM
      activerecord (>= 4.0, < 5.1)
    parser (2.4.0.0)
      ast (~> 2.2)
+    path_expander (1.0.1)
    pg (0.18.4)
+    po_to_json (1.0.1)
+      json (>= 1.6.0)
    poltergeist (1.9.0)
      capybara (~> 2.1)
      cliver (~> 0.3.1)
@@ -517,14 +554,14 @@ GEM
    premailer-rails (1.9.2)
      actionmailer (>= 3, < 6)
      premailer (~> 1.7, >= 1.7.9)
-    pry (0.10.3)
+    pry (0.10.4)
      coderay (~> 1.1.0)
      method_source (~> 0.8.1)
      slop (~> 3.4)
-    pry-byebug (3.4.1)
+    pry-byebug (3.4.2)
      byebug (~> 9.0)
      pry (~> 0.10)
-    pry-rails (0.3.4)
+    pry-rails (0.3.5)
      pry (>= 0.9.10)
    pyu-ruby-sasl (0.0.3.3)
    rack (1.6.5)
@@ -579,8 +616,8 @@ GEM
    recaptcha (3.0.0)
      json
    recursive-open-struct (1.0.0)
-    redcarpet (3.3.3)
-    redis (3.2.2)
+    redcarpet (3.4.0)
+    redis (3.3.3)
    redis-actionpack (5.0.1)
      actionpack (>= 4.0, < 6)
      redis-rack (>= 1, < 3)
@@ -636,6 +673,7 @@ GEM
      rspec-support (~> 3.5.0)
    rspec-retry (0.4.5)
      rspec-core
+    rspec-set (0.1.3)
    rspec-support (3.5.0)
    rspec_profiling (0.0.5)
      activerecord
@@ -648,7 +686,7 @@ GEM
      rainbow (>= 1.99.1, < 3.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-rspec (1.12.0)
+    rubocop-rspec (1.15.0)
      rubocop (>= 0.42.0)
    ruby-fogbugz (0.2.1)
      crack (~> 0.4)
@@ -656,13 +694,14 @@ GEM
    ruby-progressbar (1.8.1)
    ruby-saml (1.4.1)
      nokogiri (>= 1.5.10)
-    ruby_parser (3.8.2)
+    ruby_parser (3.8.4)
      sexp_processor (~> 4.1)
    rubyntlm (0.5.2)
    rubypants (0.2.0)
-    rubyzip (1.2.0)
-    rufus-scheduler (3.1.10)
-    rugged (0.24.0)
+    rubyzip (1.2.1)
+    rufus-scheduler (3.4.0)
+      et-orbi (~> 1.0)
+    rugged (0.25.1.1)
    safe_yaml (1.0.4)
    sanitize (2.1.0)
      nokogiri (>= 1.4.4)
@@ -679,27 +718,27 @@ GEM
    scss_lint (0.47.1)
      rake (>= 0.9, < 11)
      sass (~> 3.4.15)
+    securecompare (1.0.0)
    seed-fu (2.3.6)
      activerecord (>= 3.1)
      activesupport (>= 3.1)
    select2-rails (3.5.9.3)
      thor (~> 0.14)
-    sentry-raven (2.0.2)
-      faraday (>= 0.7.6, < 0.10.x)
+    sentry-raven (2.4.0)
+      faraday (>= 0.7.6, < 1.0)
    settingslogic (2.0.9)
-    sexp_processor (4.7.0)
+    sexp_processor (4.8.0)
    sham_rack (1.3.6)
      rack
    shoulda-matchers (2.8.0)
      activesupport (>= 3.0.0)
-    sidekiq (4.2.7)
+    sidekiq (5.0.0)
      concurrent-ruby (~> 1.0)
      connection_pool (~> 2.2, >= 2.2.0)
      rack-protection (>= 1.5.0)
-      redis (~> 3.2, >= 3.2.1)
-    sidekiq-cron (0.4.4)
-      redis-namespace (>= 1.5.2)
-      rufus-scheduler (>= 2.0.24)
+      redis (~> 3.3, >= 3.3.3)
+    sidekiq-cron (0.6.0)
+      rufus-scheduler (>= 3.3.0)
      sidekiq (>= 4.2.1)
    sidekiq-limit_fetch (3.4.0)
      sidekiq (>= 4)
@@ -708,7 +747,7 @@ GEM
      faraday (~> 0.9)
      jwt (~> 1.5)
      multi_json (~> 1.10)
-    simplecov (0.12.0)
+    simplecov (0.14.1)
      docile (~> 1.1.0)
      json (>= 1.8, < 3)
      simplecov-html (~> 0.10.0)
@@ -725,7 +764,8 @@ GEM
      spinach (>= 0.4)
    spinach-rerun-reporter (0.0.2)
      spinach (~> 0.8)
-    spring (1.7.2)
+    spring (2.0.1)
+      activesupport (>= 4.2)
    spring-commands-rspec (1.0.4)
      spring (>= 0.9.1)
    spring-commands-spinach (1.1.0)
@@ -753,15 +793,18 @@ GEM
    temple (0.7.7)
    test_after_commit (1.1.0)
      activerecord (>= 3.2)
+    text (1.3.1)
    thin (1.7.0)
      daemons (~> 1.0, >= 1.0.9)
      eventmachine (~> 1.0, >= 1.0.4)
      rack (>= 1, < 3)
    thor (0.19.4)
-    thread_safe (0.3.5)
+    thread_safe (0.3.6)
    tilt (2.0.6)
    timecop (0.8.1)
    timfel-krb5-auth (0.8.3)
+    toml-rb (0.3.15)
+      citrus (~> 3.0, > 3.0)
    tool (0.2.3)
    truncato (0.7.8)
      htmlentities (~> 4.3.1)
@@ -784,6 +827,7 @@ GEM
      get_process_mem (~> 0)
      unicorn (>= 4, < 6)
    uniform_notifier (1.10.0)
+    url_safe_base64 (0.2.2)
    validates_hostname (1.0.6)
      activerecord (>= 3.0)
      activesupport (>= 3.0)
@@ -796,16 +840,12 @@ GEM
    vmstat (2.3.0)
    warden (1.2.6)
      rack (>= 1.0)
-    web-console (2.3.0)
-      activemodel (>= 4.0)
-      binding_of_caller (>= 0.7.2)
-      railties (>= 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-    webmock (1.21.0)
+    webmock (1.24.6)
      addressable (>= 2.3.6)
      crack (>= 0.3.2)
-    webpack-rails (0.9.9)
-      rails (>= 3.2.0)
+      hashdiff
+    webpack-rails (0.9.10)
+      railties (>= 3.2.0)
    websocket-driver (0.6.3)
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.2)
@@ -829,7 +869,7 @@ DEPENDENCIES
  after_commit_queue (~> 1.3.0)
  akismet (~> 2.0)
  allocations (~> 1.0)
-  asana (~> 0.4.0)
+  asana (~> 0.6.0)
  asciidoctor (~> 1.5.2)
  asciidoctor-plantuml (= 0.0.7)
  attr_encrypted (~> 3.0.0)
@@ -837,20 +877,21 @@ DEPENDENCIES
  babosa (~> 1.0.2)
  base32 (~> 0.3.0)
  benchmark-ips (~> 2.3.0)
-  better_errors (~> 1.0.1)
+  better_errors (~> 2.1.0)
  binding_of_caller (~> 0.7.2)
  bootstrap-sass (~> 3.3.0)
-  brakeman (~> 3.4.0)
+  brakeman (~> 3.6.0)
  browser (~> 2.2)
-  bullet (~> 5.2.0)
+  bullet (~> 5.5.0)
  bundler-audit (~> 0.5.0)
  capybara (~> 2.6.2)
  capybara-screenshot (~> 1.0.0)
-  carrierwave (~> 0.10.0)
+  carrierwave (~> 1.0)
  charlock_holmes (~> 0.7.3)
  chronic (~> 0.10.2)
  chronic_duration (~> 0.10.6)
  coffee-rails (~> 4.1.0)
+  concurrent-ruby (~> 1.0.5)
  connection_pool (~> 2.0)
  creole (~> 0.5.0)
  d3_rails (~> 3.5.0)
@@ -861,36 +902,43 @@ DEPENDENCIES
  devise-two-factor (~> 3.0.0)
  diffy (~> 3.1.0)
  doorkeeper (~> 4.2.0)
+  doorkeeper-openid_connect (~> 1.1.0)
  dropzonejs-rails (~> 0.7.1)
  email_reply_trimmer (~> 0.1)
  email_spec (~> 1.6.0)
  factory_girl_rails (~> 4.7.0)
+  faraday (~> 0.11.0)
  ffaker (~> 2.4)
-  flay (~> 2.6.1)
+  flay (~> 2.8.0)
  fog-aws (~> 0.9)
-  fog-core (~> 1.40)
+  fog-core (~> 1.44)
  fog-google (~> 0.5)
  fog-local (~> 0.3)
  fog-openstack (~> 0.1)
  fog-rackspace (~> 0.1.1)
-  font-awesome-rails (~> 4.6.1)
+  font-awesome-rails (~> 4.7)
  foreman (~> 0.78.0)
  fuubar (~> 2.0.0)
  gemnasium-gitlab-service (~> 0.2)
  gemojione (~> 3.0)
+  gettext (~> 3.2.2)
+  gettext_i18n_rails (~> 1.8.0)
+  gettext_i18n_rails_js (~> 1.2.0)
+  gitaly (~> 0.7.0)
  github-linguist (~> 4.7.0)
  gitlab-flowdock-git-hook (~> 1.0.1)
  gitlab-markup (~> 1.5.1)
  gitlab_omniauth-ldap (~> 1.2.1)
  gollum-lib (~> 4.2)
-  gollum-rugged_adapter (~> 0.4.2)
+  gollum-rugged_adapter (~> 0.4.4)
  gon (~> 6.1.0)
  google-api-client (~> 0.8.6)
-  grape (~> 0.18.0)
+  grape (~> 0.19.0)
  grape-entity (~> 0.6.0)
  haml_lint (~> 0.21.0)
  hamlit (~> 2.6.1)
-  health_check (~> 2.2.0)
+  hashie-forbidden_attributes
+  health_check (~> 2.6.0)
  hipchat (~> 1.5.0)
  html-pipeline (~> 1.11.0)
  html2text
@@ -899,7 +947,6 @@ DEPENDENCIES
  jira-ruby (~> 1.1.2)
  jquery-atwho-rails (~> 1.3.2)
  jquery-rails (~> 4.1.0)
-  jquery-ui-rails (~> 5.0.0)
  json-schema (~> 2.6.2)
  jwt (~> 1.5.6)
  kaminari (~> 0.17.0)
@@ -915,12 +962,11 @@ DEPENDENCIES
  mousetrap-rails (~> 1.4.6)
  mysql2 (~> 0.3.16)
  net-ssh (~> 3.0.1)
-  newrelic_rpm (~> 3.16)
  nokogiri (~> 1.6.7, >= 1.6.7.2)
-  oauth2 (~> 1.2.0)
+  oauth2 (~> 1.3.0)
  octokit (~> 4.6.2)
  oj (~> 2.17.4)
-  omniauth (~> 1.3.2)
+  omniauth (~> 1.4.2)
  omniauth-auth0 (~> 1.4.1)
  omniauth-authentiq (~> 0.3.0)
  omniauth-azure-oauth2 (~> 0.0.6)
@@ -952,7 +998,7 @@ DEPENDENCIES
  rblineprof (~> 0.3.6)
  rdoc (~> 4.2)
  recaptcha (~> 3.0)
-  redcarpet (~> 3.3.3)
+  redcarpet (~> 3.4)
  redis (~> 3.2)
  redis-namespace (~> 1.5.2)
  redis-rails (~> 5.0.1)
@@ -962,29 +1008,32 @@ DEPENDENCIES
  rqrcode-rails3 (~> 0.1.7)
  rspec-rails (~> 3.5.0)
  rspec-retry (~> 0.4.5)
+  rspec-set (~> 0.1.3)
  rspec_profiling (~> 0.0.5)
  rubocop (~> 0.47.1)
-  rubocop-rspec (~> 1.12.0)
+  rubocop-rspec (~> 1.15.0)
  ruby-fogbugz (~> 0.2.1)
  ruby-prof (~> 0.16.2)
-  rugged (~> 0.24.0)
+  ruby_parser (~> 3.8.4)
+  rufus-scheduler (~> 3.4)
+  rugged (~> 0.25.1.1)
  sanitize (~> 2.0)
  sass-rails (~> 5.0.6)
  scss_lint (~> 0.47.0)
  seed-fu (~> 2.3.5)
  select2-rails (~> 3.5.9)
-  sentry-raven (~> 2.0.0)
+  sentry-raven (~> 2.4.0)
  settingslogic (~> 2.0.9)
  sham_rack (~> 1.3.6)
  shoulda-matchers (~> 2.8.0)
-  sidekiq (~> 4.2.7)
-  sidekiq-cron (~> 0.4.4)
+  sidekiq (~> 5.0)
+  sidekiq-cron (~> 0.6.0)
  sidekiq-limit_fetch (~> 3.4)
-  simplecov (= 0.12.0)
+  simplecov (~> 0.14.0)
  slack-notifier (~> 1.5.1)
  spinach-rails (~> 0.2.1)
  spinach-rerun-reporter (~> 0.0.2)
-  spring (~> 1.7.0)
+  spring (~> 2.0.0)
  spring-commands-rspec (~> 1.0.4)
  spring-commands-spinach (~> 1.1.0)
  sprockets (~> 3.7.0)
@@ -994,6 +1043,7 @@ DEPENDENCIES
  test_after_commit (~> 1.1)
  thin (~> 1.7.0)
  timecop (~> 0.8.0)
+  toml-rb (~> 0.3.15)
  truncato (~> 0.7.8)
  u2f (~> 0.2.1)
  uglifier (~> 2.7.2)
@@ -1005,10 +1055,9 @@ DEPENDENCIES
  version_sorter (~> 2.1.0)
  virtus (~> 1.0.1)
  vmstat (~> 2.3.0)
-  web-console (~> 2.0)
-  webmock (~> 1.21.0)
-  webpack-rails (~> 0.9.9)
+  webmock (~> 1.24.0)
+  webpack-rails (~> 0.9.10)
  wikicloth (= 0.8.1)
  
 BUNDLED WITH
-   1.14.3
+   1.14.6
--- a/PROCESS.md
+++ b/PROCESS.md
-# GitLab Contributing Process
+## GitLab Core Team & GitLab Inc. Contribution Process
+
+---
+
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+**Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
+
+- [Purpose of describing the contributing process](#purpose-of-describing-the-contributing-process)
+- [Common actions](#common-actions)
+  - [Merge request coaching](#merge-request-coaching)
+- [Assigning issues](#assigning-issues)
+- [Be kind](#be-kind)
+- [Feature freeze on the 7th for the release on the 22nd](#feature-freeze-on-the-7th-for-the-release-on-the-22nd)
+  - [Between the 1st and the 7th](#between-the-1st-and-the-7th)
+  - [On the 7th](#on-the-7th)
+  - [After the 7th](#after-the-7th)
+- [Release retrospective and kickoff](#release-retrospective-and-kickoff)
+  - [Retrospective](#retrospective)
+  - [Kickoff](#kickoff)
+- [Copy & paste responses](#copy--paste-responses)
+  - [Improperly formatted issue](#improperly-formatted-issue)
+  - [Issue report for old version](#issue-report-for-old-version)
+  - [Support requests and configuration questions](#support-requests-and-configuration-questions)
+  - [Code format](#code-format)
+  - [Issue fixed in newer version](#issue-fixed-in-newer-version)
+  - [Improperly formatted merge request](#improperly-formatted-merge-request)
+  - [Inactivity close of an issue](#inactivity-close-of-an-issue)
+  - [Inactivity close of a merge request](#inactivity-close-of-a-merge-request)
+  - [Accepting merge requests](#accepting-merge-requests)
+  - [Only accepting merge requests with green tests](#only-accepting-merge-requests-with-green-tests)
+  - [Closing down the issue tracker on GitHub](#closing-down-the-issue-tracker-on-github)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
+---
  
 ## Purpose of describing the contributing process
  
-Below we describe the contributing process to GitLab for two reasons. So that
-contributors know what to expect from maintainers (possible responses, friendly
-treatment, etc.). And so that maintainers know what to expect from contributors
-(use the latest version, ensure that the issue is addressed, friendly treatment,
-etc.).
+Below we describe the contributing process to GitLab for two reasons:
+
+1. Contributors know what to expect from maintainers (possible responses, friendly
+  treatment, etc.)
+1. Maintainers know what to expect from contributors (use the latest version,
+  ensure that the issue is addressed, friendly treatment, etc.).
  
 - [GitLab Inc engineers should refer to the engineering workflow document](https://about.gitlab.com/handbook/engineering/workflow/)
  
 ## Common actions
  
-### Issue triaging
-
-Our issue triage policies are [described in our handbook]. You are very welcome
-to help the GitLab team triage issues. We also organize [issue bash events] once
-every quarter.
-
-The most important thing is making sure valid issues receive feedback from the
-development team. Therefore the priority is mentioning developers that can help
-on those issues. Please select someone with relevant experience from
-[GitLab team][team]. If there is nobody mentioned with that expertise
-look in the commit history for the affected files to find someone. Avoid
-mentioning the lead developer, this is the person that is least likely to give a
-timely response. If the involvement of the lead developer is needed the other
-core team members will mention this person.
-
-[described in our handbook]: https://about.gitlab.com/handbook/engineering/issues/issue-triage-policies/
-[issue bash events]: https://gitlab.com/gitlab-org/gitlab-ce/issues/17815
-
 ### Merge request coaching
  
 Several people from the [GitLab team][team] are helping community members to get
-their contributions accepted by meeting our [Definition of done](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#definition-of-done).
+their contributions accepted by meeting our [Definition of done][done].
  
 What you can expect from them is described at https://about.gitlab.com/jobs/merge-request-coach/.
  
-## Workflow labels
-
-Labelling issues is described in the [GitLab Inc engineering workflow].
-
-[GitLab Inc engineering workflow]: https://about.gitlab.com/handbook/engineering/workflow/#labelling-issues
-
 ## Assigning issues
  
 If an issue is complex and needs the attention of a specific person, assignment is a good option but assigning issues might discourage other people from contributing to that issue. We need all the contributions we can get so this should never be discouraged. Also, an assigned person might not have time for a few weeks, so others should feel free to takeover.
@@ -57,19 +69,72 @@ star, smile, etc.). Some good tips about code reviews can be found in our
  
 [Code Review Guidelines]: https://docs.gitlab.com/ce/development/code_review.html
  
-## Feature Freeze
+## Feature freeze on the 7th for the release on the 22nd
  
-After the 7th (Pacific Standard Time Zone) of each month, RC1 of the upcoming release is created and deployed to GitLab.com and the stable branch for this release is frozen, which means master is no longer merged into it.
+After the 7th (Pacific Standard Time Zone) of each month, RC1 of the upcoming release (to be shipped on the 22nd) is created and deployed to GitLab.com and the stable branch for this release is frozen, which means master is no longer merged into it.
 Merge requests may still be merged into master during this period,
 but they will go into the _next_ release, unless they are manually cherry-picked into the stable branch.
 By freezing the stable branches 2 weeks prior to a release, we reduce the risk of a last minute merge request potentially breaking things.
  
+### Between the 1st and the 7th
+
+These types of merge requests for the upcoming release need special consideration:
+
+* **Large features**: a large feature is one that is highlighted in the kick-off
+  and the release blogpost; typically this will have its own channel in Slack
+  and a dedicated team with front-end, back-end, and UX.
+* **Small features**: any other feature request.
+
+**Large features** must be with a maintainer **by the 1st**. This means that:
+
+* There is a merge request (even if it's WIP).
+* The person (or people, if it needs a frontend and backend maintainer) who will
+  ultimately be responsible for merging this have been pinged on the MR.
+
+It's OK if merge request isn't completely done, but this allows the maintainer
+enough time to make the decision about whether this can make it in before the
+freeze. If the maintainer doesn't think it will make it, they should inform the
+developers working on it and the Product Manager responsible for the feature.
+
+The maintainer can also choose to assign a reviewer to perform an initial
+review, but this way the maintainer is unlikely to be surprised by receiving an
+MR later in the cycle.
+
+**Small features** must be with a reviewer (not necessarily maintainer) **by the
+3rd**.
+
+Most merge requests from the community do not have a specific release
+target. However, if one does and falls into either of the above categories, it's
+the reviewer's responsibility to manage the above communication and assignment
+on behalf of the community member.
+
+### On the 7th
+
+Merge requests should still be complete, following the
+[definition of done][done]. The single exception is documentation, and this can
+only be left until after the freeze if:
+
+* There is a follow-up issue to add documentation.
+* It is assigned to the person writing documentation for this feature, and they
+  are aware of it.
+* It is in the correct milestone, with the ~Deliverable label.
+
+All Community Edition merge requests from GitLab team members merged on the
+freeze date (the 7th) should have a corresponding Enterprise Edition merge
+request, even if there are no conflicts. This is to reduce the size of the
+subsequent EE merge, as we often merge a lot to CE on the release date. For more
+information, see
+[limit conflicts with EE when developing on CE][limit_ee_conflicts].
+
+### After the 7th
+
 Once the stable branch is frozen, only fixes for regressions (bugs introduced in that same release)
 and security issues will be cherry-picked into the stable branch.
 Any merge requests cherry-picked into the stable branch for a previous release will also be picked into the latest stable branch.
-These fixes will be released in the next RC (before the 22nd) or patch release (after the 22nd).
+These fixes will be shipped in the next RC for that release if it is before the 22nd.
+If the fixes are are completed on or after the 22nd, they will be shipped in a patch for that release.
  
-If you think a merge request should go into the upcoming release even though it does not meet these requirements,
+If you think a merge request should go into an RC or patch even though it does not meet these requirements,
 you can ask for an exception to be made. Exceptions require sign-off from 3 people besides the developer:
  
 1. a Release Manager
@@ -93,6 +158,29 @@ release should have the correct milestone assigned _and_ have the label
 Merge requests without a milestone and this label will
 not be merged into any stable branches.
  
+## Release retrospective and kickoff
+
+### Retrospective
+
+After each release, we have a retrospective call where we discuss what went well,
+what went wrong, and what we can improve for the next release. The
+[retrospective notes] are public and you are invited to comment on them.
+If you're interested, you can even join the
+[retrospective call][retro-kickoff-call], on the first working day after the
+22nd at 6pm CET / 9am PST.
+
+### Kickoff
+
+Before working on the next release, we have a
+kickoff call to explain what we expect to ship in the next release. The
+[kickoff notes] are public and you are invited to comment on them.
+If you're interested, you can even join the [kickoff call][retro-kickoff-call],
+on the first working day after the 7th at 6pm CET / 9am PST..
+
+[retrospective notes]: https://docs.google.com/document/d/1nEkM_7Dj4bT21GJy0Ut3By76FZqCfLBmFQNVThmW2TY/edit?usp=sharing
+[kickoff notes]: https://docs.google.com/document/d/1ElPkZ90A8ey_iOkTvUs_ByMlwKK6NAB2VOK5835wYK0/edit?usp=sharing
+[retro-kickoff-call]: https://gitlab.zoom.us/j/918821206
+
 ## Copy & paste responses
  
 ### Improperly formatted issue
@@ -158,3 +246,5 @@ still an issue I encourage you to open it on the [GitLab.com issue tracker](http
 [contribution acceptance criteria]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#contribution-acceptance-criteria
 ["Implement design & UI elements" guidelines]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#implement-design-ui-elements
 [Thoughtbot code review guide]: https://github.com/thoughtbot/guides/tree/master/code-review
+[done]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#definition-of-done
+[limit_ee_conflicts]: https://docs.gitlab.com/ce/development/limit_ee_conflicts.html
No results found