Compare revisions

07365e51 · b125fb4b · a5521bad · 839018d2 · ac1667f2 · 5bce197b
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
+---
+engines:
+  brakeman:
+    enabled: true
+  bundler-audit:
+    enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - ruby
+      - javascript
+    exclude_paths:
+      - "lib/api/v3/*"
+  eslint:
+    enabled: true
+  rubocop:
+    enabled: true
+ratings:
+  paths:
+  - Gemfile.lock
+  - "**.erb"
+  - "**.haml"
+  - "**.rb"
+  - "**.rhtml"
+  - "**.slim"
+  - "**.inc"
+  - "**.js"
+  - "**.jsx"
+  - "**.module"
+exclude_paths:
+- config/
+- db/
+- features/
+- node_modules/
+- spec/
+- vendor/
+- .yarn-cache/
+- tmp/
+- builds/
+- coverage/
+- public/
+- shared/
+- webpack-report/
+- log/
+- backups/
+- coverage-javascript/
--- a/.eslintrc
+++ b/.eslintrc
@@ -11,6 +11,7 @@
    "gon": false,
    "localStorage": false
  },
+  "parser": "babel-eslint",
  "plugins": [
    "filenames",
    "import",
@@ -27,6 +28,7 @@
  },
  "rules": {
    "filenames/match-regex": [2, "^[a-z0-9_]+$"],
+    "import/no-commonjs": "error",
    "no-multiple-empty-lines": ["error", { "max": 1 }],
    "promise/catch-or-return": "error"
  }

--- a/.flayignore
+++ b/.flayignore
@@ -3,3 +3,4 @@ lib/gitlab/sanitizers/svg/whitelist.rb
 lib/gitlab/diff/position_tracer.rb
 app/policies/project_policy.rb
 app/models/concerns/relative_positioning.rb
+lib/gitlab/redis/*.rb
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ eslint-report.html
 /.yarn-cache
 /.byebug_history
 /Vagrantfile
+/app/assets/javascripts/locale/**/app.js
 /backups/*
 /config/aws.yml
 /config/database.yml
@@ -30,6 +31,9 @@ eslint-report.html
 /config/initializers/smtp_settings.rb
 /config/initializers/relative_url.rb
 /config/resque.yml
+/config/redis.cache.yml
+/config/redis.queues.yml
+/config/redis.shared_state.yml
 /config/unicorn.rb
 /config/secrets.yml
 /config/sidekiq.yml
@@ -59,3 +63,4 @@ eslint-report.html
 /.gitlab_workhorse_secret
 /webpack-report/
 /locale/**/LC_MESSAGES
+/.rspec
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
 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:
+.default-cache: &default-cache
  key: "ruby-233-with-yarn"
  paths:
-  - vendor/ruby
+    - vendor/ruby
-  - .yarn-cache/
+    - .yarn-cache/
+.push-cache: &push-cache
+  cache:
+    <<: *default-cache
+    policy: push
+.pull-cache: &pull-cache
+  cache:
+    <<: *default-cache
+    policy: pull
 variables:
  MYSQL_ALLOW_EMPTY_PASSWORD: "1"
@@ -24,11 +34,11 @@ before_script:
  - source scripts/prepare_build.sh
 stages:
- build
+  - build
- prepare
+  - prepare
- test
+  - test
- post-test
+  - post-test
- pages
+  - pages
 # Predefined scopes
 .dedicated-runner: &dedicated-runner
@@ -41,10 +51,6 @@ stages:
    SETUP_DB: "false"
    USE_BUNDLE_INSTALL: "false"
    KNAPSACK_S3_BUCKET: "gitlab-ce-cache"
-  cache:
-    key: "knapsack"
-    paths:
-      - knapsack/
  artifacts:
    expire_in: 31d
    paths:
@@ -52,7 +58,7 @@ stages:
 .use-pg: &use-pg
  services:
-    - postgres:latest
+    - postgres:9.2
    - redis:alpine
 .use-mysql: &use-mysql
@@ -63,6 +69,7 @@ stages:
 .only-master-and-ee-or-mysql: &only-master-and-ee-or-mysql
  only:
    - /mysql/
+    - /-stable/
    - master@gitlab-org/gitlab-ce
    - master@gitlab/gitlabhq
    - tags@gitlab-org/gitlab-ce
@@ -78,8 +85,9 @@ stages:
    - /(^docs[\/-].*|.*-docs$)/
 .rspec-knapsack: &rspec-knapsack
-  stage: test
  <<: *dedicated-runner
+  <<: *pull-cache
+  stage: test
  script:
    - JOB_NAME=( $CI_JOB_NAME )
    - export CI_NODE_INDEX=${JOB_NAME[-2]}
@@ -88,6 +96,7 @@ stages:
    - export KNAPSACK_GENERATE_REPORT=true
    - export CACHE_CLASSES=true
    - cp ${KNAPSACK_RSPEC_SUITE_REPORT_PATH} ${KNAPSACK_REPORT_PATH}
+    - scripts/gitaly-test-spawn
    - knapsack rspec "--color --format documentation"
  artifacts:
    expire_in: 31d
@@ -109,8 +118,9 @@ stages:
  <<: *except-docs
 .spinach-knapsack: &spinach-knapsack
-  stage: test
  <<: *dedicated-runner
+  <<: *pull-cache
+  stage: test
  script:
    - JOB_NAME=( $CI_JOB_NAME )
    - export CI_NODE_INDEX=${JOB_NAME[-2]}
@@ -149,15 +159,20 @@ stages:
 # Trigger a package build on omnibus-gitlab repository
 build-package:
+  image: ruby:2.3-alpine
  before_script: []
  services: []
  variables:
    SETUP_DB: "false"
    USE_BUNDLE_INSTALL: "false"
  stage: build
+  cache: {}
  when: manual
  script:
    - scripts/trigger-build
+  only:
+    - //@gitlab-org/gitlab-ce
+    - //@gitlab-org/gitlab-ee
 # Prepare and merge knapsack tests
 knapsack:
@@ -165,6 +180,11 @@ knapsack:
  <<: *dedicated-runner
  <<: *except-docs
  stage: prepare
+  cache:
+    key: knapsack
+    paths:
+      - knapsack/
+    policy: pull
  script:
    - 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
@@ -177,7 +197,13 @@ update-knapsack:
  <<: *dedicated-runner
  <<: *only-canonical-masters
  stage: post-test
+  cache:
+    key: knapsack
+    paths:
+      - knapsack/
+    policy: push
  script:
+    - retry gem install fog-aws mime-types
    - 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'
@@ -188,11 +214,15 @@ setup-test-env:
  <<: *dedicated-runner
  <<: *except-docs
  stage: prepare
+  cache:
+    <<: *default-cache
  script:
    - node --version
    - yarn install --pure-lockfile --cache-folder .yarn-cache
+    - bundle exec rake gettext:po_to_json
    - bundle exec rake gitlab:assets:compile
    - bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init'
+    - scripts/gitaly-test-build # Do not use 'bundle exec' here
  artifacts:
    expire_in: 7d
    paths:
@@ -200,72 +230,73 @@ setup-test-env:
      - public/assets
      - tmp/tests
-rspec-pg 0 20: *rspec-knapsack-pg
+rspec-pg 0 25: *rspec-knapsack-pg
-rspec-pg 1 20: *rspec-knapsack-pg
+rspec-pg 1 25: *rspec-knapsack-pg
-rspec-pg 2 20: *rspec-knapsack-pg
+rspec-pg 2 25: *rspec-knapsack-pg
-rspec-pg 3 20: *rspec-knapsack-pg
+rspec-pg 3 25: *rspec-knapsack-pg
-rspec-pg 4 20: *rspec-knapsack-pg
+rspec-pg 4 25: *rspec-knapsack-pg
-rspec-pg 5 20: *rspec-knapsack-pg
+rspec-pg 5 25: *rspec-knapsack-pg
-rspec-pg 6 20: *rspec-knapsack-pg
+rspec-pg 6 25: *rspec-knapsack-pg
-rspec-pg 7 20: *rspec-knapsack-pg
+rspec-pg 7 25: *rspec-knapsack-pg
-rspec-pg 8 20: *rspec-knapsack-pg
+rspec-pg 8 25: *rspec-knapsack-pg
-rspec-pg 9 20: *rspec-knapsack-pg
+rspec-pg 9 25: *rspec-knapsack-pg
-rspec-pg 10 20: *rspec-knapsack-pg
+rspec-pg 10 25: *rspec-knapsack-pg
-rspec-pg 11 20: *rspec-knapsack-pg
+rspec-pg 11 25: *rspec-knapsack-pg
-rspec-pg 12 20: *rspec-knapsack-pg
+rspec-pg 12 25: *rspec-knapsack-pg
-rspec-pg 13 20: *rspec-knapsack-pg
+rspec-pg 13 25: *rspec-knapsack-pg
-rspec-pg 14 20: *rspec-knapsack-pg
+rspec-pg 14 25: *rspec-knapsack-pg
-rspec-pg 15 20: *rspec-knapsack-pg
+rspec-pg 15 25: *rspec-knapsack-pg
-rspec-pg 16 20: *rspec-knapsack-pg
+rspec-pg 16 25: *rspec-knapsack-pg
-rspec-pg 17 20: *rspec-knapsack-pg
+rspec-pg 17 25: *rspec-knapsack-pg
-rspec-pg 18 20: *rspec-knapsack-pg
+rspec-pg 18 25: *rspec-knapsack-pg
-rspec-pg 19 20: *rspec-knapsack-pg
+rspec-pg 19 25: *rspec-knapsack-pg
+rspec-pg 20 25: *rspec-knapsack-pg
-rspec-mysql 0 20: *rspec-knapsack-mysql
+rspec-pg 21 25: *rspec-knapsack-pg
-rspec-mysql 1 20: *rspec-knapsack-mysql
+rspec-pg 22 25: *rspec-knapsack-pg
-rspec-mysql 2 20: *rspec-knapsack-mysql
+rspec-pg 23 25: *rspec-knapsack-pg
-rspec-mysql 3 20: *rspec-knapsack-mysql
+rspec-pg 24 25: *rspec-knapsack-pg
-rspec-mysql 4 20: *rspec-knapsack-mysql
-rspec-mysql 5 20: *rspec-knapsack-mysql
+rspec-mysql 0 25: *rspec-knapsack-mysql
-rspec-mysql 6 20: *rspec-knapsack-mysql
+rspec-mysql 1 25: *rspec-knapsack-mysql
-rspec-mysql 7 20: *rspec-knapsack-mysql
+rspec-mysql 2 25: *rspec-knapsack-mysql
-rspec-mysql 8 20: *rspec-knapsack-mysql
+rspec-mysql 3 25: *rspec-knapsack-mysql
-rspec-mysql 9 20: *rspec-knapsack-mysql
+rspec-mysql 4 25: *rspec-knapsack-mysql
-rspec-mysql 10 20: *rspec-knapsack-mysql
+rspec-mysql 5 25: *rspec-knapsack-mysql
-rspec-mysql 11 20: *rspec-knapsack-mysql
+rspec-mysql 6 25: *rspec-knapsack-mysql
-rspec-mysql 12 20: *rspec-knapsack-mysql
+rspec-mysql 7 25: *rspec-knapsack-mysql
-rspec-mysql 13 20: *rspec-knapsack-mysql
+rspec-mysql 8 25: *rspec-knapsack-mysql
-rspec-mysql 14 20: *rspec-knapsack-mysql
+rspec-mysql 9 25: *rspec-knapsack-mysql
-rspec-mysql 15 20: *rspec-knapsack-mysql
+rspec-mysql 10 25: *rspec-knapsack-mysql
-rspec-mysql 16 20: *rspec-knapsack-mysql
+rspec-mysql 11 25: *rspec-knapsack-mysql
-rspec-mysql 17 20: *rspec-knapsack-mysql
+rspec-mysql 12 25: *rspec-knapsack-mysql
-rspec-mysql 18 20: *rspec-knapsack-mysql
+rspec-mysql 13 25: *rspec-knapsack-mysql
-rspec-mysql 19 20: *rspec-knapsack-mysql
+rspec-mysql 14 25: *rspec-knapsack-mysql
+rspec-mysql 15 25: *rspec-knapsack-mysql
-spinach-pg 0 10: *spinach-knapsack-pg
+rspec-mysql 16 25: *rspec-knapsack-mysql
-spinach-pg 1 10: *spinach-knapsack-pg
+rspec-mysql 17 25: *rspec-knapsack-mysql
-spinach-pg 2 10: *spinach-knapsack-pg
+rspec-mysql 18 25: *rspec-knapsack-mysql
-spinach-pg 3 10: *spinach-knapsack-pg
+rspec-mysql 19 25: *rspec-knapsack-mysql
-spinach-pg 4 10: *spinach-knapsack-pg
+rspec-mysql 20 25: *rspec-knapsack-mysql
-spinach-pg 5 10: *spinach-knapsack-pg
+rspec-mysql 21 25: *rspec-knapsack-mysql
-spinach-pg 6 10: *spinach-knapsack-pg
+rspec-mysql 22 25: *rspec-knapsack-mysql
-spinach-pg 7 10: *spinach-knapsack-pg
+rspec-mysql 23 25: *rspec-knapsack-mysql
-spinach-pg 8 10: *spinach-knapsack-pg
+rspec-mysql 24 25: *rspec-knapsack-mysql
-spinach-pg 9 10: *spinach-knapsack-pg
+spinach-pg 0 5: *spinach-knapsack-pg
-spinach-mysql 0 10: *spinach-knapsack-mysql
+spinach-pg 1 5: *spinach-knapsack-pg
-spinach-mysql 1 10: *spinach-knapsack-mysql
+spinach-pg 2 5: *spinach-knapsack-pg
-spinach-mysql 2 10: *spinach-knapsack-mysql
+spinach-pg 3 5: *spinach-knapsack-pg
-spinach-mysql 3 10: *spinach-knapsack-mysql
+spinach-pg 4 5: *spinach-knapsack-pg
-spinach-mysql 4 10: *spinach-knapsack-mysql
-spinach-mysql 5 10: *spinach-knapsack-mysql
+spinach-mysql 0 5: *spinach-knapsack-mysql
-spinach-mysql 6 10: *spinach-knapsack-mysql
+spinach-mysql 1 5: *spinach-knapsack-mysql
-spinach-mysql 7 10: *spinach-knapsack-mysql
+spinach-mysql 2 5: *spinach-knapsack-mysql
-spinach-mysql 8 10: *spinach-knapsack-mysql
+spinach-mysql 3 5: *spinach-knapsack-mysql
-spinach-mysql 9 10: *spinach-knapsack-mysql
+spinach-mysql 4 5: *spinach-knapsack-mysql
 # Static analysis jobs
 .ruby-static-analysis: &ruby-static-analysis
