Merge master into feature branch, fix conflicts

c77bb71c · allison.browne · 83f47163 · c77bb71c · c77bb71c · c77bb71c
--- a/.gitattributes
+++ b/.gitattributes
 VERSION merge=ours
 Dangerfile gitlab-language=ruby
-db/schema.rb merge=merge_db_schema
--- a/.gitlab/CODEOWNERS
+++ b/.gitlab/CODEOWNERS
@@ -6,8 +6,8 @@
 /doc/ @axil @marcia @eread @mikelewis

 # Frontend maintainers should see everything in `app/assets/`
-app/assets/ @ClemMakesApps @fatihacet @filipa @mikegreiling @timzallmann @kushalpandya @pslaughter @wortschi
-*.scss @annabeldunstone @ClemMakesApps @fatihacet @filipa @mikegreiling @timzallmann @kushalpandya @pslaughter @wortschi
+app/assets/ @ClemMakesApps @fatihacet @filipa @mikegreiling @timzallmann @kushalpandya @pslaughter @wortschi @ntepluhina
+*.scss @annabeldunstone @ClemMakesApps @fatihacet @filipa @mikegreiling @timzallmann @kushalpandya @pslaughter @wortschi @ntepluhina

 # Database maintainers should review changes in `db/`
 db/ @gitlab-org/maintainers/database
@@ -32,4 +32,5 @@ lib/gitlab/github_import/ @gitlab-org/maintainers/database
 /.gitlab/ci/ @gl-quality/eng-prod
 Dangerfile @gl-quality/eng-prod
 /danger/ @gl-quality/eng-prod
+/lib/gitlab/danger/ @gl-quality/eng-prod
 /scripts/ @gl-quality/eng-prod
--- a/.gitlab/ci/docs.gitlab-ci.yml
+++ b/.gitlab/ci/docs.gitlab-ci.yml
@@ -67,3 +67,19 @@ docs lint:
    - bundle exec nanoc check internal_links
    # Check the internal anchor links
    - bundle exec nanoc check internal_anchors
+
+graphql-docs-verify:
+  extends:
+    - .only-ee
+    - .default-tags
+    - .default-retry
+    - .default-cache
+    - .default-only
+    - .default-before_script
+    - .only-graphql-changes
+  variables:
+    SETUP_DB: "false"
+  stage: test
+  needs: ["setup-test-env"]
+  script:
+    - bundle exec rake gitlab:graphql:check_docs
--- a/.gitlab/ci/frontend.gitlab-ci.yml
+++ b/.gitlab/ci/frontend.gitlab-ci.yml
@@ -53,7 +53,7 @@
    - gitlab-org
    - docker

-gitlab:assets:compile:
+gitlab:assets:compile pull-push-cache:
  extends: .gitlab:assets:compile-metadata
  only:
    refs:
@@ -63,9 +63,6 @@ gitlab:assets:compile:

 gitlab:assets:compile pull-cache:
  extends: .gitlab:assets:compile-metadata
-  except:
-    refs:
-      - master
  cache:
    policy: pull

@@ -89,14 +86,14 @@ gitlab:assets:compile pull-cache:
    # we override the max_old_space_size to prevent OOM errors
    NODE_OPTIONS: --max_old_space_size=3584
  cache:
-    key: "assets-compile:test:vendor_ruby:.yarn-cache:tmp_cache_assets_sprockets:v6"
+    key: "assets-compile:v7"
  artifacts:
    expire_in: 7d
    paths:
      - node_modules
      - public/assets

-compile-assets:
+compile-assets pull-push-cache:
  extends: .compile-assets-metadata
  only:
    refs:
@@ -104,13 +101,25 @@ compile-assets:
  cache:
    policy: pull-push

-compile-assets pull-cache:
-  extends: .compile-assets-metadata
-  except:
+compile-assets pull-push-cache foss:
+  extends: [".compile-assets-metadata", ".only-ee-as-if-foss"]
+  only:
    refs:
      - master
+  cache:
+    policy: pull-push
+    key: "assets-compile:v7:foss"
+
+compile-assets pull-cache:
+  extends: .compile-assets-metadata
+  cache:
+    policy: pull
+
+compile-assets pull-cache foss:
+  extends: [".compile-assets-metadata", ".only-ee-as-if-foss"]
  cache:
    policy: pull
+    key: "assets-compile:v7:foss"

 .only-code-frontend-job-base:
  extends:
