Merge branch 'master' into feat/explore-project-topics

.codeclimate.yml

 ---
-engines:
+version: "2"
+plugins:
   bundler-audit:
     enabled: true
   duplication:
@@ -8,33 +9,22 @@ engines:
       languages:
         - ruby
         - javascript
-ratings:
-  paths:
-    - Gemfile.lock
-    - "**.erb"
-    - "**.haml"
-    - "**.rb"
-    - "**.rhtml"
-    - "**.slim"
-    - "**.inc"
-    - "**.js"
-    - "**.jsx"
-    - "**.module"
-exclude_paths:
-  - config/
-  - db/
-  - features/
-  - node_modules/
-  - spec/
-  - vendor/
+  rubocop:
+    enabled: false
+exclude_patterns:
+  - "{ee/,jh/,}config/"
+  - "{ee/,jh/,}db/"
+  - "**/log/"
+  - "**/node_modules/"
+  - "**/spec/"
+  - "**/tmp/"
+  - "**/vendor/"
   - .yarn-cache/
-  - tmp/
+  - backups/
   - builds/
   - coverage/
+  - file_hooks/
+  - plugins/
   - public/
   - shared/
   - webpack-report/
-  - log/
-  - backups/
-  - plugins/
-  - file_hooks/

.gitignore

@@ -74,6 +74,7 @@ eslint-report.html
 /.gitlab_kas_secret
 /webpack-report/
 /crystalball/
+/test_results/
 /deprecations/
 /knapsack/
 /rspec_flaky/

.gitlab-ci.yml

@@ -3,11 +3,10 @@ stages:
   - prepare
   - build-images
   - fixtures
+  - lint
   - test
   - post-test
-  - review-prepare
   - review
-  - dast
   - qa
   - post-qa
   - pages
@@ -17,7 +16,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.7.patched-golang-1.16-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36"
+  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36"
   tags:
     - gitlab-org
   # All jobs are interruptible by default

.gitlab/CODEOWNERS

@@ -26,7 +26,7 @@
 /doc/administration/troubleshooting @marcel.amirault @marcia @eread
 /doc/api/graphql/ @msedlakjakubowski @kpaizee
 /doc/api/graphql/reference/ @kpaizee
-/doc/api/group_activity_analytics.md @msedlakjakubowski
+/doc/api/group_activity_analytics.md @fneill
 /doc/ci/ @marcel.amirault @sselhorn
 /doc/ci/environments/ @rdickenson
 /doc/ci/services/ @sselhorn
@@ -34,7 +34,7 @@
 /doc/development/ @marcia
 /doc/development/documentation/ @cnorris @dianalogan
 /doc/development/i18n/ @ngaskill
-/doc/development/value_stream_analytics.md @msedlakjakubowski
+/doc/development/value_stream_analytics.md @fneill
 /doc/gitlab-basics/ @aqualls
 /doc/install/ @marcel.amirault
 /doc/operations/ @ngaskill @rdickenson
@@ -45,19 +45,19 @@
 /doc/topics/autodevops/ @marcia
 /doc/topics/git/ @aqualls
 /doc/update/ @marcel.amirault @marcia
-/doc/user/analytics/ @msedlakjakubowski @ngaskill
+/doc/user/analytics/ @fneill @ngaskill
 /doc/user/application_security/ @rdickenson
 /doc/user/application_security/container_scanning/ @ngaskill
 /doc/user/application_security/cluster_image_scanning/ @ngaskill
 /doc/user/clusters/ @marcia
 /doc/user/compliance/ @rdickenson @eread
 /doc/user/group/ @msedlakjakubowski
-/doc/user/group/devops_adoption/ @msedlakjakubowski
+/doc/user/group/devops_adoption/ @fneill
 /doc/user/group/epics/ @msedlakjakubowski
-/doc/user/group/insights/ @msedlakjakubowski
+/doc/user/group/insights/ @fneill
 /doc/user/group/iterations/ @msedlakjakubowski
 /doc/user/group/roadmap/ @msedlakjakubowski
-/doc/user/group/value_stream_analytics/ @msedlakjakubowski
+/doc/user/group/value_stream_analytics/ @fneill
 /doc/user/infrastructure/ @marcia
 /doc/user/packages/ @ngaskill
 /doc/user/packages/infrastructure_registry/ @marcia
@@ -76,6 +76,7 @@
 /doc/user/project/web_ide/index.md @aqualls
 /doc/user/project/wiki/index.md @aqualls
 /doc/user/search/ @marcia @aqualls
+/doc/user/workspace/ @fneill 
 
 [Docs Create]
 /doc/administration/file_hooks.md @aqualls
@@ -152,8 +153,8 @@
 /doc/api/invitations.md @kpaizee
 /doc/api/experiments.md @kpaizee
 /doc/development/experiment_guide/ @kpaizee
-/doc/development/snowplow/ @kpaizee
-/doc/development/service_ping/ @kpaizee
+/doc/development/snowplow/ @fneill
+/doc/development/service_ping/ @fneill
 /doc/user/admin_area/license.md @kpaizee
 
 [Frontend]

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

@@ -44,8 +44,8 @@ docs-lint markdown:
     - .default-retry
     - .docs:rules:docs-lint
   # When updating the image version here, update it in /scripts/lint-doc.sh too.
-  image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.14-vale-2.10.4-markdownlint-0.28.1
-  stage: test
+  image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.14-vale-2.12.0-markdownlint-0.29.0
+  stage: lint
   needs: []
   script:
     - scripts/lint-doc.sh
@@ -53,8 +53,8 @@ docs-lint markdown:
 docs-lint links:
   extends:
     - .docs:rules:docs-lint
-  image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.14-ruby-2.7.4-db71f027
-  stage: test
+  image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.14-ruby-2.7.4-0fae0f62
+  stage: lint
   needs: []
   script:
     # Prepare docs for build
@@ -71,7 +71,7 @@ ui-docs-links lint:
   extends:
     - .docs:rules:docs-lint
     - .static-analysis-base
-  stage: test
+  stage: lint
   needs: []
   script:
     - bundle exec haml-lint -i DocumentationLinks

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

@@ -11,7 +11,7 @@
     - .default-retry
     - .default-before_script
     - .assets-compile-cache
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7-git-2.31-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7-git-2.33-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36
   variables:
     SETUP_DB: "false"
     WEBPACK_VENDOR_DLL: "true"
@@ -71,6 +71,12 @@ compile-test-assets as-if-foss:
     - .frontend:rules:compile-test-assets-as-if-foss
     - .as-if-foss
 
+compile-test-assets as-if-jh:
+  extends:
+    - compile-test-assets
+    - .frontend:rules:compile-test-assets-as-if-jh
+  needs: ["add-jh-folder"]
+
 update-assets-compile-production-cache:
   extends:
     - compile-production-assets
@@ -112,7 +118,7 @@ update-storybook-yarn-cache:
     - .rails-cache
     - .use-pg12
   stage: fixtures
-  needs: ["setup-test-env", "retrieve-tests-metadata", "compile-test-assets"]
+  needs: ["setup-test-env", "retrieve-tests-metadata"]
   variables:
     WEBPACK_VENDOR_DLL: "true"
   script:
@@ -128,19 +134,38 @@ update-storybook-yarn-cache:
       - tmp/tests/frontend/
       - knapsack/
 
-# In gitlab-foss, generates FOSS fixtures. In gitlab, generates FOSS & EE fixtures.
-# That way, we don't need to have two separate jobs.
+# Builds FOSS, and EE fixtures in the EE project.
+# Builds FOSS fixtures in the FOSS project.
 rspec-all frontend_fixture:
   extends:
     - .frontend-fixtures-base
     - .frontend:rules:default-frontend-jobs
+  needs:
+    - !reference [.frontend-fixtures-base, needs]
+    - "compile-test-assets"
   parallel: 5
 
-rspec frontend_fixture as-if-foss:
+# Builds FOSS fixtures in the EE project, with the `ee/` folder removed (due to `as-if-foss`).
+rspec-all frontend_fixture as-if-foss:
   extends:
     - .frontend-fixtures-base
     - .frontend:rules:default-frontend-jobs-as-if-foss
     - .as-if-foss
+  needs:
+    - !reference [.frontend-fixtures-base, needs]
+    - "compile-test-assets as-if-foss"
+
+# Builds FOSS, EE, and JH fixtures in the EE project, with the `jh/` folder added (due to `as-if-jh`).
+rspec-all frontend_fixture as-if-jh:
+  extends:
+    - .frontend-fixtures-base
+    - .frontend:rules:default-frontend-jobs-as-if-jh
+  needs:
+    - !reference [.frontend-fixtures-base, needs]
+    - "compile-test-assets as-if-jh"
+    - "add-jh-folder"
+  script:
+    - echo "This job is currently doing nothing since there's no specific JH fixtures yet. To enable this job, remove this line."
 
 graphql-schema-dump:
   variables:
@@ -172,15 +197,6 @@ graphql-schema-dump:
     - *yarn-install
   stage: test
 
-eslint-as-if-foss:
-  extends:
-    - .frontend-test-base
-    - .frontend:rules:eslint-as-if-foss
-    - .as-if-foss
-  needs: []
-  script:
-    - run_timed_command "yarn run lint:eslint:all"
-
 .jest-base:
   extends: .frontend-test-base
   script:
@@ -190,9 +206,7 @@ jest:
   extends:
     - .jest-base
     - .frontend:rules:jest
-  needs:
-    - job: "detect-tests"
-    - job: "rspec-all frontend_fixture"
+  needs: ["rspec-all frontend_fixture"]
   artifacts:
     name: coverage-frontend
     expire_in: 31d
@@ -209,6 +223,9 @@ jest minimal:
   extends:
     - jest
     - .frontend:rules:jest:minimal
+  needs:
+    - !reference [jest, needs]
+    - "detect-tests"
   script:
     - run_timed_command "yarn jest:ci:minimal"
 
@@ -227,9 +244,17 @@ jest-as-if-foss:
     - .jest-base
     - .frontend:rules:default-frontend-jobs-as-if-foss
     - .as-if-foss
-  needs: ["rspec frontend_fixture as-if-foss"]
+  needs: ["rspec-all frontend_fixture as-if-foss"]
   parallel: 2
 
+jest-as-if-jh:
+  extends:
+    - .jest-base
+    - .frontend:rules:default-frontend-jobs-as-if-jh
+  needs: ["rspec-all frontend_fixture as-if-jh", "add-jh-folder"]
+  script:
+    - echo "This job is currently doing nothing since there's no specific JH Jest tests yet. To enable this job, remove this line."
+
 coverage-frontend:
   extends:
     - .default-retry
@@ -342,7 +367,7 @@ startup-css-check as-if-foss:
     - .frontend:rules:default-frontend-jobs-as-if-foss
   needs:
     - job: "compile-test-assets as-if-foss"
-    - job: "rspec frontend_fixture as-if-foss"
+    - job: "rspec-all frontend_fixture as-if-foss"
 
 .compile-storybook-base:
   extends:
@@ -351,14 +376,15 @@ startup-css-check as-if-foss:
   script:
     - *storybook-yarn-install
     - yarn run storybook:build
+  needs: ["graphql-schema-dump"]
 
 compile-storybook:
   extends:
     - .compile-storybook-base
     - .frontend:rules:default-frontend-jobs
   needs:
+    - !reference [.compile-storybook-base, needs]
     - job: "rspec-all frontend_fixture"
-    - job: "graphql-schema-dump"
   artifacts:
     name: storybook
     expire_in: 31d
@@ -372,5 +398,5 @@ compile-storybook as-if-foss:
     - .as-if-foss
     - .frontend:rules:default-frontend-jobs-as-if-foss
   needs:
-    - job: "graphql-schema-dump"
-    - job: "rspec frontend_fixture as-if-foss"
+    - !reference [.compile-storybook-base, needs]
+    - job: "rspec-all frontend_fixture as-if-foss"

.gitlab/ci/global.gitlab-ci.yml

@@ -10,6 +10,7 @@
 
 .default-before_script:
   before_script:
+    - echo $FOSS_ONLY
     - '[ "$FOSS_ONLY" = "1" ] && rm -rf ee/ qa/spec/ee/ qa/qa/specs/features/ee/ qa/qa/ee/ qa/qa/ee.rb'
     - export GOPATH=$CI_PROJECT_DIR/.go
     - mkdir -p $GOPATH
@@ -43,6 +44,7 @@
     prefix: "gitaly-binaries"
   paths:
     - tmp/tests/gitaly/_build/bin/
+    - tmp/tests/gitaly/_build/deps/git/install/
     - tmp/tests/gitaly/config.toml
     - tmp/tests/gitaly/gitaly2.config.toml
     - tmp/tests/gitaly/internal/
@@ -138,6 +140,10 @@
     - <<: *gitaly-binaries-cache
       policy: push  # We want to rebuild the cache from scratch to ensure stale dependencies are cleaned up.
 
+.ruby-cache:
+  cache:
+    - *ruby-gems-cache
+
 .rails-cache:
   cache:
     - *ruby-gems-cache
@@ -149,7 +155,12 @@
     - *node-modules-cache
     - *rubocop-cache
 
-.static-analysis-cache-push:
+.rubocop-job-cache:
+  cache:
+    - *ruby-gems-cache
+    - *rubocop-cache
+
+.rubocop-job-cache-push:
   cache:
     - *ruby-gems-cache  # We don't push this cache as it's already rebuilt by `update-setup-test-env-cache`
     - *rubocop-cache-push
@@ -202,7 +213,7 @@
     - *storybook-node-modules-cache-push
 
 .use-pg11:
-  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36"
+  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36"
   services:
     - name: postgres:11.6
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
@@ -211,7 +222,7 @@
     POSTGRES_HOST_AUTH_METHOD: trust
 
 .use-pg12:
-  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36"
+  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36"
   services:
     - name: postgres:12
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
@@ -220,7 +231,7 @@
     POSTGRES_HOST_AUTH_METHOD: trust
 
 .use-pg13:
-  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-13-graphicsmagick-1.3.36"
+  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-13-graphicsmagick-1.3.36"
   services:
     - name: postgres:13
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
@@ -229,34 +240,34 @@
     POSTGRES_HOST_AUTH_METHOD: trust
 
 .use-pg11-ee:
-  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36"
+  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36"
   services:
     - name: postgres:11.6
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
     - name: redis:5.0-alpine
-    - name: elasticsearch:7.11.1
+    - name: elasticsearch:7.14.2
       command: ["elasticsearch", "-E", "discovery.type=single-node"]
   variables:
     POSTGRES_HOST_AUTH_METHOD: trust
 
 .use-pg12-ee:
-  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36"
+  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36"
   services:
     - name: postgres:12
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
     - name: redis:5.0-alpine
-    - name: elasticsearch:7.11.1
+    - name: elasticsearch:7.14.2
       command: ["elasticsearch", "-E", "discovery.type=single-node"]
   variables:
     POSTGRES_HOST_AUTH_METHOD: trust
 
 .use-pg13-ee:
-  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-13-graphicsmagick-1.3.36"
+  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.patched-golang-1.16-git-2.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-13-graphicsmagick-1.3.36"
   services:
     - name: postgres:13
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
     - name: redis:5.0-alpine
-    - name: elasticsearch:7.11.1
+    - name: elasticsearch:7.14.2
       command: ["elasticsearch", "-E", "discovery.type=single-node"]
   variables:
     POSTGRES_HOST_AUTH_METHOD: trust

.gitlab/ci/qa.gitlab-ci.yml

@@ -57,12 +57,7 @@ update-qa-cache:
     - install_gitlab_gem
   script:
     - ./scripts/trigger-build omnibus
-
-package-and-qa:
-  extends:
-    - .package-and-qa-base
-    - .qa:rules:package-and-qa
-  # This job often times out, so temporarily use private runners and a long timeout: https://gitlab.com/gitlab-org/gitlab/-/issues/238563
+  # These jobs often time out, so temporarily use private runners and a long timeout: https://gitlab.com/gitlab-org/gitlab/-/issues/238563
   tags:
     - prm
   timeout: 4h
@@ -71,3 +66,34 @@ package-and-qa:
       artifacts: false
     - job: build-assets-image
       artifacts: false
+
+.package-and-qa-ff-base:
+  needs:
+    - detect-tests
+  variables:
+    CHANGED_FILES: tmp/changed_files.txt
+  script:
+    - export GITLAB_QA_OPTIONS="--set-feature-flags $(scripts/changed-feature-flags --files $(cat $CHANGED_FILES | tr ' ' ',') --state $QA_FF_STATE)"
+    - echo $GITLAB_QA_OPTIONS
+    - ./scripts/trigger-build omnibus
+
+package-and-qa:
+  extends:
+    - .package-and-qa-base
+    - .qa:rules:package-and-qa
+
+package-and-qa-ff-enabled:
+  extends:
+    - .package-and-qa-base
+    - .package-and-qa-ff-base
+    - .qa:rules:package-and-qa:feature-flags
+  variables:
+    QA_FF_STATE: "enable"
+
+package-and-qa-ff-disabled:
+  extends:
+    - .package-and-qa-base
+    - .package-and-qa-ff-base
+    - .qa:rules:package-and-qa:feature-flags
+  variables:
+    QA_FF_STATE: "disable"

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

@@ -26,6 +26,7 @@
 .decomposed-database-rspec:
   variables:
     DECOMPOSED_DB: "true"
+    GITLAB_LOAD_BALANCING_REUSE_PRIMARY_ci: "main"
 
 .rspec-base:
   extends: .rails-job-base
@@ -77,6 +78,12 @@
     - .use-pg12
   needs: ["setup-test-env", "retrieve-tests-metadata", "compile-test-assets as-if-foss", "detect-tests"]
 
+.rspec-base-pg12-as-if-jh:
+  extends:
+    - .rspec-base
+    - .use-pg12
+  needs: ["setup-test-env", "retrieve-tests-metadata", "compile-test-assets as-if-jh", "detect-tests", "add-jh-folder"]
+
 .rspec-base-pg13:
   extends:
     - .rspec-base
@@ -92,6 +99,11 @@
     - .rspec-base
     - .use-pg12-ee
 
+.rspec-jh-base-pg12:
+  extends:
+    - .rspec-base-pg12-as-if-jh
+    - .use-pg12-ee
+
 .rspec-ee-base-pg13:
   extends:
     - .rspec-base
@@ -113,6 +125,12 @@
     - .rspec-ee-base-geo
     - .use-pg12-ee
 
+.rspec-jh-base-geo-pg12:
+  extends:
+    - .rspec-jh-base-pg12
+  script:
+    - !reference [.rspec-ee-base-geo, script]
+
 .rspec-ee-base-geo-pg13:
   extends:
     - .rspec-ee-base-geo
@@ -165,10 +183,9 @@ setup-test-env:
   extends:
     - .rails-job-base
     - .setup-test-env-cache
-    - .rails:rules:code-backstage-qa
+    - .rails:rules:setup-test-env
   stage: prepare
   variables:
-    GITLAB_TEST_EAGER_LOAD: "0"
     SETUP_DB: "false"
   script:
     - run_timed_command "scripts/setup-test-env"
@@ -181,6 +198,7 @@ setup-test-env:
     paths:
       - config/secrets.yml
       - tmp/tests/gitaly/_build/bin/
+      - tmp/tests/gitaly/_build/deps/git/install
       - tmp/tests/gitaly/config.toml
       - tmp/tests/gitaly/gitaly2.config.toml
       - tmp/tests/gitaly/internal/
@@ -490,7 +508,11 @@ rspec:feature-flags:
     - .coverage-base
     - .rails:rules:rspec-feature-flags
   stage: post-test
-  needs: ["static-analysis"]
+  needs:
+    - job: "feature-flags-usage"
+    - job: "haml-lint foss"
+    - job: "haml-lint ee"
+      optional: true
   script:
     - !reference [.minimal-bundle-install, script]
     - if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]; then
@@ -577,6 +599,31 @@ rspec system pg12-as-if-foss decomposed:
     - .decomposed-database-rspec
     - .rails:rules:decomposed-databases
 
+rspec migration pg12-as-if-jh:
+  extends:
+    - .rspec-base-pg12-as-if-jh
+    - .rspec-base-migration
+    - .rails:rules:as-if-jh-rspec
+    - .rspec-migration-parallel
+
+rspec unit pg12-as-if-jh:
+  extends:
+    - .rspec-base-pg12-as-if-jh
+    - .rails:rules:as-if-jh-rspec
+    - .rspec-unit-parallel
+
+rspec integration pg12-as-if-jh:
+  extends:
+    - .rspec-base-pg12-as-if-jh
+    - .rails:rules:as-if-jh-rspec
+    - .rspec-integration-parallel
+
+rspec system pg12-as-if-jh:
+  extends:
+    - .rspec-base-pg12-as-if-jh
+    - .rails:rules:as-if-jh-rspec
+    - .rspec-system-parallel
+
 rspec-ee migration pg12:
   extends:
     - .rspec-ee-base-pg12
@@ -684,6 +731,83 @@ rspec-ee system pg12 geo minimal:
     - .minimal-rspec-tests
     - .rails:rules:ee-only-system:minimal
 
+rspec-ee migration pg12-as-if-jh:
+  extends:
+    - .rspec-jh-base-pg12
+    - .rspec-base-migration
+    - .rails:rules:as-if-jh-rspec
+    - .rspec-ee-migration-parallel
+
+rspec-ee unit pg12-as-if-jh:
+  extends:
+    - .rspec-jh-base-pg12
+    - .rails:rules:as-if-jh-rspec
+    - .rspec-ee-unit-parallel
+
+rspec-ee integration pg12-as-if-jh:
+  extends:
+    - .rspec-jh-base-pg12
+    - .rails:rules:as-if-jh-rspec
+    - .rspec-ee-integration-parallel
+
+rspec-ee system pg12-as-if-jh:
+  extends:
+    - .rspec-jh-base-pg12
+    - .rails:rules:as-if-jh-rspec
+    - .rspec-ee-system-parallel
+
+rspec-ee unit pg12-as-if-jh geo:
+  extends:
+    - .rspec-jh-base-geo-pg12
+    - .rails:rules:as-if-jh-rspec
+    - .rspec-ee-unit-geo-parallel
+
+rspec-ee integration pg12-as-if-jh geo:
+  extends:
+    - .rspec-jh-base-geo-pg12
+    - .rails:rules:as-if-jh-rspec
+
+rspec-ee system pg12-as-if-jh geo:
+  extends:
+    - .rspec-jh-base-geo-pg12
+    - .rails:rules:as-if-jh-rspec
+
+rspec-jh migration pg12-as-if-jh:
+  extends:
+    - .rspec-jh-base-pg12
+    - .rspec-base-migration
+    - .rails:rules:as-if-jh-rspec
+
+rspec-jh unit pg12-as-if-jh:
+  extends:
+    - .rspec-jh-base-pg12
+    - .rails:rules:as-if-jh-rspec
+
+rspec-jh integration pg12-as-if-jh:
+  extends:
+    - .rspec-jh-base-pg12
+    - .rails:rules:as-if-jh-rspec
+
+rspec-jh system pg12-as-if-jh:
+  extends:
+    - .rspec-jh-base-pg12
+    - .rails:rules:as-if-jh-rspec
+
+rspec-jh unit pg12-as-if-jh geo:
+  extends:
+    - .rspec-jh-base-geo-pg12
+    - .rails:rules:as-if-jh-rspec
+
+rspec-jh integration pg12-as-if-jh geo:
+  extends:
+    - .rspec-jh-base-geo-pg12
+    - .rails:rules:as-if-jh-rspec
+
+rspec-jh system pg12-as-if-jh geo:
+  extends:
+    - .rspec-jh-base-geo-pg12
+    - .rails:rules:as-if-jh-rspec
+
 db:rollback geo:
   extends:
     - db:rollback
@@ -884,5 +1008,24 @@ fail-pipeline-early:
     - install_gitlab_gem
   script:
     - fail_pipeline_early
