Merge remote-tracking branch 'origin/master'

.eslintrc.yml

@@ -22,17 +22,17 @@ rules:
     - allow:
         - __
         - _links
-  # Disabled for now, to make the airbnb-base 12.1.0 -> 13.1.0 update smoother
-  no-else-return:
-    - error
-    - allowElseIf: true
   import/no-unresolved:
     - error
     - ignore:
         # https://gitlab.com/gitlab-org/gitlab/issues/38226
         - '^ee_component/'
-  import/no-useless-path-segments: off
   import/order: off
+  # Disabled for now, to make the airbnb-base 12.1.0 -> 13.1.0 update smoother
+  no-else-return:
+    - error
+    - allowElseIf: true
+  import/no-useless-path-segments: off
   lines-between-class-members: off
   # Disabled for now, to make the plugin-vue 4.5 -> 5.0 update smoother
   vue/no-confusing-v-for-v-if: error

.gitlab-ci.yml

-image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.14-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-10-graphicsmagick-1.3.34"
-
 stages:
   - sync
   - prepare
+  - build-images
   - fixtures
   - test
   - post-test
@@ -16,6 +15,7 @@ stages:
 # in cases where jobs require Docker-in-Docker, the job
 # definition must be extended with `.use-docker-in-docker`
 default:
+  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.14-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34"
   tags:
     - gitlab-org
   # All jobs are interruptible by default
@@ -30,7 +30,7 @@ workflow:
     # merge requests used for this merge a branch release-tools/X into a stable
     # branch. For these merge requests we don't want to run any pipelines, as
     # they serve no purpose and will run anyway when the changes are merged.
-    - if: '$CI_COMMIT_BRANCH =~ /^release-tools\/\d+\.\d+\.\d+-rc\d+$/ && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^[\d-]+-stable(-ee)?$/ && $CI_PROJECT_PATH == "gitlab-org/gitlab"'
+    - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^release-tools\/\d+\.\d+\.\d+-rc\d+$/ && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^[\d-]+-stable(-ee)?$/ && $CI_PROJECT_PATH == "gitlab-org/gitlab"'
       when: never
     # For merge requests, create a pipeline.
     - if: '$CI_MERGE_REQUEST_IID'

.gitlab/CODEOWNERS

@@ -10,7 +10,7 @@
 *.md @gl-docsteam
 /doc/ @gl-docsteam
 # Dev and Doc guidelines
-/doc/development/ @marcia
+/doc/development/ @marcia @mjang1
 /doc/development/documentation/ @mikelewis
 
 # Frontend maintainers should see everything in `app/assets/`

.gitlab/ci/dev-fixtures.gitlab-ci.yml

@@ -3,9 +3,9 @@
     - .default-retry
     - .default-cache
     - .default-before_script
-    - .use-pg11
+    - .use-pg9
   stage: test
-  needs: ["setup-test-env pg11"]
+  needs: ["setup-test-env pg9"]
   variables:
     FIXTURE_PATH: "db/fixtures/development"
     SEED_CYCLE_ANALYTICS: "true"
@@ -26,7 +26,7 @@ run-dev-fixtures-ee:
   extends:
     - .run-dev-fixtures
     - .dev-fixtures:rules:ee-only