@@ -121,7 +130,9 @@ compile-assets pull-cache:
    - .default-before_script
    - .only-code-changes
    - .use-pg9
-  dependencies: ["compile-assets", "compile-assets pull-cache", "setup-test-env"]
+  stage: test
+  needs: ["setup-test-env", "compile-assets pull-cache"]
+  dependencies: ["setup-test-env", "compile-assets pull-cache"]

 .karma-base:
  extends: .only-code-frontend-job-base
@@ -195,6 +206,7 @@ jest-foss:
    - .default-cache
    - .default-only
    - .only-code-changes
+  stage: test
  dependencies: []
  cache:
    key: "$CI_JOB_NAME"
@@ -227,7 +239,9 @@ webpack-dev-server:
    - .default-cache
    - .default-only
    - .only-code-changes
-  dependencies: ["setup-test-env", "compile-assets", "compile-assets pull-cache"]
+  stage: test
+  needs: ["setup-test-env", "compile-assets pull-cache"]
+  dependencies: ["setup-test-env", "compile-assets pull-cache"]
  variables:
    WEBPACK_MEMORY_TEST: "true"
  script:

--- a/.gitlab/ci/global.gitlab-ci.yml
+++ b/.gitlab/ci/global.gitlab-ci.yml
@@ -71,6 +71,12 @@
      - "doc/**/*"
      - ".markdownlint.json"

+.only-graphql-changes:
+  only:
+    changes:
+      - "{,ee/}app/graphql/**/*"
+      - "{,ee/}lib/gitlab/graphql/**/*"
+
 .only-code-qa-changes:
  only:
    changes:
@@ -153,4 +159,4 @@
 .only-ee-as-if-foss:
  extends: .only-ee
  variables:
-    IS_GITLAB_EE: '0'
+    FOSS_ONLY: '1'
--- a/.gitlab/ci/pages.gitlab-ci.yml
+++ b/.gitlab/ci/pages.gitlab-ci.yml
@@ -11,7 +11,7 @@ pages:
    variables:
      - $CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org"
  stage: pages
-  dependencies: ["coverage", "karma", "gitlab:assets:compile"]
+  dependencies: ["coverage", "karma", "gitlab:assets:compile pull-cache"]
  script:
    - mv public/ .public/
    - mkdir public/

--- a/.gitlab/ci/qa.gitlab-ci.yml
+++ b/.gitlab/ci/qa.gitlab-ci.yml
@@ -71,4 +71,4 @@ schedule:package-and-qa:
    - .package-and-qa-base
    - .only-code-qa-changes
    - .only-canonical-schedules
-  needs: ["build-qa-image", "gitlab:assets:compile"]
+  needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -53,6 +53,8 @@ setup-test-env:
 .rspec-base:
  extends: .only-code-rails-job-base
  stage: test
+  needs: ["setup-test-env", "retrieve-tests-metadata", "compile-assets pull-cache"]
+  dependencies: ["setup-test-env", "retrieve-tests-metadata", "compile-assets pull-cache"]
  script:
    - source scripts/rspec_helpers.sh
    - rspec_paralellized_job "--tag ~quarantine --tag ~geo"
@@ -69,6 +71,11 @@ setup-test-env:
    reports:
      junit: junit_rspec.xml

+.rspec-base-foss:
+  extends: [".rspec-base", ".only-ee-as-if-foss"]
+  needs: ["setup-test-env", "retrieve-tests-metadata", "compile-assets pull-cache foss"]
+  dependencies: ["setup-test-env", "retrieve-tests-metadata", "compile-assets pull-cache foss"]
+
 .rspec-base-pg9:
  extends:
    - .rspec-base
@@ -76,9 +83,8 @@ setup-test-env:

 .rspec-base-pg9-foss:
  extends:
-    - .rspec-base
+    - .rspec-base-foss
    - .use-pg9
-    - .only-ee-as-if-foss

 .rspec-base-pg10:
  extends:
@@ -106,10 +112,9 @@ rspec system pg9:
  extends: .rspec-base-pg9
  parallel: 24

-# TODO: This requires FOSS assets
-# rspec system pg9-foss:
-#   extends: .rspec-base-pg9-foss
-#   parallel: 24
+rspec system pg9-foss:
+  extends: .rspec-base-pg9-foss
+  parallel: 24

 rspec unit pg10:
  extends: .rspec-base-pg10
@@ -229,7 +234,9 @@ rspec fast_spec_helper:

 static-analysis:
  extends: .only-code-qa-rails-job-base