+
+rspec rspec-pg12-rerun-previous-failed-tests:
+  extends:
+    - .rspec-base-pg12
+    - .rails:rules:rerun-previous-failed-tests
+  stage: test
+  needs: ["setup-test-env", "compile-test-assets", "detect-previous-failed-tests"]
+  script:
+    - !reference [.base-script, script]
+    - rspec_rerun_previous_failed_tests tmp/previous_failed_tests/rspec_failed_files.txt
+
+rspec rspec-ee-pg12-rerun-previous-failed-tests:
+  extends:
+    - "rspec rspec-pg12-rerun-previous-failed-tests"
+    - .rspec-ee-base-pg12
+  script:
+    - !reference [.base-script, script]
+    - rspec_rerun_previous_failed_tests tmp/previous_failed_tests/rspec_ee_failed_files.txt
+
 # EE: Canonical MR pipelines
 ##################################################

.gitlab/ci/reports.gitlab-ci.yml

@@ -9,6 +9,7 @@ code_quality:
   extends:
     - .default-retry
     - .use-docker-in-docker
+  stage: lint
   artifacts:
     paths:
       - gl-code-quality-report.json  # GitLab-specific
@@ -20,6 +21,7 @@ code_quality:
   extends:
     - .default-retry
     - sast
+  stage: lint
   needs: []
   artifacts:
     paths:
@@ -32,15 +34,9 @@ code_quality:
 
 brakeman-sast:
   rules: !reference [".reports:rules:brakeman-sast", rules]
-  allow_failure: true
-
-nodejs-scan-sast:
-  rules: !reference [".reports:rules:nodejs-scan-sast", rules]
-  allow_failure: true
 
 semgrep-sast:
   rules: !reference [".reports:rules:semgrep-sast", rules]
-  allow_failure: true
 
 gosec-sast:
   variables:
@@ -57,10 +53,10 @@ gosec-sast:
     paths:
       - vendor/go
   rules: !reference [".reports:rules:gosec-sast", rules]
-  allow_failure: true
 
 .secret-analyzer:
   extends: .default-retry
+  stage: lint
   needs: []
   artifacts:
     paths:
@@ -69,16 +65,17 @@ gosec-sast:
 
 secret_detection:
   rules: !reference [".reports:rules:secret_detection", rules]
-  allow_failure: true
 
 .ds-analyzer:
   # We need to re-`extends` from `dependency_scanning` as the `extends` here overrides the one from the template.
   extends:
     - .default-retry
     - dependency_scanning
+  stage: lint
   needs: []
   variables:
     DS_EXCLUDED_PATHS: "qa/qa/ee/fixtures/secure_premade_reports, spec, ee/spec, tmp"  # GitLab-specific
+    DS_EXCLUDED_ANALYZERS: "gemnasium-maven"
   artifacts:
     paths:
       - gl-dependency-scanning-report.json  # GitLab-specific
@@ -88,25 +85,16 @@ gemnasium-dependency_scanning:
   before_script:
     # git-lfs is needed for auto-remediation
     - apk add git-lfs
-  after_script:
-    # Post-processing
-    - apk add jq
-    # Lower execa severity based on https://gitlab.com/gitlab-org/gitlab/-/issues/223859#note_452922390
-    - jq '(.vulnerabilities[] | select (.cve == "yarn.lock:execa:gemnasium:05cfa2e8-2d0c-42c1-8894-638e2f12ff3d")).severity = "Medium"' gl-dependency-scanning-report.json > temp.json && mv temp.json gl-dependency-scanning-report.json
   rules: !reference [".reports:rules:gemnasium-dependency_scanning", rules]
-  allow_failure: true
 
 bundler-audit-dependency_scanning:
   rules: !reference [".reports:rules:bundler-audit-dependency_scanning", rules]
-  allow_failure: true
 
 retire-js-dependency_scanning:
   rules: !reference [".reports:rules:retire-js-dependency_scanning", rules]
-  allow_failure: true
 
 gemnasium-python-dependency_scanning:
   rules: !reference [".reports:rules:gemnasium-python-dependency_scanning", rules]
-  allow_failure: true
 
 # Analyze dependencies for malicious behavior
 # See https://gitlab.com/gitlab-com/gl-security/security-research/package-hunter
@@ -150,8 +138,8 @@ package_hunter-bundler:
 
 license_scanning:
   extends: .default-retry
+  stage: lint
   needs: []
   artifacts:
     expire_in: 1 week  # GitLab-specific
   rules: !reference [".reports:rules:license_scanning", rules]
-  allow_failure: true

.gitlab/ci/review-apps/main.gitlab-ci.yml

+stages:
+  - prepare
+  - deploy
+  - qa
+  - post-qa
+  - dast
+
+include:
+  - local: .gitlab/ci/global.gitlab-ci.yml
+  - local: .gitlab/ci/rules.gitlab-ci.yml
+  - local: .gitlab/ci/review-apps/qa.gitlab-ci.yml
+  - local: .gitlab/ci/review-apps/dast.gitlab-ci.yml
+
+.base-before_script: &base-before_script
+  - source ./scripts/utils.sh
+  - source ./scripts/review_apps/review-apps.sh
+  - install_api_client_dependencies_with_apk
+
+review-build-cng:
+  extends:
+    - .default-retry
+    - .review:rules:review-build-cng
+  image: ${GITLAB_DEPENDENCY_PROXY}ruby:2.7-alpine3.13
+  stage: prepare
+  variables:
+    CNG_PROJECT_ACCESS_TOKEN: "${CNG_MIRROR_PROJECT_ACCESS_TOKEN}"  # "Multi-pipeline (from 'gitlab-org/gitlab' 'review-build-cng' job)" at https://gitlab.com/gitlab-org/build/CNG-mirror/-/settings/access_tokens
+    CNG_PROJECT_PATH: "gitlab-org/build/CNG-mirror"
+  before_script:
+    - source ./scripts/utils.sh
+    - install_gitlab_gem
+  script:
+    - ./scripts/trigger-build cng
+
+.review-workflow-base:
+  extends:
+    - .default-retry
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-helm3.5-kubectl1.17
+  variables:
+    HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
+    DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
+    GITLAB_HELM_CHART_REF: "v5.2.1"
+  environment:
+    name: review/${CI_COMMIT_REF_SLUG}${FREQUENCY}
+    url: https://gitlab-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}
+    on_stop: review-stop
+    auto_stop_in: 48 hours
+
+review-deploy:
+  extends:
+    - .review-workflow-base
+    - .review:rules:review-deploy
+  stage: deploy
+  needs: ["review-build-cng"]
+  resource_group: "review/${CI_COMMIT_REF_NAME}"
+  before_script:
+    - export GITLAB_SHELL_VERSION=$(<GITLAB_SHELL_VERSION)
+    - export GITALY_VERSION=$(<GITALY_SERVER_VERSION)
+    - export GITLAB_WORKHORSE_VERSION=$(<GITLAB_WORKHORSE_VERSION)
+    - echo "${CI_ENVIRONMENT_URL}" > environment_url.txt
+    - *base-before_script
+  script:
+    - check_kube_domain
+    - download_chart
+    - date
+    - deploy || (display_deployment_debug && exit 1)
+    - verify_deploy || exit 1
+    - disable_sign_ups || (delete_release && exit 1)
+  after_script:
+    # Run seed-dast-test-data.sh only when DAST_RUN is set to true. This is to pupulate review app with data for DAST scan.
+    # Set DAST_RUN to true when jobs are manually scheduled.
+    - if [ "$DAST_RUN" == "true" ]; then source scripts/review_apps/seed-dast-test-data.sh; TRACE=1 trigger_proj_user_creation; fi
+  artifacts:
+    paths:
+      - environment_url.txt
+      - curl_output.txt
+    expire_in: 7 days
+    when: always
+
+.review-stop-base:
+  extends: .review-workflow-base
+  environment:
+    action: stop
+  dependencies: []
+  variables:
+    # We're cloning the repo instead of downloading the script for now
+    # because some repos are private and CI_JOB_TOKEN cannot access files.
+    # See https://gitlab.com/gitlab-org/gitlab/issues/191273
+    GIT_DEPTH: 1
+  before_script:
+    - *base-before_script
+
+review-delete-deployment:
+  extends:
+    - .review-stop-base
+    - .review:rules:review-delete-deployment
+  stage: prepare
+  script:
+    - delete_release
+
+review-stop:
+  extends:
+    - .review-stop-base
+    - .review:rules:review-stop
+  stage: deploy
+  needs: []
+  script:
+    - delete_k8s_release_namespace

.gitlab/ci/review-apps/qa.gitlab-ci.yml

+.review-qa-base:
+  extends:
+    - .use-docker-in-docker
+  image:
+    name: ${QA_IMAGE}
+    entrypoint: [""]
+  stage: qa
+  needs: ["review-deploy"]
+  variables:
+    QA_DEBUG: "true"
+    QA_CAN_TEST_GIT_PROTOCOL_V2: "false"
+    QA_GENERATE_ALLURE_REPORT: "true"
+    GITLAB_USERNAME: "root"
+    GITLAB_PASSWORD: "${REVIEW_APPS_ROOT_PASSWORD}"
+    GITLAB_ADMIN_USERNAME: "root"
+    GITLAB_ADMIN_PASSWORD: "${REVIEW_APPS_ROOT_PASSWORD}"
+    GITLAB_QA_ADMIN_ACCESS_TOKEN: "${REVIEW_APPS_ROOT_TOKEN}"
+    GITHUB_ACCESS_TOKEN: "${REVIEW_APPS_QA_GITHUB_ACCESS_TOKEN}"
+    EE_LICENSE: "${REVIEW_APPS_EE_LICENSE}"
+    SIGNUP_DISABLED: "true"
+  before_script:
+    # Use $CI_MERGE_REQUEST_SOURCE_BRANCH_SHA so that GitLab image built in omnibus-gitlab-mirror and QA image are in sync.
+    - if [ -n "$CI_MERGE_REQUEST_SOURCE_BRANCH_SHA" ]; then
+        git checkout -f ${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA};
+      fi
+    - export CI_ENVIRONMENT_URL="$(cat environment_url.txt)"
+    - echo "${CI_ENVIRONMENT_URL}"
+    - cd qa
+  artifacts:
+    paths:
+      - qa/tmp
+    expire_in: 7 days
+    when: always
+
+.allure-report-base:
+  image:
+    name: ${GITLAB_DEPENDENCY_PROXY}andrcuns/allure-report-publisher:0.3.6
+    entrypoint: [""]
+  stage: post-qa
+  variables:
+    GIT_STRATEGY: none
+    STORAGE_CREDENTIALS: $QA_ALLURE_REPORT_GCS_CREDENTIALS
+    GITLAB_AUTH_TOKEN: $GITLAB_QA_MR_ALLURE_REPORT_TOKEN
+    ALLURE_PROJECT_PATH: $CI_PROJECT_PATH
+    ALLURE_MERGE_REQUEST_IID: $CI_MERGE_REQUEST_IID
+  allow_failure: true
+  script:
+    - |
+      allure-report-publisher upload gcs \
+        --results-glob="qa/tmp/allure-results/*" \
+        --bucket="gitlab-qa-allure-reports" \
+        --prefix="$ALLURE_REPORT_PATH_PREFIX/$CI_COMMIT_REF_SLUG" \
+        --update-pr="comment" \
+        --copy-latest \
+        --ignore-missing-results \
+        --color
+
+review-qa-smoke:
+  extends:
+    - .review-qa-base
+    - .review:rules:review-qa-smoke
+  retry: 1  # This is confusing but this means "2 runs at max".
+  variables:
+    QA_RUN_TYPE: review-qa-smoke
+  script:
+    - bin/test Test::Instance::Smoke "${CI_ENVIRONMENT_URL}"
+
+review-qa-all:
+  extends:
+    - .review-qa-base
+    - .review:rules:review-qa-all
+  variables:
+    QA_RUN_TYPE: review-qa-all
+  parallel: 5
+  script:
+    - export KNAPSACK_REPORT_PATH=knapsack/master_report.json
+    - export KNAPSACK_TEST_FILE_PATTERN=qa/specs/features/**/*_spec.rb
+    - |
+      bin/test Test::Instance::All "${CI_ENVIRONMENT_URL}" \
+        -- \
+        --color --format documentation \
+        --format RspecJunitFormatter --out tmp/rspec.xml
+  artifacts:
+    reports:
+      junit: qa/tmp/rspec.xml
+
+review-performance:
+  extends:
+    - .default-retry
+    - .review:rules:review-performance
+  image:
+    name: sitespeedio/sitespeed.io
+    entrypoint: [""]
+  stage: qa
+  needs: ["review-deploy"]
+  before_script:
+    - export CI_ENVIRONMENT_URL="$(cat environment_url.txt)"
+    - echo "${CI_ENVIRONMENT_URL}"
+    - mkdir -p gitlab-exporter
+    - wget -O ./gitlab-exporter/index.js https://gitlab.com/gitlab-org/gl-performance/raw/master/index.js
+    - mkdir -p sitespeed-results
+  script:
+    - /start.sh --plugins.add ./gitlab-exporter --outputFolder sitespeed-results "${CI_ENVIRONMENT_URL}"
+  after_script:
+    - mv sitespeed-results/data/performance.json performance.json
+  artifacts:
+    paths:
+      - sitespeed-results/
+    reports:
+      performance: performance.json
+    expire_in: 31d
+
+allure-report-qa-smoke:
+  extends:
+    - .allure-report-base
+    - .review:rules:review-qa-smoke-report
+  needs: ["review-qa-smoke"]
+  variables:
+    ALLURE_REPORT_PATH_PREFIX: gitlab-review-smoke
+    ALLURE_JOB_NAME: review-qa-smoke
+
+allure-report-qa-all:
+  extends:
+    - .allure-report-base
+    - .review:rules:review-qa-all-report
+  needs: ["review-qa-all"]
+  variables:
+    ALLURE_REPORT_PATH_PREFIX: gitlab-review-all
+    ALLURE_JOB_NAME: review-qa-all

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