-    - .use-pg11-ee
+    - .use-pg9-ee
   script:
     - scripts/gitaly-test-spawn
     - cp ee/db/fixtures/development/* $FIXTURE_PATH

.gitlab/ci/docs.gitlab-ci.yml

@@ -66,9 +66,9 @@ graphql-reference-verify:
     - .default-cache
     - .default-before_script
     - .docs:rules:graphql-reference-verify
-    - .use-pg11
+    - .use-pg9
   stage: test
-  needs: ["setup-test-env pg11"]
+  needs: ["setup-test-env pg9"]
   script:
     - bundle exec rake gitlab:graphql:check_docs
     - bundle exec rake gitlab:graphql:check_schema

.gitlab/ci/frontend.gitlab-ci.yml

@@ -15,7 +15,6 @@
     - .default-retry
     - .default-before_script
     - .assets-compile-cache
-    - .use-docker-in-docker
   image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-graphicsmagick-1.3.34-docker-19.03.1
   stage: prepare
   variables:
@@ -34,20 +33,16 @@
     paths:
       - webpack-report/
       - assets-compile.log
-      # We consume these files in GitLab UI for integration tests:
-      # https://gitlab.com/gitlab-org/gitlab-ui/-/blob/e88493b3c855aea30bf60baee692a64606b0eb1e/.storybook/preview-head.pug#L1
-      - public/assets/application-*.css
-      - public/assets/application-*.css.gz
+      # These assets are used in multiple locations:
+      # - in `build-assets-image` job to create assets image for packaging systems
+      # - GitLab UI for integration tests: https://gitlab.com/gitlab-org/gitlab-ui/-/blob/e88493b3c855aea30bf60baee692a64606b0eb1e/.storybook/preview-head.pug#L1
+      - public/assets
     when: always
   script:
     - node --version
     - retry yarn install --frozen-lockfile --production --cache-folder .yarn-cache --prefer-offline
     - free -m
     - time bin/rake gitlab:assets:compile > assets-compile.log 2>&1
-    # TODO: Change the image tag to be the MD5 of assets files and skip image building if the image exists
-    # We'll also need to pass GITLAB_ASSETS_TAG to the trigerred omnibus-gitlab pipeline similarly to how we do it for trigerred CNG pipelines
-    # https://gitlab.com/gitlab-org/gitlab/issues/208389
-    - time scripts/build_assets_image
     - scripts/clean-old-cached-assets
     - rm -f /etc/apt/sources.list.d/google*.list  # We don't need to update Chrome here
 
@@ -65,6 +60,20 @@ gitlab:assets:compile pull-cache:
   cache:
     policy: pull
 
+build-assets-image:
+  extends:
+    - .use-kaniko
+    - .frontend:rules:gitlab-assets-compile-pull-cache
+  stage: build-images
+  needs: ["gitlab:assets:compile pull-cache"]
+  variables:
+    GIT_DEPTH: "1"
+  script:
+    # TODO: Change the image tag to be the MD5 of assets files and skip image building if the image exists
+    # We'll also need to pass GITLAB_ASSETS_TAG to the trigerred omnibus-gitlab pipeline similarly to how we do it for trigerred CNG pipelines
+    # https://gitlab.com/gitlab-org/gitlab/issues/208389
+    - scripts/build_assets_image
+
 .compile-assets-metadata:
   extends:
     - .default-retry
@@ -129,9 +138,9 @@ compile-assets pull-cache as-if-foss:
     - .default-retry
     - .default-cache
     - .default-before_script
-    - .use-pg11
+    - .use-pg9
   stage: fixtures
-  needs: ["setup-test-env pg11", "compile-assets pull-cache"]
+  needs: ["setup-test-env pg9", "compile-assets pull-cache"]
   script:
     - date
     - scripts/gitaly-test-spawn

.gitlab/ci/memory.gitlab-ci.yml

@@ -8,7 +8,7 @@
 memory-static:
   extends: .only-code-memory-job-base
   stage: test
-  needs: ["setup-test-env pg11"]
+  needs: ["setup-test-env pg9"]
   variables:
     SETUP_DB: "false"
   script:
@@ -36,9 +36,9 @@ memory-static:
 memory-on-boot:
   extends:
     - .only-code-memory-job-base
-    - .use-pg11
+    - .use-pg9
   stage: test
-  needs: ["setup-test-env pg11", "compile-assets pull-cache"]
+  needs: ["setup-test-env pg9", "compile-assets pull-cache"]
   variables:
     NODE_ENV: "production"
     RAILS_ENV: "production"

.gitlab/ci/rails.gitlab-ci.yml

 .rails:needs:setup-and-assets:
-  needs: ["setup-test-env pg11", "compile-assets pull-cache"]
+  needs: ["setup-test-env pg9", "compile-assets pull-cache"]
 
 .rails-job-base:
   extends:
@@ -7,8 +7,8 @@
     - .default-cache
     - .default-before_script
 
-####################
-# EE and FOSS jobs #
+#######################################################
+# EE/FOSS: default refs (MRs, master, schedules) jobs #
 .base-setup-test-env:
   extends:
     - .rails-job-base
@@ -28,19 +28,19 @@
 setup-test-env pg11:
   extends:
     - .base-setup-test-env
-    - .rails:rules:default-refs-code-backstage-qa
+    - .rails:rules:master-push--master-schedule-2-hourly--code-backstage
     - .use-pg11
 
 setup-test-env pg10:
   extends:
     - .base-setup-test-env
-    - .rails:rules:master-refs-code-backstage
+    - .rails:rules:master-schedule-nightly--code-backstage
     - .use-pg10
 
 setup-test-env pg9:
   extends:
     - .base-setup-test-env
-    - .rails:rules:nightly-master-refs-code-backstage
+    - .rails:rules:default-refs-code-backstage-qa
     - .use-pg9
 
 static-analysis:
@@ -55,7 +55,7 @@ static-analysis:
   script:
     - scripts/static-analysis
   cache:
-    key: "ruby-2.6.5-pg11-rubocop"
+    key: "ruby-2.6.5-pg9-rubocop"
     paths:
       - vendor/ruby
       - tmp/rubocop_cache
@@ -75,7 +75,7 @@ downtime_check:
 .rspec-base:
   extends: .rails-job-base
   stage: test
-  needs: ["setup-test-env pg11", "retrieve-tests-metadata", "compile-assets pull-cache"]
+  needs: ["setup-test-env pg9", "retrieve-tests-metadata", "compile-assets pull-cache"]
   script:
     - source scripts/rspec_helpers.sh
     - rspec_paralellized_job "--tag ~quarantine --tag ~geo --tag ~level:migration"
@@ -93,37 +93,37 @@ downtime_check:
     reports:
       junit: junit_rspec.xml
 
-.rspec-base-pg11:
+.rspec-base-pg9:
   extends:
     - .rspec-base
     - .rails:rules:ee-and-foss
-    - .use-pg11
+    - .use-pg9
 
 .rspec-base-migration:
   script:
     - source scripts/rspec_helpers.sh
     - rspec_paralellized_job "--tag ~quarantine --tag ~geo --tag level:migration"
 
-rspec migration pg11:
+rspec migration pg9:
   extends:
-    - .rspec-base-pg11
+    - .rspec-base-pg9
     - .rspec-base-migration
   parallel: 5
 
-rspec unit pg11:
-  extends: .rspec-base-pg11
+rspec unit pg9:
+  extends: .rspec-base-pg9
   parallel: 20
 
-rspec integration pg11:
-  extends: .rspec-base-pg11
+rspec integration pg9:
+  extends: .rspec-base-pg9
   parallel: 8
 
-rspec system pg11:
-  extends: .rspec-base-pg11
+rspec system pg9:
+  extends: .rspec-base-pg9
   parallel: 24
 
 rspec fast_spec_helper:
-  extends: .rspec-base-pg11
+  extends: .rspec-base-pg9
   script:
     - bin/rspec spec/fast_spec_helper.rb
 
@@ -131,9 +131,9 @@ rspec fast_spec_helper:
   extends:
     - .rails-job-base
     - .rails:rules:ee-and-foss
-    - .use-pg11
+    - .use-pg9
   stage: test
-  needs: ["setup-test-env pg11"]
+  needs: ["setup-test-env pg9"]
 
 db:migrate:reset:
   extends: .db-job-base
@@ -143,6 +143,7 @@ db:migrate:reset:
 db:check-schema:
   extends: .db-job-base
   script:
+    - scripts/regenerate-schema
     - source scripts/schema_changed.sh
 
 db:migrate-from-v11.11.0:
@@ -202,18 +203,18 @@ rspec:coverage:
   # We cannot use needs since it would mean needing 84 jobs (since most are parallelized)
   # so we use `dependencies` here.
   dependencies:
-    - setup-test-env pg11
-    - rspec migration pg11
-    - rspec unit pg11
-    - rspec integration pg11
-    - rspec system pg11
-    - rspec-ee migration pg11
-    - rspec-ee unit pg11
-    - rspec-ee integration pg11
-    - rspec-ee system pg11
-    - rspec-ee unit pg11 geo
-    - rspec-ee integration pg11 geo
-    - rspec-ee system pg11 geo
+    - setup-test-env pg9
+    - rspec migration pg9
+    - rspec unit pg9
+    - rspec integration pg9
+    - rspec system pg9
+    - rspec-ee migration pg9
+    - rspec-ee unit pg9
+    - rspec-ee integration pg9
+    - rspec-ee system pg9
+    - rspec-ee unit pg9 geo
+    - rspec-ee integration pg9 geo
+    - rspec-ee system pg9 geo
     - memory-static
     - memory-on-boot
   variables:
@@ -231,206 +232,206 @@ rspec:coverage:
       - coverage/index.html
       - coverage/assets/
       - tmp/memory_test/
-# EE and FOSS jobs #
-####################
+# EE/FOSS: default refs (MRs, master, schedules) jobs #
+#######################################################
 
-####################
-# master-only jobs #
-.rspec-base-pg10:
+##################################################
+# EE: default refs (MRs, master, schedules) jobs #
+.rspec-base-ee:
   extends:
     - .rspec-base
-    - .rails:rules:master-refs-code-backstage
-    - .use-pg10
-  needs: ["setup-test-env pg10", "retrieve-tests-metadata", "compile-assets pull-cache"]
+    - .rails:rules:ee-only
 
-rspec migration pg10:
+.rspec-base-pg9-as-if-foss:
   extends:
-    - .rspec-base-pg10
-    - .rspec-base-migration
-  parallel: 5
-
-rspec unit pg10:
-  extends: .rspec-base-pg10
-  parallel: 20
-
-rspec integration pg10:
-  extends: .rspec-base-pg10
-  parallel: 8
-
-rspec system pg10:
-  extends: .rspec-base-pg10
-  parallel: 24
-# master-only jobs #
-####################
+    - .rspec-base-ee
+    - .as-if-foss
+    - .use-pg9
+  needs: ["setup-test-env pg9", "retrieve-tests-metadata", "compile-assets pull-cache as-if-foss"]
 
-######################
-# nightly-only jobs #
-.rspec-base-pg9:
+.rspec-ee-base-pg9:
   extends:
-    - .rspec-base
-    - .rails:rules:nightly-master-refs-code-backstage
-    - .use-pg9
-  needs: ["setup-test-env pg9", "retrieve-tests-metadata", "compile-assets pull-cache"]
+    - .rspec-base-ee
+    - .use-pg9-ee
 
-rspec migration pg9:
+rspec migration pg9-as-if-foss:
   extends:
-    - .rspec-base-pg9
+    - .rspec-base-pg9-as-if-foss
     - .rspec-base-migration
   parallel: 5
 
-rspec unit pg9:
-  extends: .rspec-base-pg9
+rspec unit pg9-as-if-foss:
+  extends: .rspec-base-pg9-as-if-foss
   parallel: 20
 
-rspec integration pg9:
-  extends: .rspec-base-pg9
+rspec integration pg9-as-if-foss:
+  extends: .rspec-base-pg9-as-if-foss
   parallel: 8
 
-rspec system pg9:
-  extends: .rspec-base-pg9
+rspec system pg9-as-if-foss:
+  extends: .rspec-base-pg9-as-if-foss
   parallel: 24
-# nightly-only jobs #
-#####################
 
-#######################
-# EE master-only jobs #
-.rspec-ee-base-pg10:
+rspec-ee migration pg9:
   extends:
-    - .rspec-base-ee
-    - .use-pg10-ee
-  needs: ["setup-test-env pg10", "retrieve-tests-metadata", "compile-assets pull-cache"]
-
-rspec-ee migration pg10:
-  extends:
-    - .rspec-ee-base-pg10
+    - .rspec-ee-base-pg9
     - .rspec-base-migration
-    - .rails:rules:master-refs-code-backstage
   parallel: 2
 
-rspec-ee unit pg10:
-  extends:
-    - .rspec-ee-base-pg10
-    - .rails:rules:master-refs-code-backstage
+rspec-ee unit pg9:
+  extends: .rspec-ee-base-pg9
   parallel: 10
 
-rspec-ee integration pg10:
-  extends:
-    - .rspec-ee-base-pg10
-    - .rails:rules:master-refs-code-backstage
+rspec-ee integration pg9:
+  extends: .rspec-ee-base-pg9
   parallel: 4
 
-rspec-ee system pg10:
-  extends:
-    - .rspec-ee-base-pg10
-    - .rails:rules:master-refs-code-backstage
+rspec-ee system pg9:
+  extends: .rspec-ee-base-pg9
   parallel: 6
-# EE master-only jobs #
-#######################
 
-################
-# EE-only jobs #
-.rspec-base-ee:
+.rspec-ee-base-geo:
+  extends: .rspec-base-ee
+  script:
+    - source scripts/rspec_helpers.sh
+    - scripts/prepare_postgres_fdw.sh
+    - rspec_paralellized_job "--tag ~quarantine --tag geo"
+
+.rspec-ee-base-geo-pg9:
   extends:
-    - .rspec-base
-    - .rails:rules:ee-only
+    - .rspec-ee-base-geo
+    - .use-pg9-ee
 
-.rspec-base-pg11-as-if-foss:
+rspec-ee unit pg9 geo:
+  extends: .rspec-ee-base-geo-pg9
+  parallel: 2
+
+rspec-ee integration pg9 geo:
+  extends: .rspec-ee-base-geo-pg9
+
+rspec-ee system pg9 geo:
+  extends: .rspec-ee-base-geo-pg9
+
+db:rollback geo:
   extends:
-    - .rspec-base-ee
-    - .as-if-foss
-    - .use-pg11
-  needs: ["setup-test-env pg11", "retrieve-tests-metadata", "compile-assets pull-cache as-if-foss"]
+    - db:rollback
+    - .rails:rules:ee-only
+  script:
+    - bundle exec rake geo:db:migrate VERSION=20170627195211
+    - bundle exec rake geo:db:migrate
+# EE: default refs (MRs, master, schedules) jobs #
+##################################################
 
-.rspec-ee-base-pg11:
+####################################################################
+# EE/FOSS: master non-scheduled and master 2-hourly scheduled jobs #
+.rspec-base-pg11:
   extends:
-    - .rspec-base-ee
-    - .use-pg11-ee
+    - .rspec-base
+    - .rails:rules:master-push--master-schedule-2-hourly--code-backstage
+    - .use-pg11
+  needs: ["setup-test-env pg11", "retrieve-tests-metadata", "compile-assets pull-cache"]
 
-rspec migration pg11-as-if-foss:
+rspec migration pg11:
   extends:
-    - .rspec-base-pg11-as-if-foss
+    - .rspec-base-pg11
     - .rspec-base-migration
   parallel: 5
 
-rspec unit pg11-as-if-foss:
-  extends: .rspec-base-pg11-as-if-foss
+rspec unit pg11:
+  extends: .rspec-base-pg11
   parallel: 20
 
-rspec integration pg11-as-if-foss:
-  extends: .rspec-base-pg11-as-if-foss
+rspec integration pg11:
+  extends: .rspec-base-pg11
   parallel: 8
 
-rspec system pg11-as-if-foss:
-  extends: .rspec-base-pg11-as-if-foss
+rspec system pg11:
+  extends: .rspec-base-pg11
   parallel: 24
+# EE/FOSS: master non-scheduled and master 2-hourly scheduled jobs #
+####################################################################
+
+###############################################################
+# EE: master non-scheduled and master 2-hourly scheduled jobs #
+.rspec-ee-base-pg11:
+  extends:
+    - .rspec-base-ee
+    - .use-pg11-ee
+  needs: ["setup-test-env pg11", "retrieve-tests-metadata", "compile-assets pull-cache"]
 
 rspec-ee migration pg11:
   extends:
     - .rspec-ee-base-pg11
     - .rspec-base-migration
+    - .rails:rules:master-push--master-schedule-2-hourly--code-backstage
   parallel: 2
 
 rspec-ee unit pg11:
-  extends: .rspec-ee-base-pg11
+  extends:
+    - .rspec-ee-base-pg11
+    - .rails:rules:master-push--master-schedule-2-hourly--code-backstage
   parallel: 10
 
 rspec-ee integration pg11:
-  extends: .rspec-ee-base-pg11
+  extends:
+    - .rspec-ee-base-pg11
+    - .rails:rules:master-push--master-schedule-2-hourly--code-backstage
   parallel: 4
 
 rspec-ee system pg11:
-  extends: .rspec-ee-base-pg11
+  extends:
+    - .rspec-ee-base-pg11
+    - .rails:rules:master-push--master-schedule-2-hourly--code-backstage
   parallel: 6
+# EE: master non-scheduled and master 2-hourly scheduled jobs #
+###############################################################
 
-.rspec-ee-base-geo:
-  extends: .rspec-base-ee
-  script:
-    - source scripts/rspec_helpers.sh
-    - scripts/prepare_postgres_fdw.sh
-    - rspec_paralellized_job "--tag ~quarantine --tag geo"
-
-.rspec-ee-base-geo-pg11:
+##########################################
+# EE/FOSS: master nightly scheduled jobs #
+.rspec-base-pg10:
   extends:
-    - .rspec-ee-base-geo
-    - .use-pg11-ee
+    - .rspec-base
+    - .rails:rules:master-schedule-nightly--code-backstage
+    - .use-pg10
+  needs: ["setup-test-env pg10", "retrieve-tests-metadata", "compile-assets pull-cache"]
 
-rspec-ee unit pg11 geo:
-  extends: .rspec-ee-base-geo-pg11
-  parallel: 2
+rspec migration pg10:
+  extends:
+    - .rspec-base-pg10
+    - .rspec-base-migration
+  parallel: 5
 
-rspec-ee integration pg11 geo:
-  extends: .rspec-ee-base-geo-pg11
+rspec unit pg10:
+  extends: .rspec-base-pg10
+  parallel: 20
 
-rspec-ee system pg11 geo:
-  extends: .rspec-ee-base-geo-pg11
+rspec integration pg10:
+  extends: .rspec-base-pg10
+  parallel: 8
 
-db:rollback geo:
-  extends:
-    - db:rollback
-    - .rails:rules:ee-only
-  script:
-    - bundle exec rake geo:db:migrate VERSION=20170627195211
-    - bundle exec rake geo:db:migrate
-# EE-only jobs #
-################
+rspec system pg10:
+  extends: .rspec-base-pg10
+  parallel: 24
+# EE/FOSS: master nightly scheduled jobs #
+##########################################
 
-########################
-# EE nightly-only jobs #
-.rspec-ee-base-geo-pg9:
+##############################
+# EE: nightly scheduled jobs #
+.rspec-ee-base-geo-pg10:
   extends:
     - .rspec-ee-base-geo
-    - .use-pg9-ee
-    - .rails:rules:nightly-master-refs-code-backstage-ee-only
-  needs: ["setup-test-env pg9", "retrieve-tests-metadata", "compile-assets pull-cache"]
+    - .use-pg10-ee
+    - .rails:rules:master-schedule-nightly--code-backstage-ee-only
+  needs: ["setup-test-env pg10", "retrieve-tests-metadata", "compile-assets pull-cache"]
 
-rspec-ee unit pg9 geo:
-  extends: .rspec-ee-base-geo-pg9
+rspec-ee unit pg10 geo:
+  extends: .rspec-ee-base-geo-pg10
   parallel: 2
 
-rspec-ee integration pg9 geo:
-  extends: .rspec-ee-base-geo-pg9
+rspec-ee integration pg10 geo:
+  extends: .rspec-ee-base-geo-pg10
 
-rspec-ee system pg9 geo:
-  extends: .rspec-ee-base-geo-pg9
-# EE nightly-only jobs #
-########################
+rspec-ee system pg10 geo:
+  extends: .rspec-ee-base-geo-pg10
+# EE: nightly scheduled jobs #
+##############################

.gitlab/ci/review.gitlab-ci.yml

@@ -3,7 +3,8 @@ build-qa-image:
     - .use-kaniko
     - .default-retry
     - .review:rules:mr-and-schedule-auto
-  stage: prepare
+  stage: build-images
+  needs: []
   script:
     - '[[ -d "ee/" ]] || export GITLAB_EDITION="ce"'
     - export QA_IMAGE="${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-${GITLAB_EDITION:-ee}-qa:${CI_COMMIT_REF_SLUG}"

.gitlab/ci/rules.gitlab-ci.yml

@@ -16,6 +16,15 @@
 .if-master-refs: &if-master-refs
   if: '$CI_COMMIT_REF_NAME == "master"'
 
+.if-master-push: &if-master-push
+  if: '$CI_COMMIT_BRANCH == "master" && $CI_PIPELINE_SOURCE == "push"'
+
+.if-master-schedule-2-hourly: &if-master-schedule-2-hourly
+  if: '$CI_COMMIT_BRANCH == "master" && $CI_PIPELINE_SOURCE == "schedule" && $FREQUENCY == "2-hourly"'
+
+.if-master-schedule-nightly: &if-master-schedule-nightly
+  if: '$CI_COMMIT_BRANCH == "master" && $CI_PIPELINE_SOURCE == "schedule" && $FREQUENCY == "nightly"'
+
 .if-auto-deploy-branches: &if-auto-deploy-branches
   if: '$CI_COMMIT_BRANCH =~ /^\d+-\d+-auto-deploy-\d+$/'
 
@@ -25,9 +34,6 @@
 .if-merge-request: &if-merge-request
   if: '$CI_MERGE_REQUEST_IID'
 
-.if-nightly-master-schedule: &if-nightly-master-schedule
-  if: '$NIGHTLY && $CI_COMMIT_REF_NAME == "master" && $CI_PIPELINE_SOURCE == "schedule"'
-
 .if-dot-com-gitlab-org-schedule: &if-dot-com-gitlab-org-schedule
   if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org" && $CI_PIPELINE_SOURCE == "schedule"'
 
@@ -78,7 +84,6 @@
   - "{,ee/}rubocop/**/*"
   - "{,ee/}spec/**/*"
   - "doc/README.md"  # Some RSpec test rely on this file