-  dependencies: ["setup-test-env", "compile-assets", "compile-assets pull-cache"]
+  stage: test
+  needs: ["setup-test-env", "compile-assets pull-cache"]
+  dependencies: ["setup-test-env", "compile-assets pull-cache"]
  variables:
    SETUP_DB: "false"
  script:
@@ -252,16 +259,16 @@ downtime_check:
    variables:
      - $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable(-ee)?$/
  stage: test
-  dependencies: ["setup-test-env"]
  needs: ["setup-test-env"]
+  dependencies: ["setup-test-env"]

 .db-job-base:
  extends:
    - .only-code-rails-job-base
    - .use-pg9
  stage: test
-  dependencies: ["setup-test-env"]
  needs: ["setup-test-env"]
+  dependencies: ["setup-test-env"]

 # DB migration, rollback, and seed jobs
 db:migrate:reset:

--- a/.gitlab/ci/review.gitlab-ci.yml
+++ b/.gitlab/ci/review.gitlab-ci.yml
 .except-deploys:
  except:
    refs:
-      - /^[\d-]+-stable(-ee)?$/
      - /^\d+-\d+-auto-deploy-\d+$/

 .review-docker:
@@ -81,7 +80,7 @@ schedule:review-build-cng:
  extends:
    - .review-build-cng-base
    - .only-review-schedules
-  needs: ["gitlab:assets:compile"]
+  needs: ["gitlab:assets:compile pull-cache"]

 .review-deploy-base:
  extends:
@@ -97,7 +96,10 @@ schedule:review-build-cng:
  variables:
    HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
    DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
-    GITLAB_HELM_CHART_REF: "master"
+    # v2.3.7 + some stability improvements not yet released:
+    # - sidekiq readinessProbe should be `pgrep -f sidekiq`: https://gitlab.com/gitlab-org/charts/gitlab/merge_requests/991
+    # - Allows livenessProbe and readinessProbe to be configured for unicorn: https://gitlab.com/gitlab-org/charts/gitlab/merge_requests/985
+    GITLAB_HELM_CHART_REF: "df7c52dc69df441909880b8f2fd15e938cdb2047"
    GITLAB_EDITION: "ce"
  environment:
    name: review/${CI_COMMIT_REF_NAME}

--- a/.gitlab/issue_templates/Problem_Validation.md
+++ b/.gitlab/issue_templates/Problem_Validation.md
@@ -38,4 +38,4 @@

 For example, if the solution will take a product manager, designer, and engineer two weeks of effort - you may quantify this as 1.5 (based on 0.5 months x 3 people). -->

-/label ~"workflow::problem backlog"
+/label ~"workflow::validation backlog" ~devops:: ~category: ~group::
--- a/.gitlab/issue_templates/Security developer workflow.md
+++ b/.gitlab/issue_templates/Security developer workflow.md
@@ -29,7 +29,7 @@ Set the title to: `Description of the original issue`

 #### Documentation and final details