@@ -16,229 +16,25 @@ review-cleanup:
     - ruby -rrubygems scripts/review_apps/automated_cleanup.rb
     - gcp_cleanup
 
-.base-before_script: &base-before_script
-  - source ./scripts/utils.sh
-  - source ./scripts/review_apps/review-apps.sh
-  - install_api_client_dependencies_with_apk
-
-review-build-cng:
+start-review-app-pipeline:
   extends:
-    - .default-retry
-    - .review:rules:review-build-cng
-  image: ${GITLAB_DEPENDENCY_PROXY}ruby:2.7-alpine3.13
-  stage: review-prepare
+    - .review:rules:review-app-pipeline
+  stage: review
   needs:
-    - job: compile-production-assets
+    - job: build-assets-image
       artifacts: false
-  variables:
-    CNG_PROJECT_ACCESS_TOKEN: "${CNG_MIRROR_PROJECT_ACCESS_TOKEN}"  # "Multi-pipeline (from 'gitlab-org/gitlab' 'review-build-cng' job)" at https://gitlab.com/gitlab-org/build/CNG-mirror/-/settings/access_tokens
-    CNG_PROJECT_PATH: "gitlab-org/build/CNG-mirror"
-  before_script:
-    - source ./scripts/utils.sh
-    - install_gitlab_gem
-  script:
-    - ./scripts/trigger-build cng
-
-.review-workflow-base:
-  extends:
-    - .default-retry
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-helm3.5-kubectl1.17
-  variables:
-    HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
-    DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
-    GITLAB_HELM_CHART_REF: "v5.2.1"
-  environment:
-    name: review/${CI_COMMIT_REF_SLUG}${FREQUENCY}
-    url: https://gitlab-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}
-    on_stop: review-stop
-    auto_stop_in: 48 hours
-
-review-deploy:
-  extends:
-    - .review-workflow-base
-    - .review:rules:review-deploy
-  stage: review
-  needs: ["review-build-cng"]
-  resource_group: "review/${CI_COMMIT_REF_NAME}"
-  before_script:
-    - export GITLAB_SHELL_VERSION=$(<GITLAB_SHELL_VERSION)
-    - export GITALY_VERSION=$(<GITALY_SERVER_VERSION)
-    - export GITLAB_WORKHORSE_VERSION=$(<GITLAB_WORKHORSE_VERSION)
-    - echo "${CI_ENVIRONMENT_URL}" > environment_url.txt
-    - *base-before_script
-  script:
-    - check_kube_domain
-    - download_chart
-    - date
-    - deploy || (display_deployment_debug && exit 1)
-    - verify_deploy || exit 1
-    - disable_sign_ups || (delete_release && exit 1)
-  after_script:
-    # Run seed-dast-test-data.sh only when DAST_RUN is set to true. This is to pupulate review app with data for DAST scan.
-    # Set DAST_RUN to true when jobs are manually scheduled.
-    - if [ "$DAST_RUN" == "true" ]; then source scripts/review_apps/seed-dast-test-data.sh; TRACE=1 trigger_proj_user_creation; fi
-  artifacts:
-    paths:
-      - environment_url.txt
-      - curl_output.txt
-    expire_in: 7 days
-    when: always
-
-.review-stop-base:
-  extends: .review-workflow-base
-  environment:
-    action: stop
-  dependencies: []
-  variables:
-    # We're cloning the repo instead of downloading the script for now
-    # because some repos are private and CI_JOB_TOKEN cannot access files.
-    # See https://gitlab.com/gitlab-org/gitlab/issues/191273
-    GIT_DEPTH: 1
-  before_script:
-    - *base-before_script
-
-review-delete-deployment:
-  extends:
-    - .review-stop-base
-    - .review:rules:review-delete-deployment
-  stage: prepare
-  script:
-    - delete_release
-
-review-stop:
-  extends:
-    - .review-stop-base
-    - .review:rules:review-stop
-  stage: post-qa
-  script:
-    - delete_k8s_release_namespace
-
-.review-qa-base:
-  extends:
-    - .use-docker-in-docker
-  image:
-    name: ${QA_IMAGE}
-    entrypoint: [""]
-  stage: qa
-  needs: ["build-qa-image", "review-deploy"]
-  variables:
-    QA_DEBUG: "true"
-    QA_CAN_TEST_GIT_PROTOCOL_V2: "false"
-    QA_GENERATE_ALLURE_REPORT: "true"
-    GITLAB_USERNAME: "root"
-    GITLAB_PASSWORD: "${REVIEW_APPS_ROOT_PASSWORD}"
-    GITLAB_ADMIN_USERNAME: "root"
-    GITLAB_ADMIN_PASSWORD: "${REVIEW_APPS_ROOT_PASSWORD}"
-    GITHUB_ACCESS_TOKEN: "${REVIEW_APPS_QA_GITHUB_ACCESS_TOKEN}"
-    EE_LICENSE: "${REVIEW_APPS_EE_LICENSE}"
-    SIGNUP_DISABLED: "true"
-  before_script:
-    # Use $CI_MERGE_REQUEST_SOURCE_BRANCH_SHA so that GitLab image built in omnibus-gitlab-mirror and QA image are in sync.
-    - if [ -n "$CI_MERGE_REQUEST_SOURCE_BRANCH_SHA" ]; then
-        git checkout -f ${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA};
-      fi
-    - export CI_ENVIRONMENT_URL="$(cat environment_url.txt)"
-    - echo "${CI_ENVIRONMENT_URL}"
-    - cd qa
-  artifacts:
-    paths:
-      - qa/tmp
-    expire_in: 7 days
-    when: always
-
-.allure-report-base:
-  image:
-    name: ${GITLAB_DEPENDENCY_PROXY}andrcuns/allure-report-publisher:0.3.4
-    entrypoint: [""]
-  stage: post-qa
-  variables:
-    GIT_STRATEGY: none
-    STORAGE_CREDENTIALS: $QA_ALLURE_REPORT_GCS_CREDENTIALS
-    GITLAB_AUTH_TOKEN: $GITLAB_QA_MR_ALLURE_REPORT_TOKEN
-  allow_failure: true
-  script:
-    - |
-      allure-report-publisher upload gcs \
-        --results-glob="qa/tmp/allure-results/*" \
-        --bucket="gitlab-qa-allure-reports" \
-        --prefix="$ALLURE_REPORT_PATH_PREFIX/$CI_COMMIT_REF_SLUG" \
-        --update-pr="comment" \
-        --copy-latest \
-        --ignore-missing-results \
-        --color
-
-review-qa-smoke:
-  extends:
-    - .review-qa-base
-    - .review:rules:review-qa-smoke
-  retry: 1  # This is confusing but this means "2 runs at max".
-  variables:
-    QA_RUN_TYPE: review-qa-smoke
-  script:
-    - bin/test Test::Instance::Smoke "${CI_ENVIRONMENT_URL}"
-
-review-qa-all:
-  extends:
-    - .review-qa-base
-    - .review:rules:review-qa-all
-  parallel: 5
-  variables:
-    QA_RUN_TYPE: review-qa-all
-  script:
-    - export KNAPSACK_REPORT_PATH=knapsack/master_report.json
-    - export KNAPSACK_TEST_FILE_PATTERN=qa/specs/features/**/*_spec.rb
-    - |
-      bin/test Test::Instance::All "${CI_ENVIRONMENT_URL}" \
-        -- \
-        --color --format documentation \
-        --format RspecJunitFormatter --out tmp/rspec.xml
-  artifacts:
-    reports:
-      junit: qa/tmp/rspec.xml
-
-review-performance:
-  extends:
-    - .default-retry
-    - .review:rules:review-performance
-  image:
-    name: sitespeedio/sitespeed.io
-    entrypoint: [""]
-  stage: qa
-  needs: ["review-deploy"]
-  before_script:
-    - export CI_ENVIRONMENT_URL="$(cat environment_url.txt)"
-    - echo "${CI_ENVIRONMENT_URL}"
-    - mkdir -p gitlab-exporter
-    - wget -O ./gitlab-exporter/index.js https://gitlab.com/gitlab-org/gl-performance/raw/master/index.js
-    - mkdir -p sitespeed-results
-  script:
-    - /start.sh --plugins.add ./gitlab-exporter --outputFolder sitespeed-results "${CI_ENVIRONMENT_URL}"
-  after_script:
-    - mv sitespeed-results/data/performance.json performance.json
-  artifacts:
-    paths:
-      - sitespeed-results/
-    reports:
-      performance: performance.json
-    expire_in: 31d
-
-allure-report-qa-smoke:
-  extends:
-    - .allure-report-base
-    - .review:rules:review-qa-smoke-report
-  needs: ["review-qa-smoke"]
-  variables:
-    ALLURE_REPORT_PATH_PREFIX: gitlab-review-smoke
-    ALLURE_JOB_NAME: review-qa-smoke
-
-allure-report-qa-all:
-  extends:
-    - .allure-report-base
-    - .review:rules:review-qa-all-report
-  needs: ["review-qa-all"]
-  variables:
-    ALLURE_REPORT_PATH_PREFIX: gitlab-review-all
-    ALLURE_JOB_NAME: review-qa-all
+    - job: build-qa-image
+      artifacts: false
+  # These variables are set in the pipeline schedules.
+  # They need to be explicitly passed on to the child pipeline.
+  # https://docs.gitlab.com/ee/ci/pipelines/multi_project_pipelines.html#pass-cicd-variables-to-a-downstream-pipeline-by-using-the-variables-keyword
+  variables:
+    FREQUENCY: $FREQUENCY
+    DAST_RUN: $DAST_RUN
+  trigger:
+    include:
+      - local: .gitlab/ci/review-apps/main.gitlab-ci.yml
+    strategy: depend
 
 danger-review:
   extends:

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

@@ -101,3 +101,36 @@ detect-tests as-if-foss:
     MATCHED_TESTS_FILE: tmp/matching_foss_tests.txt
   before_script:
     - '[ "$FOSS_ONLY" = "1" ] && rm -rf ee/ qa/spec/ee/ qa/qa/specs/features/ee/ qa/qa/ee/ qa/qa/ee.rb'