-  - "doc/administration/raketasks/maintenance.md"  # Some RSpec test rely on this file
 
 .code-patterns: &code-patterns
   - "{package.json,yarn.lock}"
@@ -122,7 +127,6 @@
   - "{,ee/}rubocop/**/*"
   - "{,ee/}spec/**/*"
   - "doc/README.md"  # Some RSpec test rely on this file
-  - "doc/administration/raketasks/maintenance.md"  # Some RSpec test rely on this file
 
 .code-qa-patterns: &code-qa-patterns
   - "{package.json,yarn.lock}"
@@ -165,7 +169,6 @@
   - "{,ee/}rubocop/**/*"
   - "{,ee/}spec/**/*"
   - "doc/README.md"  # Some RSpec test rely on this file
-  - "doc/administration/raketasks/maintenance.md"  # Some RSpec test rely on this file
   # QA changes
   - ".dockerignore"
   - "qa/**/*"
@@ -360,36 +363,33 @@
   rules:
     - <<: *if-default-refs
       changes: *code-backstage-patterns
-      when: on_success
 
 .rails:rules:default-refs-code-backstage-qa:
   rules:
     - <<: *if-default-refs
       changes: *code-backstage-qa-patterns
-      when: on_success
 
-.rails:rules:master-refs-code-backstage:
+.rails:rules:master-push--master-schedule-2-hourly--code-backstage:
   rules:
-    - <<: *if-master-refs
+    - <<: *if-master-push
       changes: *code-backstage-patterns
-      when: on_success
-    - changes: [".gitlab/ci/rails.gitlab-ci.yml"]
+    - <<: *if-master-schedule-2-hourly
+    - <<: *if-merge-request
+      changes: [".gitlab/ci/rails.gitlab-ci.yml"]
 
-.rails:rules:nightly-master-refs-code-backstage:
+.rails:rules:master-schedule-nightly--code-backstage:
   rules:
-    - <<: *if-nightly-master-schedule
-      changes: *code-backstage-patterns
-      when: on_success
-    - changes: [".gitlab/ci/rails.gitlab-ci.yml"]
+    - <<: *if-master-schedule-nightly
+    - <<: *if-merge-request
+      changes: [".gitlab/ci/rails.gitlab-ci.yml"]
 
-.rails:rules:nightly-master-refs-code-backstage-ee-only:
+.rails:rules:master-schedule-nightly--code-backstage-ee-only:
   rules:
     - <<: *if-not-ee
       when: never
-    - <<: *if-nightly-master-schedule
-      changes: *code-backstage-patterns
-      when: on_success
-    - changes: [".gitlab/ci/rails.gitlab-ci.yml"]
+    - <<: *if-master-schedule-nightly
+    - <<: *if-merge-request
+      changes: [".gitlab/ci/rails.gitlab-ci.yml"]
 
 .rails:rules:ee-only:
   rules:
@@ -397,7 +397,6 @@
       when: never
     - <<: *if-default-refs
       changes: *code-backstage-patterns
-      when: on_success
 
 .rails:rules:ee-mr-and-master-only:
   rules:
@@ -412,7 +411,6 @@
   rules:
     - <<: *if-merge-request
       changes: *code-backstage-patterns
-      when: on_success
 
 ##################
 # Releases rules #

.gitlab/ci/setup.gitlab-ci.yml

@@ -7,7 +7,7 @@ cache gems:
     - .default-before_script
     - .setup:rules:cache-gems
   stage: test
-  needs: ["setup-test-env pg11"]
+  needs: ["setup-test-env pg9"]
   variables:
     SETUP_DB: "false"
   script:

.gitlab/ci/test-metadata.gitlab-ci.yml

@@ -32,18 +32,18 @@ update-tests-metadata:
     - .test-metadata:rules:update-tests-metadata
   stage: post-test
   dependencies:
-    - setup-test-env pg11
-    - rspec migration pg11
-    - rspec unit pg11
-    - rspec integration pg11
-    - rspec system pg11
-    - rspec-ee migration pg11
-    - rspec-ee unit pg11
-    - rspec-ee integration pg11
-    - rspec-ee system pg11
-    - rspec-ee unit pg11 geo
-    - rspec-ee integration pg11 geo
-    - rspec-ee system pg11 geo
+    - setup-test-env pg9
+    - rspec migration pg9
+    - rspec unit pg9
+    - rspec integration pg9
+    - rspec system pg9
+    - rspec-ee migration pg9
+    - rspec-ee unit pg9
+    - rspec-ee integration pg9
+    - rspec-ee system pg9
+    - rspec-ee unit pg9 geo
+    - rspec-ee integration pg9 geo
+    - rspec-ee system pg9 geo
   cache:
     policy: push
   script:

.gitlab/issue_templates/Feature proposal.md

-<!-- The first three sections: "Problem to solve", "Intended users" and "Proposal", are strongly recommended, while the rest of the sections can be filled out during the problem validation or breakdown phase. However, keep in mind that providing complete and relevant information early helps our product team validate the problem and start working on a solution. -->
+<!-- The first four sections: "Problem to solve", "Intended users", "User experience goal", and "Proposal", are strongly recommended, while the rest of the sections can be filled out during the problem validation or breakdown phase. However, keep in mind that providing complete and relevant information early helps our product team validate the problem and start working on a solution. -->
 
 ### Problem to solve
 
@@ -10,33 +10,44 @@
 
 Personas are described at https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/
 
-* [Rachel (Release Manager)](https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/#rachel-release-manager)
+* [Cameron (Compliance Manager)](https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/#cameron-compliance-manager)
 * [Parker (Product Manager)](https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/#parker-product-manager)
 * [Delaney (Development Team Lead)](https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/#delaney-development-team-lead)
-* [Sasha (Software Developer)](https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/#sasha-software-developer)
 * [Presley (Product Designer)](https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/#presley-product-designer)
+* [Sasha (Software Developer)](https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/#sasha-software-developer)
 * [Devon (DevOps Engineer)](https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/#devon-devops-engineer)
 * [Sidney (Systems Administrator)](https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/#sidney-systems-administrator)
 * [Sam (Security Analyst)](https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/#sam-security-analyst)
-* [Dana (Data Analyst)](https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/#dana-data-analyst)
+* [Rachel (Release Manager)](https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/#rachel-release-manager) 
+* [Alex (Security Operations Engineer)](https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/#alex-security-operations-engineer)
 * [Simone (Software Engineer in Test)](https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/#simone-software-engineer-in-test)
-* [Allison (Application Ops)](https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/#allison-application-ops) -->
+* [Allison (Application Ops)](https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/#allison-application-ops) 
+* [Priyanka (Platform Engineer)](https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/#priyanka-platform-engineer)
+* [Dana (Data Analyst)](https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/#dana-data-analyst)
+-->
 
-### Further details
+### User experience goal
+
+<!-- What is the single user experience workflow this problem addresses? 
+For example, "The user should be able to use the UI/API/.gitlab-ci.yml with GitLab to <perform a specific task>"
+https://about.gitlab.com/handbook/engineering/ux/ux-research-training/user-story-mapping/ --> 
 
-<!-- Include use cases, benefits, goals, or any other details that will help us understand the problem better. -->
 
 ### Proposal
 
 <!-- How are we going to solve the problem? Try to include the user journey! https://about.gitlab.com/handbook/journeys/#user-journey -->
 
+### Further details
+
+<!-- Include use cases, benefits, goals, or any other details that will help us understand the problem better. -->
+
 ### Permissions and Security
 
 <!-- What permissions are required to perform the described actions? Are they consistent with the existing permissions as documented for users, groups, and projects as appropriate? Is the proposed behavior consistent between the UI, API, and other access methods (e.g. email replies)?-->
 
 ### Documentation
 
-<!-- See the Feature Change Documentation Workflow https://docs.gitlab.com/ee/development/documentation/feature-change-workflow.html
+<!-- See the Feature Change Documentation Workflow https://docs.gitlab.com/ee/development/documentation/workflow.html#for-a-product-change
 
 * Add all known Documentation Requirements in this section. See https://docs.gitlab.com/ee/development/documentation/feature-change-workflow.html#documentation-requirements
 * If this feature requires changing permissions, update the permissions document. See https://docs.gitlab.com/ee/user/permissions.html -->

.gitlab/issue_templates/Security developer workflow.md

@@ -36,7 +36,7 @@ After your merge request has been approved according to our [approval guidelines
 ## Documentation and final details
 
 - [ ] Ensure the [Links section](#links) is completed.
-- [ ] Find out the [versions affected](https://gitlab.com/gitlab-org/release/docs/-/blob/master/general/security/developer.md#versions-affected) and add them to the [details section](#details)
+- [ ] Add the GitLab [versions](https://gitlab.com/gitlab-org/release/docs/-/blob/master/general/security/developer.md#versions-affected) and editions affected to the [details section](#details)
   * The Git history of the files affected may help you associate the issue with a [release](https://about.gitlab.com/releases/)
 - [ ] Fill in any upgrade notes that users may need to take into account in the [details section](#details)
 - [ ] Add Yes/No and further details if needed to the migration and settings columns in the [details section](#details)
@@ -57,6 +57,7 @@ After your merge request has been approved according to our [approval guidelines
 | Description | Details | Further details|
 | -------- | -------- | -------- |
 | Versions affected | X.Y  | |
+| GitLab EE only | Yes/No | | 
 | Upgrade notes | | |
 | GitLab Settings updated | Yes/No| |
 | Migration required | Yes/No | |

.rubocop.yml

@@ -211,6 +211,13 @@ Gitlab/HTTParty:
     - 'spec/**/*'
     - 'ee/spec/**/*'
 
+Gitlab/Json:
+  Enabled: false
+  Exclude:
+    - 'db/**/*'
+    - 'qa/**/*'
+    - 'scripts/**/*'
+
 GitlabSecurity/PublicSend:
   Enabled: true
   Exclude:

Gemfile

@@ -152,7 +152,7 @@ gem 'asciidoctor-plantuml', '0.0.10'
 gem 'rouge', '~> 3.18.0'
 gem 'truncato', '~> 0.7.11'
 gem 'bootstrap_form', '~> 4.2.0'
-gem 'nokogiri', '~> 1.10.5'
+gem 'nokogiri', '~> 1.10.9'
 gem 'escape_utils', '~> 1.1'
 
 # Calendar rendering
@@ -166,7 +166,7 @@ gem 'diff_match_patch', '~> 0.1.0'
 gem 'rack', '~> 2.0.9'
 
 group :unicorn do
-  gem 'unicorn', '~> 5.4.1'
+  gem 'unicorn', '~> 5.5'
   gem 'unicorn-worker-killer', '~> 0.4.4'
 end
 
@@ -355,7 +355,7 @@ group :development, :test do
 
   gem 'database_cleaner', '~> 1.7.0'
   gem 'factory_bot_rails', '~> 5.1.0'
-  gem 'rspec-rails', '~> 4.0.0.beta4'
+  gem 'rspec-rails', '~> 4.0.0'
 
   # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
   gem 'minitest', '~> 5.11.0'
@@ -455,7 +455,7 @@ group :ed25519 do
 end
 
 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 12.9.0.pre.rc4'
+gem 'gitaly', '~> 13.0.0.pre.rc1'
 
 gem 'grpc', '~> 1.24.0'
 

Gemfile.lock

@@ -378,7 +378,7 @@ GEM
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
     git (1.5.0)
-    gitaly (12.9.0.pre.rc4)
+    gitaly (13.0.0.pre.rc1)
       grpc (~> 1.0)
     github-markup (1.7.0)
     gitlab-chronic (0.10.5)
@@ -575,7 +575,7 @@ GEM
       activerecord
       kaminari-core (= 1.0.1)
     kaminari-core (1.0.1)
-    kgio (2.11.2)
+    kgio (2.11.3)
     knapsack (1.17.0)
       rake
     kramdown (2.1.0)
@@ -614,7 +614,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.4.0)
+    loofah (2.5.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lru_redux (1.1.0)
@@ -657,7 +657,7 @@ GEM
     netrc (0.11.0)
     nio4r (2.5.2)
     no_proxy_fix (0.1.2)
-    nokogiri (1.10.8)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     nokogumbo (1.5.0)
       nokogiri
@@ -906,7 +906,7 @@ GEM
       rspec-mocks (~> 3.9.0)
     rspec-core (3.9.1)
       rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
@@ -918,7 +918,7 @@ GEM
       proc_to_ast
       rspec (>= 2.13, < 4)
       unparser
-    rspec-rails (4.0.0.beta4)
+    rspec-rails (4.0.0)
       actionpack (>= 4.2)
       activesupport (>= 4.2)
       railties (>= 4.2)
@@ -1078,7 +1078,7 @@ GEM
     truncato (0.7.11)
       htmlentities (~> 4.3.1)
       nokogiri (>= 1.7.0, <= 2.0)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     u2f (0.2.1)
     uber (0.1.0)
@@ -1092,7 +1092,7 @@ GEM
     unicode_plot (0.0.4)
       enumerable-statistics (>= 2.0.1)
     unicode_utils (1.4.0)
-    unicorn (5.4.1)
+    unicorn (5.5.5)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     unicorn-worker-killer (0.4.4)
@@ -1236,7 +1236,7 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly (~> 12.9.0.pre.rc4)
+  gitaly (~> 13.0.0.pre.rc1)
   github-markup (~> 1.7.0)
   gitlab-chronic (~> 0.10.5)
   gitlab-labkit (= 0.12.0)
@@ -1302,7 +1302,7 @@ DEPENDENCIES
   net-ldap
   net-ntp
   net-ssh (~> 5.2)
-  nokogiri (~> 1.10.5)
+  nokogiri (~> 1.10.9)
   oauth2 (~> 1.4)
   octokit (~> 4.15)
   omniauth (~> 1.8)
@@ -1357,7 +1357,7 @@ DEPENDENCIES
   rouge (~> 3.18.0)
   rqrcode-rails3 (~> 0.1.7)
   rspec-parameterized
-  rspec-rails (~> 4.0.0.beta4)
+  rspec-rails (~> 4.0.0)
   rspec-retry (~> 0.6.1)
   rspec_junit_formatter
   rspec_profiling (~> 0.0.5)
@@ -1399,7 +1399,7 @@ DEPENDENCIES
   u2f (~> 0.2.1)
   uglifier (~> 2.7.2)
   unf (~> 0.1.4)
-  unicorn (~> 5.4.1)
+  unicorn (~> 5.5)
   unicorn-worker-killer (~> 0.4.4)
   unleash (~> 0.1.5)
   validates_hostname (~> 1.0.6)

app/assets/javascripts/alert_management/components/alert_details.vue

+<script>
+import { GlTabs, GlTab } from '@gitlab/ui';
+import { s__ } from '~/locale';
+
+export default {
+  i18n: {
+    fullAlertDetailsTitle: s__('AlertManagement|Full Alert Details'),
+    overviewTitle: s__('AlertManagement|Overview'),
+  },
+  components: {
+    GlTab,
+    GlTabs,
+  },
+};
+</script>
+<template>
+  <div>
+    <div class="d-flex justify-content-between">
+      <gl-tabs>
+        <gl-tab data-testid="overviewTab" :title="$options.i18n.overviewTitle">
+          <ul class="pl-3">
+            <li data-testid="startTimeItem" class="font-weight-bold mb-3 mt-2">
+              {{ s__('AlertManagement|Start time:') }}
+            </li>
+            <li class="font-weight-bold my-3">
+              {{ s__('AlertManagement|End time:') }}
+            </li>
+            <li class="font-weight-bold my-3">
+              {{ s__('AlertManagement|Events:') }}
+            </li>
+          </ul>
+        </gl-tab>
+        <gl-tab data-testid="fullDetailsTab" :title="$options.i18n.fullAlertDetailsTitle" />
+      </gl-tabs>
+    </div>
+  </div>
+</template>

app/assets/javascripts/alert_management/components/alert_management_list.vue

 <script>
-import { GlEmptyState, GlButton, GlLoadingIcon, GlTable, GlAlert } from '@gitlab/ui';
+import { GlEmptyState, GlDeprecatedButton, GlLoadingIcon, GlTable, GlAlert } from '@gitlab/ui';
 import { s__ } from '~/locale';
+import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue';
 import getAlerts from '../graphql/queries/getAlerts.query.graphql';
 
-const tdClass = 'table-col d-flex';
-
 export default {
   i18n: {
     noAlertsMsg: s__(
@@ -18,57 +17,56 @@ export default {
     {
       key: 'severity',
       label: s__('AlertManagement|Severity'),
-      tdClass,
     },
     {
-      key: 'start_time',
-      label: s__('AlertManagement|Start Time'),
-      tdClass,
+      key: 'startedAt',
+      label: s__('AlertManagement|Start time'),
     },
     {
-      key: 'end_time',
-      label: s__('AlertManagement|End Time'),
-      tdClass,
+      key: 'endedAt',
+      label: s__('AlertManagement|End time'),
     },
     {
-      key: 'alert',
+      key: 'title',
       label: s__('AlertManagement|Alert'),
       thClass: 'w-30p',
-      tdClass,
     },
     {
-      key: 'events',
+      key: 'eventCount',
       label: s__('AlertManagement|Events'),
-      tdClass,
+      thClass: 'text-right event-count',
+      tdClass: 'text-right event-count',
     },
     {
       key: 'status',
       label: s__('AlertManagement|Status'),
-      tdClass,
     },
   ],
   components: {
     GlEmptyState,
-    GlButton,
     GlLoadingIcon,
     GlTable,
     GlAlert,
+    GlDeprecatedButton,
+    TimeAgo,
   },
   props: {
-    indexPath: {
+    projectPath: {
       type: String,
       required: true,
     },
-    // TODO: Handle alertManagementEnabled depending on resolution - https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30024.
     alertManagementEnabled: {
       type: Boolean,
-      required: false,
-      default: true,
+      required: true,
     },
     enableAlertManagementPath: {
       type: String,
       required: true,
     },
+    userCanEnableAlertManagement: {
+      type: Boolean,
+      required: true,
+    },
     emptyAlertSvgPath: {
       type: String,
       required: true,
@@ -79,9 +77,12 @@ export default {
       query: getAlerts,
       variables() {
         return {
-          projectPath: this.indexPath,
+          projectPath: this.projectPath,
         };
       },
+      update(data) {
+        return data.project.alertManagementAlerts.nodes;
+      },
       error() {
         this.errored = true;
       },
@@ -126,40 +127,55 @@ export default {
         :show-empty="true"
         :busy="loading"
         fixed
-        stacked="sm"
-        tbody-tr-class="table-row mb-4"
+        stacked="md"
       >
+        <template #cell(startedAt)="{ item }">
+          <time-ago :time="item.startedAt" />
+        </template>
+
+        <template #cell(endedAt)="{ item }">
+          <time-ago :time="item.endedAt" />
+        </template>
+
+        <template #cell(title)="{ item }">
+          <div class="gl-max-w-full text-truncate">{{ item.title }}</div>
+        </template>
+
         <template #empty>
           {{ s__('AlertManagement|No alerts to display.') }}
         </template>
+
         <template #table-busy>
           <gl-loading-icon size="lg" color="dark" class="mt-3" />
         </template>
       </gl-table>
     </div>
-    <template v-else>
-      <gl-empty-state
-        :title="s__('AlertManagement|Surface alerts in GitLab')"
-        :svg-path="emptyAlertSvgPath"
-      >
-        <template #description>
-          <div class="d-block">
-            <span>{{
-              s__(
-                'AlertManagement|Display alerts from all your monitoring tools directly within GitLab. Streamline the investigation of your alerts and the escalation of alerts to incidents.',
-              )
-            }}</span>
-            <a href="/help/user/project/operations/alert_management.html">
-              {{ s__('AlertManagement|More information') }}
-            </a>
-          </div>
-          <div class="d-block center pt-4">
-            <gl-button category="primary" variant="success" :href="enableAlertManagementPath">
-              {{ s__('AlertManagement|Authorize external service') }}
-            </gl-button>
-          </div>
-        </template>
-      </gl-empty-state>
-    </template>
+    <gl-empty-state
+      v-else
+      :title="__('AlertManagement|Surface alerts in GitLab')"
+      :svg-path="emptyAlertSvgPath"
+    >
+      <template #description>
+        <div class="d-block">
+          <span>{{
+            s__(
+              'AlertManagement|Display alerts from all your monitoring tools directly within GitLab. Streamline the investigation of your alerts and the escalation of alerts to incidents.',
+            )
+          }}</span>
+          <a href="/help/user/project/operations/alert_management.html" target="_blank">
+            {{ s__('AlertManagement|More information') }}
+          </a>
+        </div>
+        <div v-if="userCanEnableAlertManagement" class="d-block center pt-4">
+          <gl-deprecated-button
+            category="primary"
+            variant="success"
+            :href="enableAlertManagementPath"
+          >
+            {{ s__('AlertManagement|Authorize external service') }}
+          </gl-deprecated-button>
+        </div>
+      </template>
+    </gl-empty-state>
   </div>
 </template>

app/assets/javascripts/alert_management/details.js

+import Vue from 'vue';
+import AlertDetails from './components/alert_details.vue';
+
+export default selector => {
+  // eslint-disable-next-line no-new
+  new Vue({
+    el: selector,
+    components: {
+      AlertDetails,
+    },
+    render(createElement) {
+      return createElement('alert-details', {});
+    },
+  });
+};