- [ ] Check the topic on #security to see when the next release is going to happen and add a link to the [links section](#links)
+- [ ] Check the topic on #releases to see when the next release is going to happen and add a link to the [links section](#links)
 - [ ] Add links to this issue and your MRs in the description of the security release issue
 - [ ] Find out the versions affected (the Git history of the files affected may help you with this) and add them to the [details section](#details)
 - [ ] Fill in any upgrade notes that users may need to take into account in the [details section](#details)

--- a/.haml-lint_todo.yml
+++ b/.haml-lint_todo.yml
@@ -356,6 +356,7 @@ linters:
      - 'app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml'
      - 'app/views/shared/_commit_message_container.html.haml'
      - 'app/views/shared/_confirm_modal.html.haml'
+      - 'app/views/shared/_confirm_fork_modal.html.haml'
      - 'app/views/shared/_delete_label_modal.html.haml'
      - 'app/views/shared/_group_form.html.haml'
      - 'app/views/shared/_group_tips.html.haml'

--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -178,6 +178,11 @@ Gitlab/ModuleWithInstanceVariables:
    - spec/support/**/*.rb
    - features/steps/**/*.rb

+Gitlab/ConstGetInheritFalse:
+  Enabled: true
+  Exclude:
+    - 'qa/bin/*'
+
 Gitlab/HTTParty:
  Enabled: true
  Exclude:

--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -273,11 +273,6 @@ RSpec/ContextWording:
 RSpec/EmptyLineAfterFinalLet:
  Enabled: false

-# Offense count: 232
-# Cop supports --auto-correct.
-RSpec/EmptyLineAfterSubject:
-  Enabled: false
-
 # Offense count: 719
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.

--- a/Dangerfile
+++ b/Dangerfile
 # frozen_string_literal: true

 require_relative 'lib/gitlab_danger'
+require_relative 'lib/gitlab/danger/request_helper'

 danger.import_plugin('danger/plugins/helper.rb')
 danger.import_plugin('danger/plugins/roulette.rb')

--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
-1.67.0
+1.70.0
--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
-10.1.0
+10.2.0
--- a/Gemfile
+++ b/Gemfile
@@ -448,9 +448,9 @@ end
 # Gitaly GRPC protocol definitions
 gem 'gitaly', '~> 1.65.0'

-gem 'grpc', '~> 1.19.0'
+gem 'grpc', '~> 1.24.0'

-gem 'google-protobuf', '~> 3.7.1'
+gem 'google-protobuf', '~> 3.8.0'

 gem 'toml-rb', '~> 1.0.0', require: false


--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -95,7 +95,7 @@ GEM
    babosa (1.0.2)
    base32 (0.3.2)
    batch-loader (1.4.0)
-    bcrypt (3.1.13)
+    bcrypt (3.1.12)
    bcrypt_pbkdf (1.0.0)
    benchmark-ips (2.3.0)
    benchmark-memory (0.1.2)
@@ -400,7 +400,7 @@ GEM
      mime-types (~> 3.0)
      representable (~> 3.0)
      retriable (>= 2.0, < 4.0)
-    google-protobuf (3.7.1)
+    google-protobuf (3.8.0)
    googleapis-common-protos-types (1.0.4)
      google-protobuf (~> 3.0)
    googleauth (0.6.6)
@@ -440,9 +440,9 @@ GEM
      graphql (~> 1.6)
      html-pipeline (~> 2.8)
      sass (~> 3.4)
-    grpc (1.19.0)
-      google-protobuf (~> 3.1)
-      googleapis-common-protos-types (~> 1.0.0)
+    grpc (1.24.0)
+      google-protobuf (~> 3.8)
+      googleapis-common-protos-types (~> 1.0)
    gssapi (1.2.0)
      ffi (>= 1.0.1)
    haml (5.0.4)
@@ -1181,7 +1181,7 @@ DEPENDENCIES
  gitlab_omniauth-ldap (~> 2.1.1)
  gon (~> 6.2)
  google-api-client (~> 0.23)
-  google-protobuf (~> 3.7.1)
+  google-protobuf (~> 3.8.0)
  gpgme (~> 2.0.18)
  grape (~> 1.1.0)
  grape-entity (~> 0.7.1)
@@ -1190,7 +1190,7 @@ DEPENDENCIES
  graphiql-rails (~> 1.4.10)
  graphql (~> 1.9.11)
  graphql-docs (~> 1.6.0)
-  grpc (~> 1.19.0)
+  grpc (~> 1.24.0)
  gssapi
  haml_lint (~> 0.31.0)
  hamlit (~> 2.8.8)

--- a/app/assets/javascripts/api.js
+++ b/app/assets/javascripts/api.js
@@ -36,6 +36,7 @@ const Api = {
  branchSinglePath: '/api/:version/projects/:id/repository/branches/:branch',
  createBranchPath: '/api/:version/projects/:id/repository/branches',
  releasesPath: '/api/:version/projects/:id/releases',
+  releasePath: '/api/:version/projects/:id/releases/:tag_name',
  mergeRequestsPipeline: '/api/:version/projects/:id/merge_requests/:merge_request_iid/pipelines',
  adminStatisticsPath: 'api/:version/application/statistics',

@@ -391,6 +392,22 @@ const Api = {
    return axios.get(url);
  },

+  release(projectPath, tagName) {
+    const url = Api.buildUrl(this.releasePath)
+      .replace(':id', encodeURIComponent(projectPath))
+      .replace(':tag_name', encodeURIComponent(tagName));
+
+    return axios.get(url);
+  },
+
+  updateRelease(projectPath, tagName, release) {
+    const url = Api.buildUrl(this.releasePath)
+      .replace(':id', encodeURIComponent(projectPath))
+      .replace(':tag_name', encodeURIComponent(tagName));
+
+    return axios.put(url, release);
+  },
+
  adminStatistics() {
    const url = Api.buildUrl(this.adminStatisticsPath);
    return axios.get(url);