+
+detect-previous-failed-tests:
+  extends:
+    - .detect-test-base
+    - .rails:rules:detect-previous-failed-tests
+  variables:
+    PREVIOUS_FAILED_TESTS_DIR: tmp/previous_failed_tests/
+    RSPEC_PG_REGEX: /rspec .+ pg12( .+)?/
+    RSPEC_EE_PG_REGEX: /rspec-ee .+ pg12( .+)?/
+  script:
+    - source ./scripts/utils.sh
+    - source ./scripts/rspec_helpers.sh
+    - retrieve_previous_failed_tests ${PREVIOUS_FAILED_TESTS_DIR} "${RSPEC_PG_REGEX}" "${RSPEC_EE_PG_REGEX}"
+  artifacts:
+    expire_in: 7d
+    paths:
+      - ${PREVIOUS_FAILED_TESTS_DIR}
+
+add-jh-folder:
+  extends: .setup:rules:add-jh-folder
+  image: ${GITLAB_DEPENDENCY_PROXY}alpine:edge
+  stage: prepare
+  before_script:
+    - apk add --no-cache --update curl bash
+  script:
+    - curl --location -o "jh-folder.tar.gz" "https://gitlab.com/gitlab-jh/gitlab/-/archive/main-jh/gitlab-main-jh.tar.gz?path=jh"
+    - tar -xf "jh-folder.tar.gz"
+    - mv gitlab-main-jh-jh/jh/ ./
+    - ls -l jh/
+  artifacts:
+    expire_in: 2d
+    paths:
+      - jh/

.gitlab/ci/static-analysis.gitlab-ci.yml

@@ -2,7 +2,7 @@
   extends:
     - .default-retry
     - .default-before_script
-    - .static-analysis-cache
+  stage: lint
   needs: []
   variables:
     SETUP_DB: "false"
@@ -14,7 +14,7 @@
 update-static-analysis-cache:
   extends:
     - .static-analysis-base
-    - .static-analysis-cache-push
+    - .rubocop-job-cache-push
     - .shared:rules:update-cache
   stage: prepare
   script:
@@ -23,31 +23,87 @@ update-static-analysis-cache:
 static-analysis:
   extends:
     - .static-analysis-base
+    - .static-analysis-cache
     - .static-analysis:rules:ee-and-foss
-  stage: test
-  parallel: 4
+  parallel: 2
   script:
     - run_timed_command "retry yarn install --frozen-lockfile"
     - scripts/static-analysis
-  artifacts:
-    expire_in: 31d
-    when: always
-    paths:
-      - tmp/feature_flags/
 
-static-analysis-with-database:
+static-analysis as-if-foss:
+  extends:
+    - static-analysis
+    - .static-analysis:rules:as-if-foss
+    - .as-if-foss
+
+static-verification-with-database:
   extends:
     - .static-analysis-base
+    - .rubocop-job-cache
     - .static-analysis:rules:ee-and-foss
     - .use-pg12
-  stage: test
   script:
     - bundle exec rake lint:static_verification_with_database
   variables:
     SETUP_DB: "true"
 
-static-analysis as-if-foss:
+eslint:
   extends:
-    - static-analysis
-    - .static-analysis:rules:as-if-foss
+    - .static-analysis-base
+    - .yarn-cache
+    - .static-analysis:rules:ee
+  needs: []
+  variables:
+    USE_BUNDLE_INSTALL: "false"
+  script:
+    - run_timed_command "retry yarn install --frozen-lockfile"
+    - run_timed_command "yarn run lint:eslint:all"
+
+eslint as-if-foss:
+  extends:
+    - eslint
+    - .frontend:rules:eslint-as-if-foss
     - .as-if-foss
+
+haml-lint foss:
+  extends:
+    - .static-analysis-base
+    - .ruby-cache
+    - .static-analysis:rules:ee-and-foss
+  script:
+    - run_timed_command "bin/rake 'haml_lint[app/views]'"
+  artifacts:
+    expire_in: 31d
+    when: always
+    paths:
+      - tmp/feature_flags/
+
+haml-lint ee:
+  extends:
+    - "haml-lint foss"
+    - .static-analysis:rules:ee
+  script:
+    - run_timed_command "bin/rake 'haml_lint[ee/app/views]'"
+
+rubocop:
+  extends:
+    - .static-analysis-base
+    - .rubocop-job-cache
+    - .static-analysis:rules:ee-and-foss
+  script:
+    - run_timed_command "bundle exec rubocop --parallel"
+
+feature-flags-usage:
+  extends:
+    - .static-analysis-base
+    - .rubocop-job-cache
+    - .static-analysis:rules:ee-and-foss
+  script:
+    # We need to disable the cache for this cop since it creates files under tmp/feature_flags/*.used,
+    # the cache would prevent these files from being created.
+    - run_timed_command "bundle exec rubocop --only Gitlab/MarkUsedFeatureFlags --cache false"
+  artifacts:
+    expire_in: 31d
+    when: always
+    paths:
+      - tmp/feature_flags/

.gitlab/ci/workhorse.gitlab-ci.yml

@@ -9,24 +9,21 @@ workhorse:verify:
 
 .workhorse:test:
   extends: .workhorse:rules:workhorse
-  services:
-    - name: registry.gitlab.com/gitlab-org/build/cng/gitaly:latest
-      # Disable the hooks so we don't have to stub the GitLab API
-      command: ["/usr/bin/env", "GITALY_TESTING_NO_GIT_HOOKS=1", "/scripts/process-wrapper"]
-      alias: gitaly
   variables:
-    GITALY_ADDRESS: "tcp://gitaly:8075"
+    GITALY_ADDRESS: "tcp://127.0.0.1:8075"
   stage: test
-  needs: []
+  needs:
+    - setup-test-env
   script:
     - go version
     - apt-get update && apt-get -y install libimage-exiftool-perl
+    - scripts/gitaly-test-build
     - make -C workhorse test
 
 workhorse:test using go 1.16:
   extends: .workhorse:test
-  image: ${GITLAB_DEPENDENCY_PROXY}golang:1.16
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7-golang-1.16-git-2.31
 
 workhorse:test using go 1.17:
   extends: .workhorse:test
-  image: ${GITLAB_DEPENDENCY_PROXY}golang:1.17
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7-golang-1.17-git-2.31

.gitlab/ci/yaml.gitlab-ci.yml

@@ -5,7 +5,7 @@ lint-yaml:
     - .default-retry
     - .yaml-lint:rules
   image: pipelinecomponents/yamllint:latest
-  stage: test
+  stage: lint
   needs: []
   variables:
     LINT_PATHS: .gitlab-ci.yml .gitlab/ci lib/gitlab/ci/templates

.gitlab/issue_templates/Audit Event Proposal.md

@@ -9,5 +9,5 @@
 <!-- Describe the audit event you are proposing should be added, including any details of what should be captured, how, and why. -->
 
 /label ~"Category:Audit Events"
-/label ~"feature"
+/label ~"type::feature"
 /label ~"group::compliance"

.gitlab/issue_templates/Bug.md

@@ -2,10 +2,10 @@
 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 "type::bug" label:
 
 - https://gitlab.com/gitlab-org/gitlab/issues?label_name%5B%5D=regression
-- https://gitlab.com/gitlab-org/gitlab/issues?label_name%5B%5D=bug
+- https://gitlab.com/gitlab-org/gitlab/issues?label_name%5B%5D=type::bug
 
 and verify the issue you're about to submit isn't a duplicate.
 --->
@@ -82,4 +82,4 @@ will also determine whether the bug is fixed in a more recent version. -->
 
 <!-- If you can, link to the line of code that might be responsible for the problem. -->
 
-/label ~bug
+/label ~"type::bug"

.gitlab/issue_templates/Deprecations.md

@@ -41,7 +41,11 @@ Which tier is this feature available in?
 
 ### Deprecation Milestone
 
-<!-- In which milestone will this deprecation happen? -->
+<!-- In which milestone will this deprecation be announced ? -->
+
+### Planned Removal  Milestone
+
+<!-- In which milestone will the feature or functionality be removed and announced? -->
 
 ### Links
 

.gitlab/issue_templates/Experiment Implementation.md