+  <<: *pull-cache
  variables:
    SIMPLECOV: "false"
    SETUP_DB: "false"
@@ -274,6 +305,7 @@ spinach-mysql 9 10: *spinach-knapsack-mysql
  <<: *ruby-static-analysis
  <<: *dedicated-runner
  <<: *except-docs
+  <<: *pull-cache
  stage: test
  script:
    - bundle exec rake $CI_JOB_NAME
@@ -290,9 +322,9 @@ static-analysis:
 # - Check validity of relative links
 # - Make sure cURL examples in API docs use the full switches
 docs lint:
+  <<: *dedicated-runner
  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:nanoc-bootstrap-ruby-2.4-alpine"
  stage: test
-  <<: *dedicated-runner
  cache: {}
  dependencies: []
  before_script: []
@@ -335,9 +367,10 @@ ee_compat_check:
 # DB migration, rollback, and seed jobs
 .db-migrate-reset: &db-migrate-reset
-  stage: test
  <<: *dedicated-runner
  <<: *except-docs
+  <<: *pull-cache
+  stage: test
  script:
    - bundle exec rake db:migrate:reset
@@ -350,15 +383,17 @@ db:migrate:reset-mysql:
  <<: *use-mysql
 .migration-paths: &migration-paths
-  stage: test
  <<: *dedicated-runner
+  <<: *only-canonical-masters
+  <<: *pull-cache
+  stage: test
  variables:
    SETUP_DB: "false"
-  <<: *only-canonical-masters
  script:
    - git fetch origin v8.14.10
    - git checkout -f FETCH_HEAD
    - bundle install $BUNDLE_INSTALL_FLAGS
+    - cp config/gitlab.yml.example config/gitlab.yml
    - bundle exec rake db:drop db:create db:schema:load db:seed_fu
    - git checkout $CI_COMMIT_SHA
    - bundle install $BUNDLE_INSTALL_FLAGS
@@ -374,9 +409,10 @@ migration:path-mysql:
  <<: *use-mysql
 .db-rollback: &db-rollback
-  stage: test
  <<: *dedicated-runner
  <<: *except-docs
+  <<: *pull-cache
+  stage: test
  script:
    - bundle exec rake db:rollback STEP=120
    - bundle exec rake db:migrate
@@ -390,9 +426,10 @@ db:rollback-mysql:
  <<: *use-mysql
 .db-seed_fu: &db-seed_fu
-  stage: test
  <<: *dedicated-runner
  <<: *except-docs
+  <<: *pull-cache
+  stage: test
  variables:
    SIZE: "1"
    SETUP_DB: "false"
@@ -417,9 +454,10 @@ db:seed_fu-mysql:
 # Frontend-related jobs
 gitlab:assets:compile:
-  stage: test
  <<: *dedicated-runner
  <<: *except-docs
+  <<: *pull-cache
+  stage: test
  dependencies: []
  variables:
    NODE_ENV: "production"
@@ -428,36 +466,63 @@ gitlab:assets:compile:
    USE_DB: "false"
    SKIP_STORAGE_VALIDATION: "true"
    WEBPACK_REPORT: "true"
+    NO_COMPRESSION: "true"
  script:
    - yarn install --pure-lockfile --production --cache-folder .yarn-cache
+    - bundle exec rake gettext:po_to_json
    - bundle exec rake gitlab:assets:compile
  artifacts:
    name: webpack-report
    expire_in: 31d
    paths:
-    - webpack-report/
+      - webpack-report/
 karma:
-  stage: test
  <<: *use-pg
  <<: *dedicated-runner
  <<: *except-docs
+  <<: *pull-cache
+  image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.3-golang-1.8-git-2.7-chrome-59.0-node-7.1-postgresql-9.6"
+  stage: test
  variables:
    BABEL_ENV: "coverage"
+    CHROME_LOG_FILE: "chrome_debug.log"
  script:
+    - scripts/gitaly-test-spawn
+    - bundle exec rake gettext:po_to_json
    - bundle exec rake karma
  coverage: '/^Statements *: (\d+\.\d+%)/'
  artifacts:
    name: coverage-javascript
    expire_in: 31d
+    when: always
    paths:
+    - chrome_debug.log
    - coverage-javascript/
+codeclimate:
+  <<: *except-docs
+  <<: *pull-cache
+  before_script: []
+  image: docker:latest
+  stage: test
+  variables:
+    SETUP_DB: "false"
+    DOCKER_DRIVER: overlay
+  services:
+    - docker:dind
+  script:
+    - docker run --env CODECLIMATE_CODE="$PWD" --volume "$PWD":/code --volume /var/run/docker.sock:/var/run/docker.sock --volume /tmp/cc:/tmp/cc codeclimate/codeclimate analyze -f json > raw_codeclimate.json
+    - cat raw_codeclimate.json | docker run -i stedolan/jq -c 'map({check_name,fingerprint,location})' > codeclimate.json
+  artifacts:
+    paths: [codeclimate.json]
 coverage:
-  stage: post-test
-  services: []
  <<: *dedicated-runner
  <<: *except-docs
+  <<: *pull-cache
+  stage: post-test
+  services: []
  variables:
    SETUP_DB: "false"
    USE_BUNDLE_INSTALL: "true"
@@ -474,7 +539,10 @@ coverage:
 lint:javascript:report:
  <<: *dedicated-runner
  <<: *except-docs
+  <<: *pull-cache
  stage: post-test
+  dependencies:
+    - setup-test-env
  before_script: []
  script:
    - find app/ spec/ -name '*.js' -exec sed --in-place 's|/\* eslint-disable .*\*/||' {} \; # run report over all files
@@ -485,29 +553,11 @@ lint:javascript:report:
    paths:
    - eslint-report.html
-# Trigger docs build
-# https://gitlab.com/gitlab-com/doc-gitlab-com/blob/master/README.md#deployment-process
-trigger_docs:
-  stage: post-test
-  image: "alpine"
-  <<: *dedicated-runner
-  before_script:
-    - apk update && apk add curl
-  variables:
-    GIT_STRATEGY: "none"
-  cache: {}
-  artifacts: {}
-  script:
-    - "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
-    - master@gitlab-org/gitlab-ee
 pages:
+  <<: *dedicated-runner
+  <<: *pull-cache
  before_script: []
  stage: pages
-  <<: *dedicated-runner
  dependencies:
    - coverage
    - karma
@@ -531,6 +581,7 @@ pages:
 # rubygems.org in the future.
 cache gems:
  <<: *dedicated-runner
+  <<: *pull-cache
  only:
    - tags
  variables:
@@ -543,3 +594,11 @@ cache gems:
  only:
    - master@gitlab-org/gitlab-ce
    - master@gitlab-org/gitlab-ee
+gitlab_git_test:
+  <<: *pull-cache
+  <<: *except-docs
+  variables:
+    SETUP_DB: "false"
+  script:
+    - spec/support/prepare-gitlab-git-test-for-commit --check-for-changes
--- 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:
+filtered by the "regression" or "bug" label.
+For the Community Edition issue tracker:
 - 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
+For the Enterprise Edition issue tracker:
+- https://gitlab.com/gitlab-org/gitlab-ee/issues?label_name%5B%5D=regression
+- https://gitlab.com/gitlab-org/gitlab-ee/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.
@@ -20,6 +27,12 @@ Please remove this notice if you're confident your issue isn't a duplicate.
 (How one can reproduce the issue - this is very important)
+### Example Project
+(If possible, please create an example project here on GitLab.com that exhibits the problematic behaviour, and link to it here in the bug report)
+(If you are using an older version of GitLab, this will also determine whether the bug has been fixed in a more recent version)
 ### What is the current *bug* behavior?
 (What actually happens)

--- a/.gitlab/issue_templates/Feature Proposal.md
+++ b/.gitlab/issue_templates/Feature Proposal.md
@@ -3,8 +3,14 @@ Please read this!
 Before opening a new issue, make sure to search for keywords in the issues
 filtered by the "feature proposal" label:
+For the Community Edition issue tracker:
 - https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name%5B%5D=feature+proposal
+For the Enterprise Edition issue tracker:
+- https://gitlab.com/gitlab-org/gitlab-ee/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.
@@ -21,12 +27,24 @@ Please remove this notice if you're confident your issue isn't a duplicate.
 ### Documentation blurb