+<!-- Title suggestion: Experiment Implementation: [description] -->
+
+# Experiment Summary
+<!-- Quick rundown of what is being done -->
+
+# Design
+<!-- This should include the contexts that determine the reproducibility (stickiness) of an experiment. This means that if you want the same behavior for a user, the context would be user, or if you want all users when viewing a specific project, the context would be the project being viewed, etc. -->
+
+# Rollout strategy
+<!-- This is currently called A/B test, which isn't accurate for multi-variants. Let's call this rollout strategy. It should outline the percentages for variants and if there's more than one step to this, each of those steps and the timing for those steps (e.g. 30 days after initial rollout). -->
+
+# Inclusions and exclusions
+<!-- These would be the rules for which given context (and are limited to context or resolvable at experiment time details) is included or excluded from the test. An example of this would be to only run an experiment on groups less than N number of days old. -->
+
+# Segmentation 
+<!-- Rules for always saying context with these criteria always get this variant. For instance, if you want to always give groups less than N number of days old the experiment experience, they are specified here. This is different from the exclusion rules above. -->
+
+# Tracking Details
+
+- [json schema](https://gitlab.com/gitlab-org/iglu/-/blob/master/public/schemas/com.gitlab/gitlab_experiment/jsonschema/0-3-0) used in `gitlab-experiment` tracking.
+- see [taxonomy](https://docs.gitlab.com/ee/development/snowplow/index.html#structured-event-taxonomy) for a guide.
+
+| activity | category | action | label | context | property | value |
+| -------- | -------- | ------ | ----- | ------- | -------- | ----- |
+|  |  |  |  | json schema |  |  |

.gitlab/issue_templates/Experiment Successful Cleanup.md

@@ -12,9 +12,10 @@ The changes need to become an official part of the product.
 - [ ] Determine if tracking should be kept as is, removed, or modified.
 - [ ] Ensure any relevant documentation has been updated.
 - [ ] Consider changes to any `feature_category:` introduced by the experiment if ownership is changing (PM for Growth and PM for the new category as DRIs)
+- [ ] Check to see if the experiment introduced new design assets. Add them to the appropriate repos and document them if needed.
 - [ ] Optional: Migrate experiment to a default enabled [feature flag](https://docs.gitlab.com/ee/development/feature_flags) for one milestone and add a changelog. Converting to a feature flag can be skipped at the ICs discretion if risk is deemed low with consideration to both SaaS and (if applicable) self managed
 - [ ] In the next milestone, [remove the feature flag](https://docs.gitlab.com/ee/development/feature_flags/controls.html#cleaning-up) if applicable
 - [ ] After the flag removal is deployed, [clean up the feature/experiment feature flags](https://docs.gitlab.com/ee/development/feature_flags/controls.html#cleaning-up) by running chatops command in `#production` channel
-- [ ] Ensure the corresponding [Experiment Tracking](https://gitlab.com/groups/gitlab-org/-/boards/1352542?label_name[]=devops%3A%3Agrowth&label_name[]=growth%20experiment&label_name[]=experiment%20tracking) issue is updated
+- [ ] Ensure the corresponding [Experiment Rollout](https://gitlab.com/groups/gitlab-org/-/boards/1352542?label_name[]=devops%3A%3Agrowth&label_name[]=growth%20experiment&label_name[]=experiment-rollout) issue is updated
 
-/label ~"feature" ~"feature::maintenance" ~"workflow::scheduling" ~"growth experiment" ~"feature flag"  
+/label ~"type::maintenance" ~"workflow::scheduling" ~"growth experiment" ~"feature flag"

.gitlab/issue_templates/Experimentation.md

-<!-- Title suggestion: Experiment: [description] -->
-
-# Experiment Summary
-<!-- Quick rundown of what is being done -->
-
-# Design
-<!-- This should include the contexts that determine the reproducibility (stickiness) of an experiment. This means that if you want the same behavior for a user, the context would be user, or if you want all users when viewing a specific project, the context would be the project being viewed, etc. -->
-
-# Rollout strategy
-<!-- This is currently called A/B test, which isn't accurate for multi-variants. Let's call this rollout strategy. It should outline the percentages for variants and if there's more than one step to this, each of those steps and the timing for those steps (e.g. 30 days after initial rollout). -->
-
-# Inclusions and exclusions
-<!-- These would be the rules for which given context (and are limited to context or resolvable at experiment time details) is included or excluded from the test. An example of this would be to only run an experiment on groups less than N number of days old. -->
-
-# Segmentation 
-<!-- Rules for always saying context with these criteria always get this variant. For instance, if you want to always give groups less than N number of days old the experiment experience, they are specified here. This is different from the exclusion rules above. -->
-
-# Tracking Details
-
-- [json schema](https://gitlab.com/gitlab-org/iglu/-/blob/master/public/schemas/com.gitlab/gitlab_experiment/jsonschema/0-3-0) used in `gitlab-experiment` tracking.
-- see [taxonomy](https://docs.gitlab.com/ee/development/snowplow/index.html#structured-event-taxonomy) for a guide.
-
-| activity | category | action | label | context | property | value |
-| -------- | -------- | ------ | ----- | ------- | -------- | ----- |
-|  |  |  |  | json schema |  |  |

.gitlab/issue_templates/Feature Flag Roll Out.md

@@ -148,5 +148,5 @@ codebase.
 /chatops run feature set <feature-flag-name> false
 ```
 
-/label ~"feature flag"
+/label ~"feature flag" ~"type::feature" ~"feature::addition"
 /assign DRI

.gitlab/issue_templates/Feature Proposal - basic.md

@@ -7,4 +7,4 @@
 <!-- Consider adding related issues and epics to this issue. You can also reference the Feature Proposal Template (https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/issue_templates/Feature%20proposal%20-%20detailed.md) for additional details to consider adding to this issue. Additionally, as a data oriented organization, when your feature exits planning breakdown, consider adding the `What does success look like, and how can we measure that?` section.
 -->
 
-/label ~feature::addition ~"group::" ~"section::" ~"Category:" ~"GitLab Core"/~"GitLab Premium"/~"GitLab Ultimate"
+/label ~"type::feature" ~feature::addition ~"group::" ~"section::" ~"Category:" ~"GitLab Core"/~"GitLab Premium"/~"GitLab Ultimate"

.gitlab/issue_templates/Feature Proposal - lean.md

@@ -12,9 +12,40 @@
 
 <!-- Use this section to explain the feature and how it will work. It can be helpful to add technical details, design proposals, and links to related epics or issues. -->
 
+### Intended Users
 
+<!-- Who will use this feature? If known, include any of the following: types of users (e.g. Developer), personas, or specific company roles (e.g. Release Manager). It's okay to write "Unknown" and fill this field in later.
 
-/label ~"feature" ~"group::" ~"section::"  ~"Category::" ~"GitLab Free"/~"GitLab Premium"/~"GitLab Ultimate"
+Personas are described at https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/
+
+* [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)
+* [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)
+* [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)
+* [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)
+* [Eddie (Content Editor)](https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/#eddie-content-editor) 
+
+-->
+
+### Metrics 
+
+<!-- How are you going to track uage of this feature? Think about user behavior and their interaction with the product. What indicates someone is getting value from it?
+
+Create tracking issue using the Snowplow event tracking template. See https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/issue_templates/Snowplow%20event%20tracking.md
+
+-->
+
+
+/label ~"type::feature" ~"group::" ~"section::"  ~"Category::" ~"GitLab Free"/~"GitLab Premium"/~"GitLab Ultimate"
 
 
 <!--- Use the following resources to find the appropriate labels:

.gitlab/issue_templates/Feature proposal - detailed.md

@@ -112,6 +112,4 @@ Use the following resources to find the appropriate labels:
 -->
 /label ~devops:: ~group: ~Category:
 /label  ~"GitLab Free"/~"GitLab Premium"/~"GitLab Ultimate"
-/label ~feature
-/label ~documentation
-/label ~direction
+/label ~"type::feature" ~documentation ~direction

.gitlab/issue_templates/InfraDev.md

@@ -53,4 +53,4 @@ See also:
 -->
 
 /label ~"infradev"
-/label ~"bug"
+/label ~"type::bug"

.gitlab/issue_templates/Productivity Improvement.md

@@ -2,7 +2,7 @@
 
 <!--
 Please describe the engineering productivity problem that needs to be solved backed by charts from
-https://about.gitlab.com/handbook/engineering/quality/engineering-productivity-team/#engineering-productivity-team-metrics.
+https://about.gitlab.com/handbook/engineering/quality/engineering-productivity/#engineering-productivity-metrics.
 -->
 
 ### Problem identification checklist

.gitlab/issue_templates/Refactoring.md

@@ -41,9 +41,9 @@ please list them here.
 <!--
 Please select the appropriate label from the following:
     ~"feature::addition"
-    ~"feature::maintenance"
+    ~"type::maintenance"
     ~"tooling::pipelines"
     ~"tooling::workflow"
 -->
 
-/label ~"feature::maintenance"
+/label ~"type::maintenance"

.gitlab/issue_templates/Technical Evaluation.md

@@ -29,5 +29,5 @@
 
 ### Team
 
-- [ ] Add ~"workflow::planning breakdown" ~feature and the corresponding `~devops::<stage>` and `~group::<group>` labels.
+- [ ] Add ~"workflow::planning breakdown" ~"type::feature" and the corresponding `~devops::<stage>` and `~group::<group>` labels.
 - [ ] Ping the PM and EM.

.gitlab/merge_request_templates/Deprecations.md

@@ -6,16 +6,19 @@
 
 **Be sure to link this MR to the relevant deprecation issue(s).**
 
+Deprecation announcements can and should be created and merged into Docs at any time, to optimize user awareness and planning. We encourage confirmed deprecations to be merged as soon as the required reviews are complete, even if weeks ahead of the target milestone's release post. For the announcement to be included in a specific release post and that release's documentation packages, this MR must be reviewed/merged per the due dates below:
+
 **By the 10th**: Assign this MR to these team members as Reviewer and for Approval (optional unless noted as required):
 
 - Product Marketing: `@PMM`
 - Product Designer(s): `@ProductDesigners`
 - Group Manager or Director: `@manager`
 - Engineering Manager: `@EM` - Required
+- Technical writer: `@TW` - Required
 
-**By 8:00 AM PDT 15th**: PM will assign this MR to the TW reviewer: `@PM`
+**By 11:59 AM PDT 15th**: PM assigns this MR to the TW reviewer for final review and merge: `@PM`
 
-**By 11:59 PM PDT 15th**: TW Reviewer will perform final review and merge this MR to Master: `@TW`
+**By 11:59 PM PDT 17th**: TW Reviewer updates Docs by merging this MR to `master`: `@TW`
 
 ---
 
@@ -31,8 +34,9 @@ They are frequently updated, and everyone should make sure they are aware of the
 ## PM release post item checklist
 
 - [ ] Set yourself as the Assignee.
+- [ ] If the deprecation is a [breaking change](https://about.gitlab.com/handbook/product/gitlab-the-product/#breaking-change), add label `breaking change`.
 - [ ] Follow the process to [create a deprecation YAML file](https://about.gitlab.com/handbook/marketing/blog/release-posts/#creating-a-deprecation-entry).
-- [ ] Add reviewers by the 10th
+- [ ] Add reviewers by the 10th.
 - [ ] When ready to be merged and not later than the 15th, add the ~ready label and @ message the TW for final review and merge.
 
 ## Reviewers
@@ -78,5 +82,18 @@ yourself as a reviewer if it's not ready for merge yet.
 
 </details>
 
-When the PM indicates it is ready for merge, all issues have been addressed merge this MR. 
-     - You must merge this MR by the 15th so the Release Post TW lead can run the [deprecations in Docs rake task](https://about.gitlab.com/handbook/marketing/blog/release-posts/#update-the-deprecations-doc) on the 16th
+When the PM indicates it is ready for merge and all issues have been addressed, start the merge process.
+
+#### Technical writer merge process
+
+The [deprecations doc's `.md` file](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/update/deprecations.md)
+must be updated before this MR is merged:
+
+1. Check out the MR's branch (in the [`gitlab-org/gitlab`](https://gitlab.com/gitlab-org/gitlab) project).
+1. From the command line (in the branch), run `bin/rake gitlab:docs:compile_deprecations`.
+   If you want to double check that it worked, you can run `bin/rake gitlab:docs:check_deprecations`
+   to verify that the doc is up to date.
+1. Commit the updated file and push the changes.
+1. Set the MR to merge when the pipeline succeeds (or merge if the pipeline is already complete).
+
+If you have trouble running the rake task, check the [troubleshooting steps](https://about.gitlab.com/handbook/marketing/blog/release-posts/#deprecation-rake-task-troubleshooting).

.gitlab/merge_request_templates/Documentation.md

@@ -20,10 +20,10 @@
 
 If you are only adding documentation, do not add any of the following labels:
 
-- `~"feature"`
+- `~"type::feature"`
 - `~"frontend"`
 - `~"backend"`
-- `~"bug"`
+- `~"type::bug"`
 - `~"database"`
 
 These labels cause the MR to be added to code verification QA issues.

.gitlab/merge_request_templates/New End To End Test.md

@@ -24,5 +24,5 @@ Please link to the respective test case in the testcases project
 
 /label ~"Quality:test-gap" ~"Quality:EE test gaps"
 
-<!-- Select the appropriate feature label, ~"feature::addition" for tests added for new features, ~"feature::maintenance" for tests added for existing features -->
-/label ~"feature::addition" ~"feature::maintenance" 
+<!-- Select the appropriate feature label, ~"feature::addition" for tests added for new features, ~"type::maintenance" for tests added for existing features -->
+/label ~"feature::addition" ~"type::maintenance"

.gitlab/merge_request_templates/Pipeline Configuration.md

@@ -33,6 +33,6 @@ This will help keep track of expected cost increases to the [GitLab project aver
 
 ### Post-merge
 
-- [ ] Consider communicating these changes to the broader team following the [communication guideline for pipeline changes](https://about.gitlab.com/handbook/engineering/quality/engineering-productivity-team/#pipeline-changes)
+- [ ] Consider communicating these changes to the broader team following the [communication guideline for pipeline changes](https://about.gitlab.com/handbook/engineering/quality/engineering-productivity/#pipeline-changes)
 
-/label ~tooling ~"tooling::pipelines" ~"Engineering Productivity"
+/label ~"type::tooling" ~"tooling::pipelines" ~"Engineering Productivity"

.gitlab/merge_request_templates/Quarantine End to End Test.md

@@ -30,7 +30,7 @@ the noise (due to constantly failing tests, flaky tests, and so on) so that new
 - [ ] To ensure a faster turnaround, ask in the `#quality` Slack channel for someone to review and merge the merge request, rather than assigning it directly.
 
 <!-- Base labels. -->
-/label ~"Quality" ~"QA" ~"feature" ~"feature::maintenance"
+/label ~"Quality" ~"QA" ~"type::maintenance"
 
 <!--
 Choose the stage that appears in the test path, e.g. ~"devops::create" for

.gitpod.yml

@@ -69,15 +69,13 @@ tasks:
         printf "Waiting for GitLab at $(gp url 3000) ..."
         # Check /-/readiness which returns JSON, but we're only interested in the exit code
         #
-        # We use http://localhost:3000 instead of the public hostname because 
+        # We use http://localhost:3000 instead of the public hostname because
         # it's no longer possible to access as specific cookies are required
         until curl --silent --no-buffer --fail http://localhost:3000/-/readiness > /dev/null 2>&1; do printf '.'; sleep 5; done && echo ""
         # Give Gitpod a few more seconds to set up everything ...
         sleep 5
         printf "$(date) – GitLab is up (took ~%.1f minutes)\n" "$((10*$SECONDS/60))e-1" | tee -a /workspace/startup.log
         gp preview $(gp url 3000) || true
-        # Speed up backend tests
-        export GITLAB_TEST_EAGER_LOAD=false
       )
 
 ports:

.haml-lint.yml

@@ -6,6 +6,7 @@ skip_frontmatter: false
 exclude:
   - 'vendor/**/*'
   - 'spec/**/*'
+  - 'ee/spec/**/*'
 require:
   - './haml_lint/linter/no_plain_nodes.rb'
   - './haml_lint/linter/documentation_links.rb'

.rubocop.yml

@@ -106,25 +106,31 @@ RSpec/MultipleMemoizedHelpers:
 
 Naming/FileName:
   ExpectMatchingDefinition: true
+  CheckDefinitionPathHierarchy: false
   Exclude:
+    - '**/*/*.builder'
+    - 'ee/bin/*'
+    - 'config.ru'
+    - 'config/**/*'
+    - 'ee/config/**/*'
+    - 'jh/config/**/*'
     - 'db/**/*'
     - 'ee/db/**/*'
+    - 'ee/elastic/migrate/*'
+    - 'lib/tasks/**/*.rake'
+    - 'ee/lib/tasks/**/*.rake'
+    - 'lib/generators/**/*'
+    - 'ee/lib/generators/**/*'
+    - 'scripts/**/*'
     - 'spec/**/*'
-    - 'features/**/*'
+    - 'tooling/bin/*'
     - 'ee/spec/**/*'
+    - 'jh/spec/**/*'
+    - 'qa/bin/*'
     - 'qa/spec/**/*'
     - 'qa/qa/specs/**/*'
-    - 'qa/bin/*'
-    - 'ee/bin/*'
-    - 'config/**/*'
-    - 'ee/config/**/*'
-    - 'lib/generators/**/*'
-    - 'locale/unfound_translations.rb'
-    - 'ee/locale/unfound_translations.rb'
-    - 'ee/lib/generators/**/*'
-    - 'qa/qa/scenario/test/integration/ldap_no_tls.rb'
-    - 'qa/qa/scenario/test/integration/ldap_tls.rb'
-    - 'qa/tasks/*'
+    - 'qa/tasks/**/*.rake'
+    - '**/*.ru'
 
   IgnoreExecutableScripts: true
   AllowedAcronyms:
@@ -146,6 +152,26 @@ Naming/FileName:
     - CI
     - CD
     - OAuth
+    - CSP
+    - CSV
+    - SCA
+    - SAN
+    - CIDR
+    - SPDX
+    - MR
+    - SSE
+    - JWT
+    - HLL
+    - GPG
+    - OTP
+    - GID
+    - AR
+    - RSpec
+    - ECDSA
+    - ED25519
+    - GitLab
+    - JavaScript
+    - VSCode
     # default ones:
     - CLI
     - DSL

.rubocop_manual_todo.yml

@@ -32,7 +32,6 @@ Rails/SaveBang:
     - 'ee/spec/models/approval_project_rule_spec.rb'
     - 'ee/spec/models/burndown_spec.rb'
     - 'ee/spec/models/elasticsearch_indexed_namespace_spec.rb'
-    - 'ee/spec/models/epic_spec.rb'
     - 'ee/spec/models/gitlab_subscription_spec.rb'
     - 'ee/spec/models/issue_spec.rb'
     - 'ee/spec/models/label_note_spec.rb'
@@ -741,7 +740,6 @@ RSpec/AnyInstanceOf:
     - 'spec/policies/ci/pipeline_policy_spec.rb'
     - 'spec/presenters/gitlab/blame_presenter_spec.rb'
     - 'spec/presenters/merge_request_presenter_spec.rb'
-    - 'spec/requests/api/api_spec.rb'
     - 'spec/requests/api/ci/runner/jobs_artifacts_spec.rb'
     - 'spec/requests/api/ci/runner/jobs_put_spec.rb'
     - 'spec/requests/api/ci/runner/jobs_request_post_spec.rb'
@@ -1166,6 +1164,7 @@ Gitlab/NamespacedClass:
     - 'app/models/members/group_member.rb'
     - 'app/models/members/last_group_owner_assigner.rb'
     - 'app/models/members/project_member.rb'
+    - 'app/models/members/member_task.rb'
     - 'app/models/members_preloader.rb'
     - 'app/models/merge_request.rb'
     - 'app/models/merge_request_assignee.rb'
@@ -2212,7 +2211,6 @@ Performance/OpenStruct:
     - 'lib/gitlab/ci/ansi2html.rb'
     - 'lib/gitlab/git/diff_collection.rb'
     - 'lib/gitlab/import_export/after_export_strategies/base_after_export_strategy.rb'
-    - 'lib/gitlab/testing/request_inspector_middleware.rb'
     - 'lib/mattermost/session.rb'
 
 # WIP: https://gitlab.com/gitlab-org/gitlab/-/issues/324629
@@ -2446,26 +2444,18 @@ Database/MultipleDatabases:
     - 'lib/gitlab/database/migrations/observers/query_log.rb'
     - 'lib/gitlab/database/multi_threaded_migration.rb'
     - 'lib/gitlab/database/partitioning_migration_helpers/backfill_partitioned_table.rb'
-    - 'lib/gitlab/database/partitioning/monthly_strategy.rb'
-    - 'lib/gitlab/database/partitioning/partition_manager.rb'
-    - 'lib/gitlab/database/partitioning/partition_creator.rb'
-    - 'lib/gitlab/database/partitioning/replace_table.rb'
-    - 'lib/gitlab/database/partitioning/time_partition.rb'
     - 'lib/gitlab/database/postgres_hll/batch_distinct_counter.rb'
     - 'lib/gitlab/database/postgresql_adapter/dump_schema_versions_mixin.rb'
     - 'lib/gitlab/database/postgresql_database_tasks/load_schema_versions_mixin.rb'
     - 'lib/gitlab/database.rb'
-    - 'lib/gitlab/database/reindexing/concurrent_reindex.rb'
-    - 'lib/gitlab/database/reindexing/reindex_concurrently.rb'
     - 'lib/gitlab/database/schema_cache_with_renamed_table.rb'
     - 'lib/gitlab/database/schema_migrations/context.rb'
     - 'lib/gitlab/database/schema_version_files.rb'
-    - 'lib/gitlab/database/unidirectional_copy_trigger.rb'
     - 'lib/gitlab/database/with_lock_retries.rb'
     - 'lib/gitlab/gitlab_import/importer.rb'
     - 'lib/gitlab/health_checks/db_check.rb'
     - 'lib/gitlab/import_export/base/relation_factory.rb'
-    - 'lib/gitlab/import_export/relation_tree_restorer.rb'
+    - 'lib/gitlab/import_export/group/relation_tree_restorer.rb'
     - 'lib/gitlab/legacy_github_import/importer.rb'
     - 'lib/gitlab/metrics/samplers/database_sampler.rb'
     - 'lib/gitlab/seeder.rb'
@@ -2605,3 +2595,86 @@ Rails/IncludeUrlHelper:
     - 'spec/lib/banzai/filter/issuable_state_filter_spec.rb'
     - 'spec/lib/banzai/filter/reference_redactor_filter_spec.rb'
     - 'spec/lib/banzai/reference_redactor_spec.rb'
+
+# TODO issue: https://gitlab.com/gitlab-org/gitlab/-/issues/344279
+Style/OpenStructUse:
+  Exclude:
+    - 'Guardfile'
+    - 'app/finders/snippets_finder.rb'
+    - 'app/helpers/application_settings_helper.rb'
+    - 'ee/lib/gitlab/graphql/aggregations/epics/epic_node.rb'
+    - 'ee/spec/db/production/license_spec.rb'
+    - 'ee/spec/features/projects/new_project_spec.rb'
+    - 'ee/spec/finders/template_finder_spec.rb'
+    - 'ee/spec/graphql/ee/resolvers/board_lists_resolver_spec.rb'
+    - 'ee/spec/graphql/mutations/merge_requests/accept_spec.rb'
+    - 'ee/spec/graphql/resolvers/board_groupings/epics_resolvers_spec.rb'
+    - 'ee/spec/helpers/billing_plans_helper_spec.rb'
+    - 'ee/spec/helpers/ee/blob_helper_spec.rb'
+    - 'ee/spec/lib/gitlab/auth/group_saml/failure_handler_spec.rb'
+    - 'ee/spec/lib/gitlab/legacy_github_import/project_creator_spec.rb'
+    - 'ee/spec/requests/api/ldap_spec.rb'
+    - 'lib/api/wikis.rb'
+    - 'lib/gitlab/git/diff_collection.rb'
+    - 'lib/gitlab/import_export/after_export_strategies/base_after_export_strategy.rb'
+    - 'lib/gitlab/testing/request_inspector_middleware.rb'
+    - 'lib/mattermost/session.rb'
+    - 'spec/bin/feature_flag_spec.rb'
+    - 'spec/controllers/admin/clusters_controller_spec.rb'
+    - 'spec/controllers/concerns/import_url_params_spec.rb'
+    - 'spec/controllers/groups/clusters_controller_spec.rb'
+    - 'spec/controllers/import/fogbugz_controller_spec.rb'
+    - 'spec/controllers/import/gitlab_controller_spec.rb'
+    - 'spec/controllers/projects/clusters_controller_spec.rb'
+    - 'spec/dependencies/omniauth_saml_spec.rb'
+    - 'spec/factories/go_module_versions.rb'
+    - 'spec/factories/wiki_pages.rb'
+    - 'spec/features/projects/clusters/gcp_spec.rb'
+    - 'spec/features/projects/clusters_spec.rb'
+    - 'spec/finders/template_finder_spec.rb'
+    - 'spec/graphql/mutations/branches/create_spec.rb'
+    - 'spec/graphql/mutations/clusters/agent_tokens/create_spec.rb'
+    - 'spec/graphql/mutations/clusters/agents/create_spec.rb'
+    - 'spec/graphql/mutations/clusters/agents/delete_spec.rb'
+    - 'spec/graphql/mutations/commits/create_spec.rb'
+    - 'spec/graphql/mutations/merge_requests/accept_spec.rb'
+    - 'spec/graphql/mutations/merge_requests/create_spec.rb'
+    - 'spec/graphql/types/range_input_type_spec.rb'
+    - 'spec/helpers/application_settings_helper_spec.rb'
+    - 'spec/helpers/profiles_helper_spec.rb'
+    - 'spec/initializers/doorkeeper_spec.rb'
+    - 'spec/lib/gitlab/auth/o_auth/provider_spec.rb'
+    - 'spec/lib/gitlab/cleanup/orphan_lfs_file_references_spec.rb'
+    - 'spec/lib/gitlab/database/migrations/runner_spec.rb'
+    - 'spec/lib/gitlab/gitaly_client/blobs_stitcher_spec.rb'
+    - 'spec/lib/gitlab/gitaly_client/diff_stitcher_spec.rb'
+    - 'spec/lib/gitlab/grape_logging/loggers/exception_logger_spec.rb'
+    - 'spec/lib/gitlab/grape_logging/loggers/perf_logger_spec.rb'
+    - 'spec/lib/gitlab/grape_logging/loggers/queue_duration_logger_spec.rb'
+    - 'spec/lib/gitlab/graphql/pagination/keyset/connection_generic_keyset_spec.rb'
+    - 'spec/lib/gitlab/graphql/pagination/keyset/connection_spec.rb'
+    - 'spec/lib/gitlab/legacy_github_import/project_creator_spec.rb'
+    - 'spec/lib/gitlab/quick_actions/command_definition_spec.rb'
+    - 'spec/lib/gitlab/quick_actions/dsl_spec.rb'
+    - 'spec/lib/gitlab/relative_positioning/range_spec.rb'
+    - 'spec/lib/gitlab/usage_data_spec.rb'
+    - 'spec/models/design_management/design_action_spec.rb'
+    - 'spec/models/design_management/design_at_version_spec.rb'
+    - 'spec/models/user_spec.rb'
+    - 'spec/presenters/packages/nuget/search_results_presenter_spec.rb'
+    - 'spec/requests/api/graphql/mutations/design_management/delete_spec.rb'
+    - 'spec/requests/api/import_github_spec.rb'
+    - 'spec/requests/api/internal/base_spec.rb'
+    - 'spec/services/packages/nuget/metadata_extraction_service_spec.rb'
+    - 'spec/services/projects/import_service_spec.rb'
+    - 'spec/services/system_note_service_spec.rb'
+    - 'spec/support/helpers/import_spec_helper.rb'
+    - 'spec/support/helpers/login_helpers.rb'
+    - 'spec/support/helpers/repo_helpers.rb'
+    - 'spec/support/shared_examples/controllers/githubish_import_controller_shared_examples.rb'
+    - 'spec/support/shared_examples/requests/api/nuget_packages_shared_examples.rb'
+    - 'spec/support/shared_examples/requests/api/pypi_packages_shared_examples.rb'
+    - 'spec/support_specs/helpers/stub_feature_flags_spec.rb'
+    - 'spec/tooling/rspec_flaky/flaky_example_spec.rb'
+    - 'spec/workers/packages/maven/metadata/sync_worker_spec.rb'
+    - 'tooling/rspec_flaky/flaky_example.rb'

.rubocop_todo.yml

@@ -208,12 +208,6 @@ Metrics/CyclomaticComplexity:
 Metrics/PerceivedComplexity:
   Max: 25
 
-# Offense count: 196
-# Configuration parameters: ExpectMatchingDefinition, CheckDefinitionPathHierarchy, Regex, IgnoreExecutableScripts, AllowedAcronyms.
-# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
-Naming/FileName:
-  Enabled: false
-
 # Offense count: 11
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: lowercase, uppercase

Dangerfile

@@ -17,6 +17,14 @@ end
 
 anything_to_post = status_report.values.any? { |data| data.any? }
 
-if helper.ci? && anything_to_post
+return unless helper.ci?
+
+if project_helper.labels_to_add.any?
+  gitlab.api.update_merge_request(gitlab.mr_json['project_id'],
+                                  gitlab.mr_json['iid'],
+                                  add_labels: project_helper.labels_to_add.join(','))
+end
+
+if anything_to_post
   markdown("**If needed, you can retry the [`danger-review` job](#{ENV['CI_JOB_URL']}) that generated this comment.**")
 end

GITALY_SERVER_VERSION

-4f0a07ba39f14adacf7d482128a5de2bb84f0eac
+bccabad35ea7b90a2bfae196cf583611a0484c51

GITLAB_ELASTICSEARCH_INDEXER_VERSION

-2.15.0
+2.16.0

GITLAB_KAS_VERSION

-14.3.3
+14.4.0

GITLAB_PAGES_VERSION

-1.45.0
+1.46.0

Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 6.1.4.1'
 
-gem 'bootsnap', '~> 1.4.6'
+gem 'bootsnap', '~> 1.9.1', require: false
 
 # Responders respond_to and respond_with
 gem 'responders', '~> 3.0'
@@ -129,7 +129,7 @@ gem 'fog-local', '~> 0.6'
 gem 'fog-openstack', '~> 1.0'
 gem 'fog-rackspace', '~> 0.1.1'
 gem 'fog-aliyun', '~> 0.3'
-gem 'gitlab-fog-azure-rm', '~> 1.2.0', require: false
+gem 'gitlab-fog-azure-rm', '~> 1.2.0', require: 'fog/azurerm'
 
 # for Google storage
 gem 'google-api-client', '~> 0.33'
@@ -186,6 +186,7 @@ gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'
 group :puma do
   gem 'puma', '~> 5.3.1', require: false
   gem 'puma_worker_killer', '~> 0.3.1', require: false
+  gem 'sd_notify', '~> 0.1.0', require: false
 end
 
 # State machine
@@ -290,7 +291,7 @@ gem 'autoprefixer-rails', '10.2.5.1'
 gem 'terser', '1.0.2'
 
 gem 'addressable', '~> 2.8'
-gem 'gemojione', '~> 3.3'
+gem 'tanuki_emoji', '~> 0.5'
 gem 'gon', '~> 6.4.0'
 gem 'request_store', '~> 1.5'
 gem 'base32', '~> 0.3.0'
@@ -348,6 +349,8 @@ group :development do
 
   # thin instead webrick
   gem 'thin', '~> 1.8.0'
+
+  gem 'sprite-factory', '~> 1.7'
 end
 
 group :development, :test do
@@ -372,7 +375,7 @@ group :development, :test do
   gem 'spring', '~> 2.1.0'
   gem 'spring-commands-rspec', '~> 1.0.4'
 
-  gem 'gitlab-styles', '~> 6.3.0', require: false
+  gem 'gitlab-styles', '~> 6.4.0', require: false
 
   gem 'haml_lint', '~> 0.36.0', require: false
   gem 'bundler-audit', '~> 0.7.0.1', require: false
@@ -396,7 +399,7 @@ group :development, :test do
 end
 
 group :development, :test, :danger do
-  gem 'gitlab-dangerfiles', '~> 2.3.0', require: false
+  gem 'gitlab-dangerfiles', '~> 2.4.0', require: false
 end
 
 group :development, :test, :coverage do
@@ -474,7 +477,7 @@ end
 gem 'spamcheck', '~> 0.1.0'
 
 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 14.3.0.pre.rc2'
+gem 'gitaly', '~> 14.4.0.pre.rc43'
 
 # KAS GRPC protocol definitions
 gem 'kas-grpc', '~> 0.0.2'
@@ -534,3 +537,5 @@ gem 'webauthn', '~> 2.3'
 gem 'ipaddress', '~> 0.8.3'
 
 gem 'parslet', '~> 1.8'
+
+gem 'ipynbdiff', '0.3.6'

Gemfile.lock

@@ -148,7 +148,7 @@ GEM
       rack (>= 0.9.0)
     bindata (2.4.10)
     binding_ninja (0.2.3)
-    bootsnap (1.4.6)
+    bootsnap (1.9.1)
       msgpack (~> 1.0)
     bootstrap_form (4.2.0)
       actionpack (>= 5.0)
@@ -222,7 +222,7 @@ GEM
     css_parser (1.7.0)
       addressable
     daemons (1.3.1)
-    danger (8.3.1)
+    danger (8.4.1)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -436,8 +436,6 @@ GEM
       ruby-progressbar (~> 1.4)
     fuzzyurl (0.9.0)
     gemoji (3.0.1)
-    gemojione (3.3.0)
-      json
     get_process_mem (0.2.5)
       ffi (~> 1.0)
     gettext (3.3.6)
@@ -452,7 +450,7 @@ GEM
       rails (>= 3.2.0)
     git (1.7.0)
       rchardet (~> 1.8)
-    gitaly (14.3.0.pre.rc2)
+    gitaly (14.4.0.pre.rc43)
       grpc (~> 1.0)
     github-markup (1.7.0)
     gitlab (4.16.1)
@@ -460,7 +458,7 @@ GEM
       terminal-table (~> 1.5, >= 1.5.1)
     gitlab-chronic (0.10.5)
       numerizer (~> 0.2)
-    gitlab-dangerfiles (2.3.0)
+    gitlab-dangerfiles (2.4.0)
       danger (>= 8.3.1)
       danger-gitlab (>= 8.0.0)
     gitlab-experiment (0.6.4)
@@ -492,7 +490,7 @@ GEM
       openid_connect (~> 1.2)
     gitlab-sidekiq-fetcher (0.8.0)
       sidekiq (~> 6.1)
-    gitlab-styles (6.3.0)
+    gitlab-styles (6.4.0)
       rubocop (~> 0.91, >= 0.91.1)
       rubocop-gitlab-security (~> 0.1.1)
       rubocop-performance (~> 1.9.2)
@@ -642,6 +640,9 @@ GEM
     invisible_captcha (1.1.0)
       rails (>= 4.2)
     ipaddress (0.8.3)
+    ipynbdiff (0.3.6)
+      diffy (= 3.3.0)
+      json (= 2.5.1)
     jaeger-client (1.1.0)
       opentracing (~> 0.3)
       thrift
@@ -907,7 +908,7 @@ GEM
     peek (1.1.0)
       railties (>= 4.0.0)
     pg (1.2.3)
-    pg_query (2.1.0)
+    pg_query (2.1.1)
       google-protobuf (>= 3.17.1)
     plist (3.6.0)
     png_quantizator (0.2.1)
@@ -1155,6 +1156,7 @@ GEM
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     scientist (1.6.0)
+    sd_notify (0.1.0)
     securecompare (1.0.0)
     seed-fu (2.3.7)
       activerecord (>= 3.1)
@@ -1216,6 +1218,7 @@ GEM
     spring (2.1.1)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
+    sprite-factory (1.7.1)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -1246,6 +1249,7 @@ GEM
     sys-filesystem (1.1.9)
       ffi
     sysexits (1.2.0)
+    tanuki_emoji (0.5.0)
     temple (0.8.2)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
@@ -1399,7 +1403,7 @@ DEPENDENCIES
   benchmark-ips (~> 2.3.0)
   benchmark-memory (~> 0.1)
   better_errors (~> 2.9.0)
-  bootsnap (~> 1.4.6)
+  bootsnap (~> 1.9.1)
   bootstrap_form (~> 4.2.0)
   browser (~> 4.2)
   bullet (~> 6.1.3)
@@ -1454,14 +1458,13 @@ DEPENDENCIES
   fog-rackspace (~> 0.1.1)
   fugit (~> 1.2.1)
   fuubar (~> 2.2.0)
-  gemojione (~> 3.3)
   gettext (~> 3.3)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly (~> 14.3.0.pre.rc2)
+  gitaly (~> 14.4.0.pre.rc43)
   github-markup (~> 1.7.0)
   gitlab-chronic (~> 0.10.5)
-  gitlab-dangerfiles (~> 2.3.0)
+  gitlab-dangerfiles (~> 2.4.0)
   gitlab-experiment (~> 0.6.4)
   gitlab-fog-azure-rm (~> 1.2.0)
   gitlab-labkit (~> 0.21.1)
@@ -1471,7 +1474,7 @@ DEPENDENCIES
   gitlab-net-dns (~> 0.9.1)
   gitlab-omniauth-openid-connect (~> 0.8.0)
   gitlab-sidekiq-fetcher (= 0.8.0)
-  gitlab-styles (~> 6.3.0)
+  gitlab-styles (~> 6.4.0)
   gitlab_chronic_duration (~> 0.10.6.2)
   gitlab_omniauth-ldap (~> 2.1.1)
   gon (~> 6.4.0)
@@ -1501,6 +1504,7 @@ DEPENDENCIES
   icalendar
   invisible_captcha (~> 1.1.0)
   ipaddress (~> 0.8.3)
+  ipynbdiff (= 0.3.6)
   jira-ruby (~> 2.1.4)
   js_regex (~> 3.7)
   json (~> 2.5.1)
@@ -1606,6 +1610,7 @@ DEPENDENCIES
   rugged (~> 1.1)
   sanitize (~> 5.2.1)
   sassc-rails (~> 2.1.0)
+  sd_notify (~> 0.1.0)
   seed-fu (~> 2.3.7)
   selenium-webdriver (~> 3.142)
   sentry-raven (~> 3.1)
@@ -1622,11 +1627,13 @@ DEPENDENCIES
   spamcheck (~> 0.1.0)
   spring (~> 2.1.0)
   spring-commands-rspec (~> 1.0.4)
+  sprite-factory (~> 1.7)
   sprockets (~> 3.7.0)
   sshkey (~> 2.0)
   stackprof (~> 0.2.15)
   state_machines-activerecord (~> 0.8.0)
   sys-filesystem (~> 1.1.6)
+  tanuki_emoji (~> 0.5)
   terser (= 1.0.2)
   test-prof (~> 1.0.7)
   test_file_finder (~> 0.1.3)

README.md

@@ -68,10 +68,10 @@ GitLab is an open source project and we are very happy to accept community contr
 ## Install a development environment
 
 To work on GitLab itself, we recommend setting up your development environment with [the GitLab Development Kit](https://gitlab.com/gitlab-org/gitlab-development-kit).
-If you do not use the GitLab Development Kit you need to install and setup all the dependencies yourself, this is a lot of work and error prone.
+If you do not use the GitLab Development Kit you need to install and configure all the dependencies yourself, this is a lot of work and error prone.
 One small thing you also have to do when installing it yourself is to copy the example development Puma configuration file:
 
-    cp config/puma.rb.example.development config/puma.rb
+    cp config/puma.example.development.rb config/puma.rb
 
 Instructions on how to start GitLab and how to run the tests can be found in the [getting started section of the GitLab Development Kit](https://gitlab.com/gitlab-org/gitlab-development-kit#getting-started).
 

VERSION

-14.4.0-pre
\ No newline at end of file
+14.5.0-pre
\ No newline at end of file