-(Write the start of the documentation of this feature here, include:
+#### Overview
+What is it?
+Why should someone use this feature?
+What is the underlying (business) problem?
+How do you use this feature?
+#### Use cases
+Who is this for? Provide one or more use cases.
+### Feature checklist
-1. Why should someone use it; what's the underlying problem.
+Make sure these are completed before closing the issue,
-2. What is the solution.
+with a link to the relevant commit.
-3. How does someone use this
-During implementation, this can then be copied and used as a starter for the documentation.)
+- [ ] [Feature assurance](https://about.gitlab.com/handbook/product/#feature-assurance)
+- [ ] Documentation
+- [ ] Added to [features.yml](https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/data/features.yml)
 /label ~"feature proposal"
\ No newline at end of file
--- a/.nvmrc
+++ b/.nvmrc
+7.5
\ No newline at end of file
--- a/.rspec
+++ b/.rspec
--color
--format Fuubar
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -6,6 +6,7 @@ inherit_from: .rubocop_todo.yml
 AllCops:
  TargetRubyVersion: 2.3
+  TargetRailsVersion: 4.2
  # Cop names are not d§splayed in offense messages by default. Change behavior
  # by overriding DisplayCopNames, or by giving the -D/--display-cop-names
  # option.
@@ -29,33 +30,229 @@ AllCops:
 Bundler/OrderedGems:
  Enabled: false
-# Style #######################################################################
+# Layout ######################################################################
 # Check indentation of private/protected visibility modifiers.
-Style/AccessModifierIndentation:
+Layout/AccessModifierIndentation:
-  Enabled: true
-# Check the naming of accessor methods for get_/set_.
-Style/AccessorMethodName:
-  Enabled: false
-# Use alias_method instead of alias.
-Style/Alias:
-  EnforcedStyle: prefer_alias_method
  Enabled: true
 # Align the elements of an array literal if they span more than one line.
-Style/AlignArray:
+Layout/AlignArray:
  Enabled: true
 # Align the elements of a hash literal if they span more than one line.
-Style/AlignHash:
+Layout/AlignHash:
  Enabled: true
 # Here we check if the parameters on a multi-line method call or
 # definition are aligned.
-Style/AlignParameters:
+Layout/AlignParameters:
+  Enabled: false
+# Put end statement of multiline block on its own line.
+Layout/BlockEndNewline:
+  Enabled: true
+# Indentation of when in a case/when/[else/]end.
+Layout/CaseIndentation:
+  Enabled: true
+# Indentation of comments.
+Layout/CommentIndentation:
+  Enabled: true
+# Multi-line method chaining should be done with leading dots.
+Layout/DotPosition:
+  Enabled: true
+  EnforcedStyle: leading
+# Align elses and elsifs correctly.
+Layout/ElseAlignment:
+  Enabled: true
+# Add an empty line after magic comments to separate them from code.
+Layout/EmptyLineAfterMagicComment:
+  Enabled: false
+# Use empty lines between defs.
+Layout/EmptyLineBetweenDefs:
+  Enabled: true
+# Don't use several empty lines in a row.
+Layout/EmptyLines:
+  Enabled: true
+# Keep blank lines around access modifiers.
+Layout/EmptyLinesAroundAccessModifier:
+  Enabled: true
+# Keeps track of empty lines around block bodies.
+Layout/EmptyLinesAroundBlockBody:
+  Enabled: true
+# Keeps track of empty lines around class bodies.
+Layout/EmptyLinesAroundClassBody:
+  Enabled: true
+# Keeps track of empty lines around exception handling keywords.
+Layout/EmptyLinesAroundExceptionHandlingKeywords:
+  Enabled: false
+# Keeps track of empty lines around method bodies.
+Layout/EmptyLinesAroundMethodBody:
+  Enabled: true
+# Keeps track of empty lines around module bodies.
+Layout/EmptyLinesAroundModuleBody:
+  Enabled: true
+# Use Unix-style line endings.
+Layout/EndOfLine:
+  Enabled: true
+# Checks for a line break before the first parameter in a multi-line method
+# parameter definition.
+Layout/FirstMethodParameterLineBreak:
+  Enabled: true
+# Keep indentation straight.
+Layout/IndentationConsistency:
+  Enabled: true
+# Use 2 spaces for indentation.
+Layout/IndentationWidth:
+  Enabled: true
+# Checks the indentation of the first line of the right-hand-side of a
+# multi-line assignment.
+Layout/IndentAssignment:
+  Enabled: true
+# This cops checks the indentation of the here document bodies.
+Layout/IndentHeredoc:
+  Enabled: false
+# Comments should start with a space.
+Layout/LeadingCommentSpace:
+  Enabled: true
+# Checks that the closing brace in an array literal is either on the same line
+# as the last array element, or a new line.
+Layout/MultilineArrayBraceLayout:
+  Enabled: true
+  EnforcedStyle: symmetrical
+# Ensures newlines after multiline block do statements.
+Layout/MultilineBlockLayout:
+  Enabled: true
+# Checks that the closing brace in a hash literal is either on the same line as
+# the last hash element, or a new line.
+Layout/MultilineHashBraceLayout:
+  Enabled: true
+  EnforcedStyle: symmetrical
+# Checks that the closing brace in a method call is either on the same line as
+# the last method argument, or a new line.
+Layout/MultilineMethodCallBraceLayout:
  Enabled: false
+  EnforcedStyle: symmetrical
+# Checks indentation of method calls with the dot operator that span more than
+# one line.
+Layout/MultilineMethodCallIndentation:
+  Enabled: false
+# Checks that the closing brace in a method definition is symmetrical with
+# respect to the opening brace and the method parameters.
+Layout/MultilineMethodDefinitionBraceLayout:
+  Enabled: false
+# Checks indentation of binary operations that span more than one line.
+Layout/MultilineOperationIndentation:
+  Enabled: true
+  EnforcedStyle: indented
+# Use spaces after colons.
+Layout/SpaceAfterColon:
+  Enabled: true
+# Use spaces after commas.
+Layout/SpaceAfterComma:
+  Enabled: true
+# Do not put a space between a method name and the opening parenthesis in a
+# method definition.
+Layout/SpaceAfterMethodName:
+  Enabled: true
+# Tracks redundant space after the ! operator.
+Layout/SpaceAfterNot:
+  Enabled: true
+# Use spaces after semicolons.
+Layout/SpaceAfterSemicolon:
+  Enabled: true
+# Use space around equals in parameter default
+Layout/SpaceAroundEqualsInParameterDefault:
+  Enabled: true
+# Use a space around keywords if appropriate.
+Layout/SpaceAroundKeyword:
+  Enabled: true
+# Use a single space around operators.
+Layout/SpaceAroundOperators:
+  Enabled: true
+# No spaces before commas.
+Layout/SpaceBeforeComma:
+  Enabled: true
+# Checks for missing space between code and a comment on the same line.
+Layout/SpaceBeforeComment:
+  Enabled: true
+# No spaces before semicolons.
+Layout/SpaceBeforeSemicolon:
+  Enabled: true
+# Checks for spaces inside square brackets.
+Layout/SpaceInsideBrackets:
+  Enabled: true
+# Use spaces inside hash literal braces - or don't.
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: true
+# No spaces inside range literals.
+Layout/SpaceInsideRangeLiteral:
+  Enabled: true
+# Checks for padding/surrounding spaces inside string interpolation.
+Layout/SpaceInsideStringInterpolation:
+  EnforcedStyle: no_space
+  Enabled: true
+# No hard tabs.
+Layout/Tab:
+  Enabled: true
+# Checks trailing blank lines and final newline.
+Layout/TrailingBlankLines:
+  Enabled: true
+# Style #######################################################################
+# Check the naming of accessor methods for get_/set_.
+Style/AccessorMethodName:
+  Enabled: false
+# Use alias_method instead of alias.
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
+  Enabled: true
 # Whether `and` and `or` are banned only in conditionals (conditionals)
 # or completely (always).
@@ -91,10 +288,6 @@ Style/BlockComments:
 Style/BlockDelimiters:
  Enabled: true
-# Put end statement of multiline block on its own line.
-Style/BlockEndNewline:
-  Enabled: true
 # This cop checks for braces around the last parameter in a method call
 # if the last parameter is a hash.
 Style/BracesAroundHashParameters:
@@ -104,10 +297,6 @@ Style/BracesAroundHashParameters:
 Style/CaseEquality:
  Enabled: false
-# Indentation of when in a case/when/[else/]end.
-Style/CaseIndentation:
-  Enabled: true
 # Checks for uses of character literals.
 Style/CharacterLiteral:
  Enabled: true
@@ -142,10 +331,6 @@ Style/ColonMethodCall:
 Style/CommentAnnotation:
  Enabled: false
-# Indentation of comments.
-Style/CommentIndentation:
-  Enabled: true
 # Check for `if` and `case` statements where each branch is used for
 # assignment to the same variable when using the return of the
 # condition can be used instead.
@@ -170,46 +355,10 @@ Style/Documentation:
 Style/DoubleNegation:
  Enabled: false
-# Align elses and elsifs correctly.
-Style/ElseAlignment:
-  Enabled: true
-# Use empty lines between defs.
-Style/EmptyLineBetweenDefs:
-  Enabled: true
-# Don't use several empty lines in a row.
-Style/EmptyLines:
-  Enabled: true
-# Keep blank lines around access modifiers.
-Style/EmptyLinesAroundAccessModifier:
-  Enabled: true
-# Keeps track of empty lines around block bodies.
-Style/EmptyLinesAroundBlockBody:
-  Enabled: true
-# Keeps track of empty lines around class bodies.
-Style/EmptyLinesAroundClassBody:
-  Enabled: true
-# Keeps track of empty lines around method bodies.
-Style/EmptyLinesAroundMethodBody:
-  Enabled: true
-# Keeps track of empty lines around module bodies.
-Style/EmptyLinesAroundModuleBody:
-  Enabled: true
 # Avoid the use of END blocks.
 Style/EndBlock:
  Enabled: true
-# Use Unix-style line endings.
-Style/EndOfLine:
-  Enabled: true
 # Favor the use of Fixnum#even? && Fixnum#odd?
 Style/EvenOdd:
  Enabled: true
@@ -218,11 +367,6 @@ Style/EvenOdd:
 Style/FileName:
  Enabled: true
-# Checks for a line break before the first parameter in a multi-line method
-# parameter definition.
-Style/FirstMethodParameterLineBreak:
-  Enabled: true
 # Checks for flip flops.
 Style/FlipFlop:
  Enabled: true
@@ -231,6 +375,10 @@ Style/FlipFlop:
 Style/For:
  Enabled: true
+# Use a consistent style for format string tokens.
+Style/FormatStringToken:
+  Enabled: false
 # Checks if there is a magic comment to enforce string literals
 Style/FrozenStringLiteralComment:
  Enabled: false
@@ -256,31 +404,19 @@ Style/IdenticalConditionalBranches:
 Style/IfWithSemicolon:
  Enabled: true
-# Checks the indentation of the first line of the right-hand-side of a
-# multi-line assignment.
-Style/IndentAssignment:
-  Enabled: true
-# Keep indentation straight.
-Style/IndentationConsistency:
-  Enabled: true
-# Use 2 spaces for indentation.
-Style/IndentationWidth:
-  Enabled: true
 # Use Kernel#loop for infinite loops.
 Style/InfiniteLoop:
  Enabled: true
+# Use the inverse method instead of `!.method`
+# if an inverse method is defined.
+Style/InverseMethods:
+  Enabled: false
 # Use lambda.call(...) instead of lambda.(...).
 Style/LambdaCall:
  Enabled: true
-# Comments should start with a space.
-Style/LeadingCommentSpace:
-  Enabled: true
 # Checks if the method definitions have or don't have parentheses.
 Style/MethodDefParentheses:
  Enabled: true
@@ -293,55 +429,23 @@ Style/MethodName:
 Style/ModuleFunction:
  Enabled: false
-# Checks that the closing brace in an array literal is either on the same line
-# as the last array element, or a new line.
-Style/MultilineArrayBraceLayout:
-  Enabled: true
-  EnforcedStyle: symmetrical
 # Avoid multi-line chains of blocks.
 Style/MultilineBlockChain:
  Enabled: true
-# Ensures newlines after multiline block do statements.
-Style/MultilineBlockLayout:
-  Enabled: true
-# Checks that the closing brace in a hash literal is either on the same line as
-# the last hash element, or a new line.
-Style/MultilineHashBraceLayout:
-  Enabled: true
-  EnforcedStyle: symmetrical
 # Do not use then for multi-line if/unless.
 Style/MultilineIfThen:
  Enabled: true
-# Checks that the closing brace in a method call is either on the same line as
-# the last method argument, or a new line.
-Style/MultilineMethodCallBraceLayout:
-  Enabled: false
-  EnforcedStyle: symmetrical
-# Checks indentation of method calls with the dot operator that span more than
-# one line.
-Style/MultilineMethodCallIndentation:
-  Enabled: false
-# Checks that the closing brace in a method definition is symmetrical with
-# respect to the opening brace and the method parameters.
-Style/MultilineMethodDefinitionBraceLayout:
-  Enabled: false
-# Checks indentation of binary operations that span more than one line.
-Style/MultilineOperationIndentation:
-  Enabled: true
-  EnforcedStyle: indented
 # Avoid multi-line `? :` (the ternary operator), use if/unless instead.
 Style/MultilineTernaryOperator:
  Enabled: true
+# Avoid comparing a variable with multiple items in a conditional,
+# use Array#include? instead.
+Style/MultipleComparison:
+  Enabled: false
 # This cop checks whether some constant value isn't a
 # mutable literal (e.g. array or hash).
 Style/MutableConstant:
@@ -390,6 +494,15 @@ Style/OpMethod:
 Style/ParenthesesAroundCondition:
  Enabled: true
+# This cop (by default) checks for uses of methods Hash#has_key? and
+# Hash#has_value? where it enforces Hash#key? and Hash#value?
+# It is configurable to enforce the inverse, using `verbose` method
+# names also.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: short, verbose
+Style/PreferredHashMethods:
+  Enabled: false
 # Checks for an obsolete RuntimeException argument in raise/fail.
 Style/RedundantException:
  Enabled: true
@@ -407,68 +520,6 @@ Style/SignalException:
  EnforcedStyle: only_raise
  Enabled: true
-# Use spaces after colons.
-Style/SpaceAfterColon:
-  Enabled: true
-# Use spaces after commas.
-Style/SpaceAfterComma:
-  Enabled: true
-# Do not put a space between a method name and the opening parenthesis in a
-# method definition.
-Style/SpaceAfterMethodName:
-  Enabled: true
-# Tracks redundant space after the ! operator.
-Style/SpaceAfterNot:
-  Enabled: true
-# Use spaces after semicolons.
-Style/SpaceAfterSemicolon:
-  Enabled: true
-# Use space around equals in parameter default
-Style/SpaceAroundEqualsInParameterDefault:
-  Enabled: true
-# Use a space around keywords if appropriate.
-Style/SpaceAroundKeyword:
-  Enabled: true
-# Use a single space around operators.
-Style/SpaceAroundOperators:
-  Enabled: true
-# No spaces before commas.
-Style/SpaceBeforeComma:
-  Enabled: true
-# Checks for missing space between code and a comment on the same line.
-Style/SpaceBeforeComment:
-  Enabled: true
-# No spaces before semicolons.
-Style/SpaceBeforeSemicolon:
-  Enabled: true
-# Checks for spaces inside square brackets.
-Style/SpaceInsideBrackets:
-  Enabled: true
-# Use spaces inside hash literal braces - or don't.
-Style/SpaceInsideHashLiteralBraces:
-  Enabled: true
-# No spaces inside range literals.
-Style/SpaceInsideRangeLiteral:
-  Enabled: true
-# Checks for padding/surrounding spaces inside string interpolation.
-Style/SpaceInsideStringInterpolation:
-  EnforcedStyle: no_space
-  Enabled: true
 # Check for the usage of parentheses around stabby lambda arguments.
 Style/StabbyLambdaParentheses:
  EnforcedStyle: require_parentheses
@@ -484,13 +535,9 @@ Style/StringMethods:
    intern: to_sym
  Enabled: true
-# No hard tabs.
+# Use %i or %I for arrays of symbols.
-Style/Tab:
+Style/SymbolArray:
-  Enabled: true
+  Enabled: false
-# Checks trailing blank lines and final newline.
-Style/TrailingBlankLines:
-  Enabled: true
 # This cop checks for trailing comma in array and hash literals.
 Style/TrailingCommaInLiteral:
@@ -539,6 +586,10 @@ Style/WhileUntilModifier:
 Style/WordArray:
  Enabled: true
+# Do not use literals as the first operand of a comparison.
+Style/YodaCondition:
+  Enabled: false
 # Use `proc` instead of `Proc.new`.
 Style/Proc:
  Enabled: true
@@ -549,7 +600,7 @@ Style/Proc:
 # branches, and conditions.
 Metrics/AbcSize:
  Enabled: true
-  Max: 57.08
+  Max: 56.96
 # This cop checks if the length of a block exceeds some maximum value.
 Metrics/BlockLength:
@@ -594,6 +645,11 @@ Metrics/PerceivedComplexity:
 # Lint ########################################################################
+# Checks for ambiguous block association with method when param passed without
+# parentheses.
+Lint/AmbiguousBlockAssociation:
+  Enabled: false
 # Checks for ambiguous operators in the first argument of a method invocation
 # without parentheses.
 Lint/AmbiguousOperator:
@@ -795,6 +851,10 @@ Lint/Void:
 # Performance #################################################################
+# Use `caller(n..n)` instead of `caller`.
+Performance/Caller:
+  Enabled: false
 # Use `casecmp` rather than `downcase ==`.
 Performance/Casecmp:
  Enabled: true
@@ -869,6 +929,14 @@ Rails/ActionFilter:
  Enabled: true
  EnforcedStyle: action
+# Check that models subclass ApplicationRecord.
+Rails/ApplicationRecord:
+  Enabled: false
+# Enforce using `blank?` and `present?`.
+Rails/Blank:
+  Enabled: false
 # Checks the correct usage of date aware methods, such as `Date.today`,
 # `Date.current`, etc.
 Rails/Date:
@@ -925,10 +993,18 @@ Rails/OutputSafety:
 Rails/PluralizationGrammar:
  Enabled: true
+# Enforce using `blank?` and `present?`.
+Rails/Present:
+  Enabled: false
 # Checks for `read_attribute(:attr)` and `write_attribute(:attr, val)`.
 Rails/ReadWriteAttribute:
  Enabled: false
+# Do not assign relative date to constants.
+Rails/RelativeDateConstant:
+  Enabled: false
 # Checks the arguments of ActiveRecord scopes.
 Rails/ScopeArgs:
  Enabled: true
@@ -951,6 +1027,10 @@ RSpec/AnyInstance:
 RSpec/BeEql:
  Enabled: true
+# We don't enforce this as we use this technique in a few places.
+RSpec/BeforeAfterAll:
+  Enabled: false
 # Check that the first argument to the top level describe is the tested class or
 # module.
 RSpec/DescribeClass:
@@ -1010,6 +1090,12 @@ RSpec/FilePath:
 RSpec/Focus:
  Enabled: true
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: is_expected, should
+RSpec/ImplicitExpect:
+  Enabled: true
+  EnforcedStyle: is_expected
 # Checks for the usage of instance variables.
 RSpec/InstanceVariable:
  Enabled: false
@@ -1055,6 +1141,13 @@ RSpec/NotToNot:
 RSpec/RepeatedDescription:
  Enabled: false
+# Ensure RSpec hook blocks are always multi-line.
+RSpec/SingleLineHook:
+  Enabled: true
+  Exclude:
+    - 'spec/factories/*'
+    - 'spec/requests/api/v3/*'
 # Checks for stubbed test subjects.
 RSpec/SubjectStub:
  Enabled: false

--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
 # This configuration was generated by
 # `rubocop --auto-gen-config --exclude-limit 0`
-# on 2017-04-07 20:17:35 -0400 using RuboCop version 0.47.1.
+# on 2017-07-10 01:48:30 +0900 using RuboCop version 0.49.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: 54
+# Offense count: 181
-RSpec/BeforeAfterAll:
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
+Layout/ExtraSpacing:
+  Enabled: false
+# Offense count: 119
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: special_inside_parentheses, consistent, align_brackets
+Layout/IndentArray:
+  Enabled: false
+# Offense count: 208
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: special_inside_parentheses, consistent, align_braces
+Layout/IndentHash:
+  Enabled: false
+# Offense count: 174
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: space, no_space
+Layout/SpaceBeforeBlockBraces:
+  Enabled: false
+# Offense count: 8
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment.
+Layout/SpaceBeforeFirstArg:
+  Enabled: false
+# Offense count: 64
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: require_no_space, require_space
+Layout/SpaceInLambdaLiteral:
  Enabled: false
-# Offense count: 233
+# Offense count: 256
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces, SpaceBeforeBlockParameters.
+# SupportedStyles: space, no_space
+# SupportedStylesForEmptyBraces: space, no_space
+Layout/SpaceInsideBlockBraces:
+  Enabled: false
+# Offense count: 135
+# Cop supports --auto-correct.
+Layout/SpaceInsideParens:
+  Enabled: false
+# Offense count: 14
+# Cop supports --auto-correct.
+Layout/SpaceInsidePercentLiteralDelimiters:
+  Enabled: false
+# Offense count: 89
+# Cop supports --auto-correct.
+Layout/TrailingWhitespace:
+  Enabled: false
+# Offense count: 272
 RSpec/EmptyLineAfterFinalLet:
  Enabled: false
-# Offense count: 167
+# Offense count: 181
 RSpec/EmptyLineAfterSubject:
  Enabled: false
-# Offense count: 72
+# Offense count: 78
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: implicit, each, example
 RSpec/HookArgument:
  Enabled: false
-# Offense count: 12
+# Offense count: 9
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: is_expected, should
-RSpec/ImplicitExpect:
-  Enabled: false
-# Offense count: 11
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: it_behaves_like, it_should_behave_like
 RSpec/ItBehavesLike:
@@ -40,19 +93,19 @@ RSpec/ItBehavesLike:
 RSpec/IteratedExpectation:
  Enabled: false
-# Offense count: 3
+# Offense count: 2
 RSpec/OverwritingSetup:
  Enabled: false
-# Offense count: 34
+# Offense count: 36
 RSpec/RepeatedExample:
  Enabled: false
-# Offense count: 43
+# Offense count: 86
 RSpec/ScatteredLet:
  Enabled: false
-# Offense count: 32
+# Offense count: 20
 RSpec/ScatteredSetup:
  Enabled: false
@@ -60,7 +113,7 @@ RSpec/ScatteredSetup:
 RSpec/SharedContext:
  Enabled: false
-# Offense count: 150
+# Offense count: 115
 Rails/FilePath:
  Enabled: false
@@ -70,97 +123,71 @@ Rails/FilePath:
 Rails/ReversibleMigration:
  Enabled: false
-# Offense count: 302
+# Offense count: 336
 # Configuration parameters: Blacklist.
 # Blacklist: decrement!, decrement_counter, increment!, increment_counter, toggle!, touch, update_all, update_attribute, update_column, update_columns, update_counters
 Rails/SkipsModelValidations:
  Enabled: false
-# Offense count: 7
+# Offense count: 11
 # Cop supports --auto-correct.
 Security/YAMLLoad:
  Enabled: false
-# Offense count: 59
+# Offense count: 58
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: percent_q, bare_percent
 Style/BarePercentLiterals:
  Enabled: false
-# Offense count: 1403
+# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: leading, trailing
-Style/DotPosition:
-  Enabled: false
-# Offense count: 5
 # Cop supports --auto-correct.
 Style/EachWithObject:
  Enabled: false
-# Offense count: 28
+# Offense count: 31
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: empty, nil, both
 Style/EmptyElse:
  Enabled: false
-# Offense count: 4
+# Offense count: 9
 # Cop supports --auto-correct.
 Style/EmptyLiteral:
  Enabled: false
-# Offense count: 59
+# Offense count: 78
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: compact, expanded
 Style/EmptyMethod:
  Enabled: false
-# Offense count: 214
+# Offense count: 23
 # Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
-Style/ExtraSpacing:
-  Enabled: false
-# Offense count: 9
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: format, sprintf, percent
 Style/FormatString:
  Enabled: false
-# Offense count: 285
+# Offense count: 301
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
  Enabled: false
-# Offense count: 16
+# Offense count: 18
 Style/IfInsideElse:
  Enabled: false
-# Offense count: 186
+# Offense count: 182
 # Cop supports --auto-correct.
 # Configuration parameters: MaxLineLength.
 Style/IfUnlessModifier:
  Enabled: false
-# Offense count: 99
+# Offense count: 52
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_brackets
-Style/IndentArray:
-  Enabled: false
-# 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: 50
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: line_count_dependent, lambda, literal
@@ -172,63 +199,63 @@ Style/Lambda:
 Style/LineEndConcatenation:
  Enabled: false
-# Offense count: 34
+# Offense count: 40
 # Cop supports --auto-correct.
 Style/MethodCallWithoutArgsParentheses:
  Enabled: false
-# Offense count: 10
+# Offense count: 13
 Style/MethodMissing:
  Enabled: false
-# Offense count: 3
+# Offense count: 6
 # Cop supports --auto-correct.
 Style/MultilineIfModifier:
  Enabled: false
-# Offense count: 24
+# Offense count: 26
 # Cop supports --auto-correct.
 Style/NestedParenthesizedCalls:
  Enabled: false
-# Offense count: 18
+# Offense count: 20
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
 # SupportedStyles: skip_modifier_ifs, always
 Style/Next:
  Enabled: false
-# Offense count: 37
+# Offense count: 45
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedOctalStyle, SupportedOctalStyles.
 # SupportedOctalStyles: zero_with_o, zero_only
 Style/NumericLiteralPrefix:
  Enabled: false
-# Offense count: 88
+# Offense count: 98
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
  Enabled: false
-# Offense count: 36
+# Offense count: 42
 # Cop supports --auto-correct.
 Style/ParallelAssignment:
  Enabled: false
-# Offense count: 570
+# Offense count: 800
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
  Enabled: false
-# Offense count: 14
+# Offense count: 15
 # Cop supports --auto-correct.
 Style/PerlBackrefs:
  Enabled: false
-# Offense count: 83
+# Offense count: 105
 # Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
 # NamePrefix: is_, has_, have_
 # NamePrefixBlacklist: is_, has_, have_
@@ -236,54 +263,47 @@ Style/PerlBackrefs:
 Style/PredicateName:
  Enabled: false
-# Offense count: 45
+# Offense count: 58
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: short, verbose
-Style/PreferredHashMethods:
-  Enabled: false
-# Offense count: 65
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: compact, exploded
 Style/RaiseArgs:
  Enabled: false
-# Offense count: 5
+# Offense count: 6
 # Cop supports --auto-correct.
 Style/RedundantBegin:
  Enabled: false
-# Offense count: 32
+# Offense count: 37
 # Cop supports --auto-correct.
 Style/RedundantFreeze:
  Enabled: false
-# Offense count: 15
+# Offense count: 14
 # Cop supports --auto-correct.
 # Configuration parameters: AllowMultipleReturnValues.
 Style/RedundantReturn:
  Enabled: false
-# Offense count: 382
+# Offense count: 406
 # Cop supports --auto-correct.
 Style/RedundantSelf:
  Enabled: false
-# Offense count: 111
+# Offense count: 115
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
 # SupportedStyles: slashes, percent_r, mixed
 Style/RegexpLiteral:
  Enabled: false
-# Offense count: 24
+# Offense count: 29
 # Cop supports --auto-correct.
 Style/RescueModifier:
  Enabled: false
-# Offense count: 7
+# Offense count: 8
 # Cop supports --auto-correct.
 Style/SelfAssignment:
  Enabled: false
@@ -294,101 +314,58 @@ Style/SelfAssignment:
 Style/SingleLineMethods:
  Enabled: false
-# Offense count: 168
+# Offense count: 64
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: space, no_space
-Style/SpaceBeforeBlockBraces:
-  Enabled: false
-# Offense count: 8
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment.
-Style/SpaceBeforeFirstArg:
-  Enabled: false
-# Offense count: 46
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: require_no_space, require_space
-Style/SpaceInLambdaLiteral:
-  Enabled: false
-# Offense count: 229
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces, SpaceBeforeBlockParameters.
-# SupportedStyles: space, no_space
-# SupportedStylesForEmptyBraces: space, no_space
-Style/SpaceInsideBlockBraces:
-  Enabled: false
-# Offense count: 116
-# Cop supports --auto-correct.
-Style/SpaceInsideParens:
-  Enabled: false
-# Offense count: 12
-# Cop supports --auto-correct.
-Style/SpaceInsidePercentLiteralDelimiters:
-  Enabled: false
-# 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: 42
+# Offense count: 44
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiteralsInInterpolation:
  Enabled: false
-# Offense count: 64
+# Offense count: 84
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoredMethods.
 # IgnoredMethods: respond_to, define_method
 Style/SymbolProc:
  Enabled: false
-# Offense count: 6
+# Offense count: 8
 # 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: 18
+# Offense count: 17
 # Cop supports --auto-correct.
 # Configuration parameters: AllowNamedUnderscoreVariables.
 Style/TrailingUnderscoreVariable:
  Enabled: false
-# Offense count: 78
+# Offense count: 4
-# Cop supports --auto-correct.
-Style/TrailingWhitespace:
-  Enabled: false
-# Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: ExactNameMatch, AllowPredicates, AllowDSLWriters, IgnoreClassMethods, Whitelist.
 # Whitelist: to_ary, to_a, to_c, to_enum, to_h, to_hash, to_i, to_int, to_io, to_open, to_path, to_proc, to_r, to_regexp, to_str, to_s, to_sym
 Style/TrivialAccessors:
  Enabled: false
-# Offense count: 6
+# Offense count: 5
 # Cop supports --auto-correct.
 Style/UnlessElse:
  Enabled: false
-# Offense count: 24
+# Offense count: 28
 # Cop supports --auto-correct.
 Style/UnneededInterpolation:
  Enabled: false
-# Offense count: 8
+# Offense count: 11
 # Cop supports --auto-correct.
 Style/ZeroLengthPredicate:
  Enabled: false
--- a/.scss-lint.yml
+++ b/.scss-lint.yml
@@ -10,12 +10,12 @@ linters:
  # Reports when you use improper spacing around ! (the "bang") in !default,
  # !global, !important, and !optional flags.
  BangFormat:
-    enabled: false
+    enabled: true
  # Whether or not to prefer `border: 0` over `border: none`.
  BorderZero:
    enabled: false
  # Reports when you define a rule set using a selector with chained classes
  # (a.k.a. adjoining classes).
  ChainedClasses:
@@ -25,13 +25,13 @@ linters:
  # (e.g. `color: green` is a color keyword)
  ColorKeyword:
    enabled: false
  # Prefer color literals (keywords or hexadecimal codes) to be used only in
  # variable declarations. They should be referred to via variables everywhere
  # else.
  ColorVariable:
    enabled: true
  # Which form of comments to prefer in CSS.
  Comment:
    enabled: false
@@ -39,14 +39,15 @@ linters:
  # Reports @debug statements (which you probably left behind accidentally).
  DebugStatement:
    enabled: false
  # Rule sets should be ordered as follows:
  # - @extend declarations
  # - @include declarations without inner @content
-  # - properties, @include declarations with inner @content
+  # - properties
+  # - @include declarations with inner @content
  # - nested rule sets.
  DeclarationOrder:
-    enabled: false
+    enabled: true
  # `scss-lint:disable` control comments should be preceded by a comment
  # explaining why these linters are being disabled for this file.
@@ -54,19 +55,19 @@ linters:
  # more information.
  DisableLinterReason:
    enabled: true
  # Reports when you define the same property twice in a single rule set.
  DuplicateProperty:
-    enabled: false
+    enabled: true
  # Separate rule, function, and mixin declarations with empty lines.
  EmptyLineBetweenBlocks:
    enabled: true
  # Reports when you have an empty rule set.
  EmptyRule:
    enabled: true
  # Reports when you have an @extend directive.
  ExtendDirective:
    enabled: false
@@ -75,49 +76,49 @@ linters:
  # when adding lines to the file, since SCM systems such as git won't
  # think that you touched the last line.
  FinalNewline:
-    enabled: false
+    enabled: true
  # HEX colors should use three-character values where possible.
  HexLength:
    enabled: false
  # HEX color values should use lower-case colors to differentiate between
  # letters and numbers, e.g. `#E3E3E3` vs. `#e3e3e3`.
  HexNotation:
    enabled: true
  # Avoid using ID selectors.
  IdSelector:
    enabled: false
  # The basenames of @imported SCSS partials should not begin with an
  # underscore and should not include the filename extension.
  ImportPath:
-    enabled: false
+    enabled: true
  # Avoid using !important in properties. It is usually indicative of a
  # misunderstanding of CSS specificity and can lead to brittle code.
  ImportantRule:
    enabled: false
  # Indentation should always be done in increments of 2 spaces.
  Indentation:
    enabled: true
    width: 2
  # Don't write leading zeros for numeric values with a decimal point.
  LeadingZero:
    enabled: false
  # Reports when you define the same selector twice in a single sheet.
  MergeableSelector:
    enabled: false
  # Functions, mixins, variables, and placeholders should be declared
  # with all lowercase letters and hyphens instead of underscores.
  NameFormat:
    enabled: false
  # Avoid nesting selectors too deeply.
  NestingDepth:
    enabled: false
@@ -129,12 +130,12 @@ linters:
  # Sort properties in a strict order.
  PropertySortOrder:
    enabled: false
  # Reports when you use an unknown or disabled CSS property
  # (ignoring vendor-prefixed properties).
  PropertySpelling:
-    enabled: false
+    enabled: true
  # Configure which units are allowed for property values.
  PropertyUnits:
    enabled: false
@@ -144,25 +145,25 @@ linters:
  # be declared with one colon.
  PseudoElement:
    enabled: true
  # Avoid qualifying elements in selectors (also known as "tag-qualifying").
  QualifyingElement:
    enabled: false
  # Don't write selectors with a depth of applicability greater than 3.
  SelectorDepth:
    enabled: false
  # Selectors should always use hyphenated-lowercase, rather than camelCase or
  # snake_case.
  SelectorFormat:
    enabled: false
    convention: hyphenated_lowercase
  # Prefer the shortest shorthand form possible for properties that support it.
  Shorthand:
    enabled: true
  # Each property should have its own line, except in the special case of
  # single line rulesets.
  SingleLinePerProperty:
@@ -173,11 +174,15 @@ linters:
  # individual selector occupy a single line.
  SingleLinePerSelector:
    enabled: true
  # Commas in lists should be followed by a space.
  SpaceAfterComma:
+    enabled: true
+  # Comment literals should be followed by a space.
+  SpaceAfterComment:
    enabled: false
  # Properties should be formatted with a single space separating the colon
  # from the property's value.
  SpaceAfterPropertyColon:
@@ -197,12 +202,12 @@ linters:
  # colon.
  SpaceAfterVariableName:
    enabled: false
  # Operators should be formatted with a single space on both sides of an
  # infix operator.
  SpaceAroundOperator:
    enabled: true
  # Opening braces should be preceded by a single space.
  SpaceBeforeBrace:
    enabled: true
@@ -210,7 +215,7 @@ linters:
  # Parentheses should not be padded with spaces.
  SpaceBetweenParens:
    enabled: false
  # Enforces that string literals should be written with a consistent form
  # of quotes (single or double).
  StringQuotes:
@@ -240,8 +245,8 @@ linters:
  # Do not use parent selector references (&) when they would otherwise
  # be unnecessary.
  UnnecessaryParentReference:
-    enabled: false
+    enabled: true
  # URLs should be valid and not contain protocols or domain names.
  UrlFormat:
    enabled: true

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -31,7 +31,7 @@ _This notice should stay as the first item in the CONTRIBUTING.MD file._
  - [Issue tracker guidelines](#issue-tracker-guidelines)
  - [Issue weight](#issue-weight)
  - [Regression issues](#regression-issues)
-  - [Technical debt](#technical-debt)
+  - [Technical and UX debt](#technical-and-ux-debt)
  - [Stewardship](#stewardship)
 - [Merge requests](#merge-requests)
  - [Merge request guidelines](#merge-request-guidelines)
@@ -49,6 +49,8 @@ _This notice should stay as the first item in the CONTRIBUTING.MD file._
 Thank you for your interest in contributing to GitLab. This guide details how
 to contribute to GitLab in a way that is efficient for everyone.
+Looking for something to work on? Look for the label [Accepting Merge Requests](#i-want-to-contribute).
 GitLab comes into two flavors, GitLab Community Edition (CE) our free and open
 source edition, and GitLab Enterprise Edition (EE) which is our commercial
 edition. Throughout this guide you will see references to CE and EE for
@@ -112,8 +114,8 @@ scheduling into milestones. Labelling is a task for everyone.
 Most issues will have labels for at least one of the following:
 - Type: ~"feature proposal", ~bug, ~customer, etc.
- Subject: ~wiki, ~"container registry", ~ldap, ~api, etc.
+- Subject: ~wiki, ~"container registry", ~ldap, ~api, ~frontend, etc.
- Team: ~CI, ~Discussion, ~Edge, ~Frontend, ~Platform, etc.
+- Team: ~CI, ~Discussion, ~Edge, ~Platform, etc.
 - Priority: ~Deliverable, ~Stretch
 All labels, their meaning and priority are defined on the
@@ -276,7 +278,7 @@ For feature proposals for EE, open an issue on the
 In order to help track the feature proposals, we have created a
 [`feature proposal`][fpl] label. For the time being, users that are not members
 of the project cannot add labels. You can instead ask one of the [core team]
-members to add the label `feature proposal` to the issue or add the following
+members to add the label ~"feature proposal" to the issue or add the following
 code snippet right after your description in a new line: `~"feature proposal"`.
 Please keep feature proposals as small and simple as possible, complex ones
@@ -342,27 +344,29 @@ addressed.
 [8.3 Regressions]: https://gitlab.com/gitlab-org/gitlab-ce/issues/4127
 [update the notes]: https://gitlab.com/gitlab-org/release-tools/blob/master/doc/pro-tips.md#update-the-regression-issue
-### Technical debt
+### Technical and UX debt
-In order to track things that can be improved in GitLab's codebase, we created
+In order to track things that can be improved in GitLab's codebase,
-the ~"technical debt" label in [GitLab's issue tracker][ce-tracker].
+we use the ~"technical debt" label in [GitLab's issue tracker][ce-tracker].
+For user experience improvements, we use the ~"UX debt" label.
-This label should be added to issues that describe things that can be improved,
+These labels should be added to issues that describe things that can be improved,
-shortcuts that have been taken, code that needs refactoring, features that need
+shortcuts that have been taken, features that need additional attention, and all
-additional attention, and all other things that have been left behind due to
+other things that have been left behind due to high velocity of development.
-high velocity of development.
+For example, code that needs refactoring should use the ~"technical debt" label,
+user experience refinements should use the ~"UX debt" label.
 Everyone can create an issue, though you may need to ask for adding a specific
 label, if you do not have permissions to do it by yourself. Additional labels
-can be combined with the `technical debt` label, to make it easier to schedule
+can be combined with these labels, to make it easier to schedule
 the improvements for a release.
-Issues tagged with the `technical debt` label have the same priority like issues
+Issues tagged with these labels have the same priority like issues
 that describe a new feature to be introduced in GitLab, and should be scheduled
 for a release by the appropriate person.
-Make sure to mention the merge request that the `technical debt` issue is
+Make sure to mention the merge request that the ~"technical debt" issue or
-associated with in the description of the issue.
+~"UX debt" issue is associated with in the description of the issue.
 ### Stewardship

--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
-0.10.0
+0.26.0
--- a/GITLAB_PAGES_VERSION
+++ b/GITLAB_PAGES_VERSION
-0.4.2
+0.5.0
--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
-5.0.3
+5.4.0
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
-2.0.0
+3.0.0
--- a/Gemfile
+++ b/Gemfile
@@ -12,12 +12,13 @@ gem 'sprockets', '~> 3.7.0'
 gem 'default_value_for', '~> 3.0.0'
 # Supported DBs
-gem 'mysql2', '~> 0.3.16', group: :mysql
+gem 'mysql2', '~> 0.4.5', group: :mysql
 gem 'pg', '~> 0.18.2', group: :postgres
-gem 'rugged', '~> 0.25.1.1'
+gem 'rugged', '~> 0.26.0'
+gem 'grape-route-helpers', '~> 2.0.0'
-gem 'faraday', '~> 0.11.0'
+gem 'faraday', '~> 0.12'
 # Authentication libraries
 gem 'devise', '~> 4.2'
@@ -37,7 +38,7 @@ 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 'omniauth-authentiq', '~> 0.3.1'
 gem 'rack-oauth2', '~> 1.2.1'
 gem 'jwt', '~> 1.5.6'
@@ -57,10 +58,14 @@ gem 'validates_hostname', '~> 1.0.6'
 # Browser detection
 gem 'browser', '~> 2.2'
+# GPG
+gem 'gpgme'
 # LDAP Auth
 # GitLab fork with several improvements to original library. For full list of changes
 # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
-gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: 'omniauth-ldap'
+gem 'gitlab_omniauth-ldap', '~> 2.0.3', require: 'omniauth-ldap'
+gem 'net-ldap'
 # Git Wiki
 # Required manually in config/initializers/gollum.rb to control load order
@@ -71,7 +76,7 @@ gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
 gem 'github-linguist', '~> 4.7.0', require: 'linguist'
 # API
-gem 'grape', '~> 0.19.0'
+gem 'grape', '~> 0.19.2'
 gem 'grape-entity', '~> 0.6.0'
 gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
@@ -85,18 +90,19 @@ gem 'kaminari', '~> 0.17.0'
 gem 'hamlit', '~> 2.6.1'
 # Files attachments
-gem 'carrierwave', '~> 1.0'
+gem 'carrierwave', '~> 1.1'
 # Drag and Drop UI
 gem 'dropzonejs-rails', '~> 0.7.1'
 # for backups
-gem 'fog-aws', '~> 0.9'
+gem 'fog-aws', '~> 1.4'
 gem 'fog-core', '~> 1.44'
 gem 'fog-google', '~> 0.5'
 gem 'fog-local', '~> 0.3'
 gem 'fog-openstack', '~> 0.1'
 gem 'fog-rackspace', '~> 0.1.1'
+gem 'fog-aliyun', '~> 0.1.0'
 # for Google storage
 gem 'google-api-client', '~> 0.8.6'
@@ -109,7 +115,7 @@ 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 'deckar01-task_list', '2.0.0'
 gem 'gitlab-markup', '~> 1.5.1'
 gem 'redcarpet', '~> 3.4'
 gem 'RedCloth', '~> 4.3.2'
@@ -121,6 +127,7 @@ gem 'asciidoctor', '~> 1.5.2'
 gem 'asciidoctor-plantuml', '0.0.7'
 gem 'rouge', '~> 2.0'
 gem 'truncato', '~> 0.7.8'
+gem 'bootstrap_form', '~> 2.7.0'
 # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
 # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
@@ -156,11 +163,14 @@ gem 'rufus-scheduler', '~> 3.4'
 gem 'httparty', '~> 0.13.3'
 # Colored output to console
-gem 'rainbow', '~> 2.1.0'
+gem 'rainbow', '~> 2.2'
 # GitLab settings
 gem 'settingslogic', '~> 2.0.9'
+# Linear-time regex library for untrusted regular expressions
+gem 're2', '~> 1.1.1'
 # Misc
 gem 'version_sorter', '~> 2.1.0'
@@ -235,7 +245,6 @@ 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'
@@ -248,25 +257,40 @@ 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.4.0'
+gem 'sentry-raven', '~> 2.5.3'
-gem 'premailer-rails', '~> 1.9.0'
+gem 'premailer-rails', '~> 1.9.7'
 # I18n
-gem 'ruby_parser', '~> 3.8.4', require: false
+gem 'ruby_parser', '~> 3.8', require: false
+gem 'rails-i18n', '~> 4.0.9'
 gem 'gettext_i18n_rails', '~> 1.8.0'
 gem 'gettext_i18n_rails_js', '~> 1.2.0'
 gem 'gettext', '~> 3.2.2', require: false, group: :development
+# Perf bar
+gem 'peek', '~> 1.0.1'
+gem 'peek-gc', '~> 0.0.2'
+gem 'peek-host', '~> 1.0.0'
+gem 'peek-mysql2', '~> 1.1.0', group: :mysql
+gem 'peek-performance_bar', '~> 1.3.0'
+gem 'peek-pg', '~> 1.3.0', group: :postgres
+gem 'peek-rblineprof', '~> 0.2.0'
+gem 'peek-redis', '~> 1.2.0'
+gem 'peek-sidekiq', '~> 1.0.3'
 # Metrics
 group :metrics do
  gem 'allocations', '~> 1.0', require: false, platform: :mri
  gem 'method_source', '~> 0.8', require: false
  gem 'influxdb', '~> 0.2', require: false
+  # Prometheus
+  gem 'prometheus-client-mmap', '~>0.7.0.beta11'
+  gem 'raindrops', '~> 0.18'
 end
 group :development do
@@ -315,9 +339,9 @@ group :development, :test do
  gem 'spring-commands-rspec', '~> 1.0.4'
  gem 'spring-commands-spinach', '~> 1.1.0'
-  gem 'rubocop', '~> 0.47.1', require: false
+  gem 'rubocop', '~> 0.49.1', require: false
-  gem 'rubocop-rspec', '~> 1.15.0', require: false
+  gem 'rubocop-rspec', '~> 1.15.1', require: false
-  gem 'scss_lint', '~> 0.47.0', require: false
+  gem 'scss_lint', '~> 0.54.0', require: false
  gem 'haml_lint', '~> 0.21.0', require: false
  gem 'simplecov', '~> 0.14.0', require: false
  gem 'flay', '~> 2.8.0', require: false
@@ -334,10 +358,10 @@ group :development, :test do
 end
 group :test do
-  gem 'shoulda-matchers', '~> 2.8.0', require: false
+  gem 'shoulda-matchers', '~> 3.1.2', require: false
  gem 'email_spec', '~> 1.6.0'
  gem 'json-schema', '~> 2.6.2'
-  gem 'webmock', '~> 1.24.0'
+  gem 'webmock', '~> 2.3.2'
  gem 'test_after_commit', '~> 1.1'
  gem 'sham_rack', '~> 1.3.6'
  gem 'timecop', '~> 0.8.0'
@@ -354,10 +378,10 @@ gem 'html2text'
 gem 'ruby-prof', '~> 0.16.2'
 # OAuth
-gem 'oauth2', '~> 1.3.0'
+gem 'oauth2', '~> 1.4'
 # Soft deletion
-gem 'paranoia', '~> 2.2'
+gem 'paranoia', '~> 2.3.1'
 # Health check
 gem 'health_check', '~> 2.6.0'
@@ -367,6 +391,13 @@ gem 'vmstat', '~> 2.3.0'
 gem 'sys-filesystem', '~> 1.1.6'
 # Gitaly GRPC client
-gem 'gitaly', '~> 0.7.0'
+gem 'gitaly', '~> 0.21.0'
 gem 'toml-rb', '~> 0.3.15', require: false
+# Feature toggles
+gem 'flipper', '~> 0.10.2'
+gem 'flipper-active_record', '~> 0.10.2'
+# Structured logging
+gem 'lograge', '~> 0.5'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -56,6 +56,7 @@ GEM
    asciidoctor-plantuml (0.0.7)
      asciidoctor (~> 1.5)
    ast (2.3.0)
+    atomic (1.1.99)
    attr_encrypted (3.0.3)
      encryptor (~> 3.0.0)
    attr_required (1.0.0)
@@ -85,6 +86,7 @@ GEM
    bootstrap-sass (3.3.6)
      autoprefixer-rails (>= 5.2.1)
      sass (>= 3.3.4)
+    bootstrap_form (2.7.0)
    brakeman (3.6.1)
    browser (2.2.0)
    builder (3.2.3)
@@ -105,7 +107,7 @@ GEM
    capybara-screenshot (1.0.14)
      capybara (>= 1.0, < 3)
      launchy
-    carrierwave (1.0.0)
+    carrierwave (1.1.0)
      activemodel (>= 4.0.0)
      activesupport (>= 4.0.0)
      mime-types (>= 1.16)
@@ -120,20 +122,15 @@ GEM
    coderay (1.1.1)
    coercible (1.0.0)
      descendants_tracker (~> 0.0.1)
-    coffee-rails (4.1.1)
-      coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.1.x)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.10.0)
    colorize (0.7.7)
    concurrent-ruby (1.0.5)
+    concurrent-ruby-ext (1.0.5)
+      concurrent-ruby (= 1.0.5)
    connection_pool (2.2.1)
    crack (0.4.3)
      safe_yaml (~> 1.0.0)
    creole (0.5.0)
-    css_parser (1.4.1)
+    css_parser (1.5.0)
      addressable
    d3_rails (3.5.11)
      railties (>= 3.1.0)
@@ -141,10 +138,8 @@ GEM
    database_cleaner (1.5.3)
    debug_inspector (0.0.2)
    debugger-ruby_core_source (1.3.8)
-    deckar01-task_list (1.0.6)
+    deckar01-task_list (2.0.0)
-      activesupport (~> 4.0)
      html-pipeline
-      rack (~> 1.0)
    default_value_for (3.0.2)
      activerecord (>= 3.2.0, < 5.1)
    descendants_tracker (0.0.4)
@@ -184,7 +179,7 @@ GEM
    et-orbi (1.0.3)
      tzinfo
    eventmachine (1.0.8)
-    excon (0.55.0)
+    excon (0.57.1)
    execjs (2.6.0)
    expression_parser (0.9.0)
    extlib (0.9.16)
@@ -193,7 +188,7 @@ GEM
    factory_girl_rails (4.7.0)
      factory_girl (~> 4.7.0)
      railties (>= 3.0.0)
-    faraday (0.11.0)
+    faraday (0.12.1)
      multipart-post (>= 1.2, < 3)
    faraday_middleware (0.11.0.1)
      faraday (>= 0.7.4, < 1.0)
@@ -208,29 +203,38 @@ GEM
      path_expander (~> 1.0)
      ruby_parser (~> 3.0)
      sexp_processor (~> 4.0)
+    flipper (0.10.2)
+    flipper-active_record (0.10.2)
+      activerecord (>= 3.2, < 6)
+      flipper (~> 0.10.2)
    flowdock (0.7.1)
      httparty (~> 0.7)
      multi_json
-    fog-aws (0.13.0)
+    fog-aliyun (0.1.0)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      ipaddress (~> 0.8)
+      xml-simple (~> 1.1)
+    fog-aws (1.4.0)
      fog-core (~> 1.38)
      fog-json (~> 1.0)
      fog-xml (~> 0.1)
      ipaddress (~> 0.8)
-    fog-core (1.44.1)
+    fog-core (1.44.3)
      builder
      excon (~> 0.49)
      formatador (~> 0.2)
-    fog-google (0.5.0)
+    fog-google (0.5.3)
      fog-core
      fog-json
      fog-xml
    fog-json (1.0.2)
      fog-core (~> 1.0)
      multi_json (~> 1.10)
-    fog-local (0.3.0)
+    fog-local (0.3.1)
      fog-core (~> 1.27)
-    fog-openstack (0.1.6)
+    fog-openstack (0.1.21)
-      fog-core (>= 1.39)
+      fog-core (>= 1.40)
      fog-json (>= 1.0)
      ipaddress (>= 0.8)
    fog-rackspace (0.1.1)
@@ -265,7 +269,7 @@ GEM
      po_to_json (>= 1.0.0)
      rails (>= 3.2.0)
    gherkin-ruby (0.3.2)
-    gitaly (0.7.0)
+    gitaly (0.21.0)
      google-protobuf (~> 3.1)
      grpc (~> 1.0)
    github-linguist (4.7.6)
@@ -284,11 +288,11 @@ GEM
      mime-types (>= 1.16, < 3)
      posix-spawn (~> 0.3)
    gitlab-markup (1.5.1)
-    gitlab_omniauth-ldap (1.2.1)
+    gitlab_omniauth-ldap (2.0.3)
-      net-ldap (~> 0.9)
+      net-ldap (~> 0.16)
-      omniauth (~> 1.0)
+      omniauth (~> 1.3)
-      pyu-ruby-sasl (~> 0.0.3.1)
+      pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
-      rubyntlm (~> 0.3)
+      rubyntlm (~> 0.5)
    globalid (0.3.7)
      activesupport (>= 4.1.0)
    gollum-grit_adapter (1.0.1)
@@ -319,7 +323,7 @@ GEM
      multi_json (~> 1.10)
      retriable (~> 1.4)
      signet (~> 0.6)
-    google-protobuf (3.2.0.2)
+    google-protobuf (3.3.0)
    googleauth (0.5.1)
      faraday (~> 0.9)
      jwt (~> 1.4)
@@ -328,20 +332,26 @@ GEM
      multi_json (~> 1.11)
      os (~> 0.9)
      signet (~> 0.7)
-    grape (0.19.1)
+    gpgme (2.0.13)
+      mini_portile2 (~> 2.1)
+    grape (0.19.2)
      activesupport
      builder
      hashie (>= 2.1.0)
      multi_json (>= 1.3.2)
      multi_xml (>= 0.5.2)
-      mustermann-grape (~> 0.4.0)
+      mustermann-grape (~> 1.0.0)
      rack (>= 1.3.0)
      rack-accept
      virtus (>= 1.0.0)
    grape-entity (0.6.0)
      activesupport
      multi_json (>= 1.3.2)
-    grpc (1.2.5)
+    grape-route-helpers (2.0.0)
+      activesupport
+      grape (~> 0.16, >= 0.16.0)
+      rake
+    grpc (1.4.0)
      google-protobuf (~> 3.1)
      googleauth (~> 0.5.1)
    haml (4.0.7)
@@ -355,7 +365,7 @@ GEM
      temple (~> 0.7.6)
      thor
      tilt
-    hashdiff (0.3.2)
+    hashdiff (0.3.4)
    hashie (3.5.5)
    hashie-forbidden_attributes (0.1.1)
      hashie (>= 3.0)
@@ -439,6 +449,10 @@ GEM
    logging (2.2.2)
      little-plugger (~> 1.1)
      multi_json (~> 1.10)
+    lograge (0.5.1)
+      actionpack (>= 4, < 5.2)
+      activesupport (>= 4, < 5.2)
+      railties (>= 4, < 5.2)
    loofah (2.0.3)
      nokogiri (>= 1.5.9)
    mail (2.6.5)
@@ -450,24 +464,23 @@ GEM
    mimemagic (0.3.0)
    mini_portile2 (2.1.0)
    minitest (5.7.0)
+    mmap2 (2.2.7)
    mousetrap-rails (1.4.6)
    multi_json (1.12.1)
    multi_xml (0.6.0)
    multipart-post (2.0.0)
-    mustermann (0.4.0)
+    mustermann (1.0.0)
-      tool (~> 0.2)
+    mustermann-grape (1.0.0)
-    mustermann-grape (0.4.0)
+      mustermann (~> 1.0.0)
-      mustermann (= 0.4.0)
+    mysql2 (0.4.5)
-    mysql2 (0.3.20)
+    net-ldap (0.16.0)
-    net-ldap (0.12.1)
-    net-ssh (3.0.1)
    netrc (0.11.0)
    nokogiri (1.6.8.1)
      mini_portile2 (~> 2.1.0)
    numerizer (0.1.1)
    oauth (0.5.1)
-    oauth2 (1.3.1)
+    oauth2 (1.4.0)
-      faraday (>= 0.8, < 0.12)
+      faraday (>= 0.8, < 0.13)
      jwt (~> 1.0)
      multi_json (~> 1.3)
      multi_xml (~> 0.5)
@@ -480,7 +493,7 @@ GEM
      rack (>= 1.0, < 3)
    omniauth-auth0 (1.4.1)
      omniauth-oauth2 (~> 1.1)
-    omniauth-authentiq (0.3.0)
+    omniauth-authentiq (0.3.1)
      omniauth-oauth2 (~> 1.3, >= 1.3.1)
    omniauth-azure-oauth2 (0.0.6)
      jwt (~> 1.0)
@@ -499,11 +512,10 @@ GEM
      omniauth (~> 1.0)
      omniauth-oauth2 (~> 1.0)
    omniauth-google-oauth2 (0.4.1)
-      addressable (~> 2.3)
+      jwt (~> 1.5.2)
-      jwt (~> 1.0)
      multi_json (~> 1.3)
      omniauth (>= 1.1.1)
-      omniauth-oauth2 (~> 1.3.1)
+      omniauth-oauth2 (>= 1.3.1)
    omniauth-kerberos (0.3.0)
      omniauth-multipassword
      timfel-krb5-auth (~> 0.8)
@@ -533,11 +545,42 @@ GEM
      rubypants (~> 0.2)
    orm_adapter (0.5.0)
    os (0.9.6)
-    paranoia (2.2.0)
+    parallel (1.11.2)
-      activerecord (>= 4.0, < 5.1)
+    paranoia (2.3.1)
+      activerecord (>= 4.0, < 5.2)
    parser (2.4.0.0)
      ast (~> 2.2)
    path_expander (1.0.1)
+    peek (1.0.1)
+      concurrent-ruby (>= 0.9.0)
+      concurrent-ruby-ext (>= 0.9.0)
+      railties (>= 4.0.0)
+    peek-gc (0.0.2)
+      peek
+    peek-host (1.0.0)
+      peek
+    peek-mysql2 (1.1.0)
+      atomic (>= 1.0.0)
+      mysql2
+      peek
+    peek-performance_bar (1.3.0)
+      peek (>= 0.1.0)
+    peek-pg (1.3.0)
+      concurrent-ruby
+      concurrent-ruby-ext
+      peek
+      pg
+    peek-rblineprof (0.2.0)
+      peek
+      rblineprof
+    peek-redis (1.2.0)
+      atomic (>= 1.0.0)
+      peek
+      redis
+    peek-sidekiq (1.0.3)
+      atomic (>= 1.0.0)
+      peek
+      sidekiq
    pg (0.18.4)
    po_to_json (1.0.1)
      json (>= 1.6.0)
@@ -548,12 +591,15 @@ GEM
      websocket-driver (>= 0.2.0)
    posix-spawn (0.3.11)
    powerpack (0.1.1)
-    premailer (1.8.6)
+    premailer (1.10.4)
-      css_parser (>= 1.3.6)
+      addressable
+      css_parser (>= 1.4.10)
      htmlentities (>= 4.0.0)
-    premailer-rails (1.9.2)
+    premailer-rails (1.9.7)
      actionmailer (>= 3, < 6)
      premailer (~> 1.7, >= 1.7.9)
+    prometheus-client-mmap (0.7.0.beta11)
+      mmap2 (~> 2.2, >= 2.2.7)
    pry (0.10.4)
      coderay (~> 1.1.0)
      method_source (~> 0.8.1)
@@ -601,18 +647,23 @@ GEM
      rails-deprecated_sanitizer (>= 1.0.1)
    rails-html-sanitizer (1.0.3)
      loofah (~> 2.0)
+    rails-i18n (4.0.9)
+      i18n (~> 0.7)
+      railties (~> 4.0)
    railties (4.2.8)
      actionpack (= 4.2.8)
      activesupport (= 4.2.8)
      rake (>= 0.8.7)
      thor (>= 0.18.1, < 2.0)
-    rainbow (2.1.0)
+    rainbow (2.2.2)
-    raindrops (0.17.0)
+      rake
+    raindrops (0.18.0)
    rake (10.5.0)
    rblineprof (0.3.6)
      debugger-ruby_core_source (~> 1.3)
    rdoc (4.2.2)
      json (~> 1.4)
+    re2 (1.1.1)
    recaptcha (3.0.0)
      json
    recursive-open-struct (1.0.0)
@@ -646,7 +697,7 @@ GEM
    retriable (1.4.1)
    rinku (2.0.0)
    rotp (2.1.2)
-    rouge (2.0.7)
+    rouge (2.1.0)
    rqrcode (0.7.0)
      chunky_png
    rqrcode-rails3 (0.1.7)
@@ -680,13 +731,14 @@ GEM
      pg
      rails
      sqlite3
-    rubocop (0.47.1)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
      parser (>= 2.3.3.1, < 3.0)
      powerpack (~> 0.1)
      rainbow (>= 1.99.1, < 3.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-rspec (1.15.0)
+    rubocop-rspec (1.15.1)
      rubocop (>= 0.42.0)
    ruby-fogbugz (0.2.1)
      crack (~> 0.4)
@@ -694,14 +746,14 @@ GEM
    ruby-progressbar (1.8.1)
    ruby-saml (1.4.1)
      nokogiri (>= 1.5.10)
-    ruby_parser (3.8.4)
+    ruby_parser (3.9.0)
      sexp_processor (~> 4.1)
-    rubyntlm (0.5.2)
+    rubyntlm (0.6.2)
    rubypants (0.2.0)
    rubyzip (1.2.1)
    rufus-scheduler (3.4.0)
      et-orbi (~> 1.0)
-    rugged (0.25.1.1)
+    rugged (0.26.0)
    safe_yaml (1.0.4)
    sanitize (2.1.0)
      nokogiri (>= 1.4.4)
@@ -715,24 +767,24 @@ GEM
    sawyer (0.8.1)
      addressable (>= 2.3.5, < 2.6)
      faraday (~> 0.8, < 1.0)
-    scss_lint (0.47.1)
+    scss_lint (0.54.0)
-      rake (>= 0.9, < 11)
+      rake (>= 0.9, < 13)
-      sass (~> 3.4.15)
+      sass (~> 3.4.20)
    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.4.0)
+    sentry-raven (2.5.3)
      faraday (>= 0.7.6, < 1.0)
    settingslogic (2.0.9)
-    sexp_processor (4.8.0)
+    sexp_processor (4.9.0)
    sham_rack (1.3.6)
      rack
-    shoulda-matchers (2.8.0)
+    shoulda-matchers (3.1.2)
-      activesupport (>= 3.0.0)
+      activesupport (>= 4.0.0)
-    sidekiq (5.0.0)
+    sidekiq (5.0.4)
      concurrent-ruby (~> 1.0)
      connection_pool (~> 2.2, >= 2.2.0)
      rack-protection (>= 1.5.0)
@@ -805,7 +857,6 @@ GEM
    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)
      nokogiri (~> 1.6.1)
@@ -819,7 +870,7 @@ GEM
    unf (0.1.4)
      unf_ext
    unf_ext (0.0.7.2)
-    unicode-display_width (1.1.3)
+    unicode-display_width (1.3.0)
    unicorn (5.1.0)
      kgio (~> 2.6)
      raindrops (~> 0.7)
@@ -840,7 +891,7 @@ GEM
    vmstat (2.3.0)
    warden (1.2.6)
      rack (>= 1.0)
-    webmock (1.24.6)
+    webmock (2.3.2)
      addressable (>= 2.3.6)
      crack (>= 0.3.2)
      hashdiff
@@ -880,23 +931,23 @@ DEPENDENCIES
  better_errors (~> 2.1.0)
  binding_of_caller (~> 0.7.2)
  bootstrap-sass (~> 3.3.0)
+  bootstrap_form (~> 2.7.0)
  brakeman (~> 3.6.0)
  browser (~> 2.2)
  bullet (~> 5.5.0)
  bundler-audit (~> 0.5.0)
  capybara (~> 2.6.2)
  capybara-screenshot (~> 1.0.0)
-  carrierwave (~> 1.0)
+  carrierwave (~> 1.1)
  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)
  database_cleaner (~> 1.5.0)
-  deckar01-task_list (= 1.0.6)
+  deckar01-task_list (= 2.0.0)
  default_value_for (~> 3.0.0)
  devise (~> 4.2)
  devise-two-factor (~> 3.0.0)
@@ -907,10 +958,13 @@ DEPENDENCIES
  email_reply_trimmer (~> 0.1)
  email_spec (~> 1.6.0)
  factory_girl_rails (~> 4.7.0)
-  faraday (~> 0.11.0)
+  faraday (~> 0.12)
  ffaker (~> 2.4)
  flay (~> 2.8.0)
-  fog-aws (~> 0.9)
+  flipper (~> 0.10.2)
+  flipper-active_record (~> 0.10.2)
+  fog-aliyun (~> 0.1.0)
+  fog-aws (~> 1.4)
  fog-core (~> 1.44)
  fog-google (~> 0.5)
  fog-local (~> 0.3)
@@ -924,17 +978,19 @@ DEPENDENCIES
  gettext (~> 3.2.2)
  gettext_i18n_rails (~> 1.8.0)
  gettext_i18n_rails_js (~> 1.2.0)
-  gitaly (~> 0.7.0)
+  gitaly (~> 0.21.0)
  github-linguist (~> 4.7.0)
  gitlab-flowdock-git-hook (~> 1.0.1)
  gitlab-markup (~> 1.5.1)
-  gitlab_omniauth-ldap (~> 1.2.1)
+  gitlab_omniauth-ldap (~> 2.0.3)
  gollum-lib (~> 4.2)
  gollum-rugged_adapter (~> 0.4.4)
  gon (~> 6.1.0)
  google-api-client (~> 0.8.6)
-  grape (~> 0.19.0)
+  gpgme
+  grape (~> 0.19.2)
  grape-entity (~> 0.6.0)
+  grape-route-helpers (~> 2.0.0)
  haml_lint (~> 0.21.0)
  hamlit (~> 2.6.1)
  hashie-forbidden_attributes
@@ -955,20 +1011,21 @@ DEPENDENCIES
  letter_opener_web (~> 1.3.0)
  license_finder (~> 2.1.0)
  licensee (~> 8.7.0)
+  lograge (~> 0.5)
  loofah (~> 2.0.3)
  mail_room (~> 0.9.1)
  method_source (~> 0.8)
  minitest (~> 5.7.0)
  mousetrap-rails (~> 1.4.6)
-  mysql2 (~> 0.3.16)
+  mysql2 (~> 0.4.5)
-  net-ssh (~> 3.0.1)
+  net-ldap
  nokogiri (~> 1.6.7, >= 1.6.7.2)
-  oauth2 (~> 1.3.0)
+  oauth2 (~> 1.4)
  octokit (~> 4.6.2)
  oj (~> 2.17.4)
  omniauth (~> 1.4.2)
  omniauth-auth0 (~> 1.4.1)
-  omniauth-authentiq (~> 0.3.0)
+  omniauth-authentiq (~> 0.3.1)
  omniauth-azure-oauth2 (~> 0.0.6)
  omniauth-cas3 (~> 1.1.2)
  omniauth-facebook (~> 4.0.0)
@@ -982,10 +1039,20 @@ DEPENDENCIES
  omniauth-twitter (~> 1.2.0)
  omniauth_crowd (~> 2.2.0)
  org-ruby (~> 0.9.12)
-  paranoia (~> 2.2)
+  paranoia (~> 2.3.1)
+  peek (~> 1.0.1)
+  peek-gc (~> 0.0.2)
+  peek-host (~> 1.0.0)
+  peek-mysql2 (~> 1.1.0)
+  peek-performance_bar (~> 1.3.0)
+  peek-pg (~> 1.3.0)
+  peek-rblineprof (~> 0.2.0)
+  peek-redis (~> 1.2.0)
+  peek-sidekiq (~> 1.0.3)
  pg (~> 0.18.2)
  poltergeist (~> 1.9.0)
-  premailer-rails (~> 1.9.0)
+  premailer-rails (~> 1.9.7)
+  prometheus-client-mmap (~> 0.7.0.beta11)
  pry-byebug (~> 3.4.1)
  pry-rails (~> 0.3.4)
  rack-attack (~> 4.4.1)
@@ -994,9 +1061,12 @@ DEPENDENCIES
  rack-proxy (~> 0.6.0)
  rails (= 4.2.8)
  rails-deprecated_sanitizer (~> 1.0.3)
-  rainbow (~> 2.1.0)
+  rails-i18n (~> 4.0.9)
+  rainbow (~> 2.2)
+  raindrops (~> 0.18)
  rblineprof (~> 0.3.6)
  rdoc (~> 4.2)
+  re2 (~> 1.1.1)
  recaptcha (~> 3.0)
  redcarpet (~> 3.4)
  redis (~> 3.2)
@@ -1010,22 +1080,22 @@ DEPENDENCIES
  rspec-retry (~> 0.4.5)
  rspec-set (~> 0.1.3)
  rspec_profiling (~> 0.0.5)
-  rubocop (~> 0.47.1)
+  rubocop (~> 0.49.1)
-  rubocop-rspec (~> 1.15.0)
+  rubocop-rspec (~> 1.15.1)
  ruby-fogbugz (~> 0.2.1)
  ruby-prof (~> 0.16.2)
-  ruby_parser (~> 3.8.4)
+  ruby_parser (~> 3.8)
  rufus-scheduler (~> 3.4)
-  rugged (~> 0.25.1.1)
+  rugged (~> 0.26.0)
  sanitize (~> 2.0)
  sass-rails (~> 5.0.6)
-  scss_lint (~> 0.47.0)
+  scss_lint (~> 0.54.0)
  seed-fu (~> 2.3.5)
  select2-rails (~> 3.5.9)
-  sentry-raven (~> 2.4.0)
+  sentry-raven (~> 2.5.3)
  settingslogic (~> 2.0.9)
  sham_rack (~> 1.3.6)
-  shoulda-matchers (~> 2.8.0)
+  shoulda-matchers (~> 3.1.2)
  sidekiq (~> 5.0)
  sidekiq-cron (~> 0.6.0)
  sidekiq-limit_fetch (~> 3.4)
@@ -1055,9 +1125,9 @@ DEPENDENCIES
  version_sorter (~> 2.1.0)
  virtus (~> 1.0.1)
  vmstat (~> 2.3.0)
-  webmock (~> 1.24.0)
+  webmock (~> 2.3.2)
  webpack-rails (~> 0.9.10)
  wikicloth (= 0.8.1)
 BUNDLED WITH
-   1.14.6
+   1.15.1
No results found