.gitignore

@@ -95,8 +95,6 @@ jsdoc/
 webpack-dev-server.json
 /.nvimrc
 .solargraph.yml
-/tmp/matching_foss_tests.txt
-/tmp/matching_tests.txt
 ee/changelogs/unreleased-ee
 /sitespeed-result
 tags.lock

.gitlab-ci.yml

@@ -90,6 +90,8 @@ variables:
   RSPEC_PACKED_TESTS_MAPPING_PATH: crystalball/packed-mapping.json
   RSPEC_PROFILING_FOLDER_PATH: rspec/profiling
   FRONTEND_FIXTURES_MAPPING_PATH: crystalball/frontend_fixtures_mapping.json
+  RSPEC_CHANGED_FILES_PATH: rspec/changed_files.txt
+  RSPEC_MATCHING_TESTS_PATH: rspec/matching_tests.txt
   RSPEC_LAST_RUN_RESULTS_FILE: rspec/rspec_last_run_results.txt
   JUNIT_RESULT_FILE: rspec/junit_rspec.xml
   JUNIT_RETRY_FILE: rspec/junit_rspec-retry.xml

.gitlab/ci/package-and-test/main.gitlab-ci.yml

@@ -4,7 +4,7 @@ include:
   - local: .gitlab/ci/global.gitlab-ci.yml
   - local: .gitlab/ci/package-and-test/rules.gitlab-ci.yml
   - project: gitlab-org/quality/pipeline-common
-    ref: 1.0.1
+    ref: 1.2.1
     file:
       - /ci/base.gitlab-ci.yml
       - /ci/allure-report.yml
@@ -22,11 +22,12 @@ include:
   image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/debian-bullseye-ruby-${RUBY_VERSION}:bundler-2.3
 
 .bundle-install:
-  extends: .qa-cache
+  extends:
+    - .gitlab-qa-install
+    - .qa-cache
   variables:
-    RUN_WITH_BUNDLE: "true" # adds 'bundle exec' prefix for gitlab-qa commands in pipeline-common job templates
-  before_script:
-    - cd qa && bundle install
+    RUN_WITH_BUNDLE: "true" # installs and runs gitlab-qa via bundler
+    QA_PATH: qa
 
 .update-script:
   script:
@@ -35,15 +36,8 @@ include:
     - echo "Running - '$QA_COMMAND'"
     - eval "$QA_COMMAND"
 
-.manual-qa:
-  stage: test
-  allow_failure: true
-  needs:
-    - trigger-omnibus
-
 .qa:
   extends:
-    - .use-docker-in-docker
     - .qa-base
     - .bundle-install
     - .gitlab-qa-report
@@ -90,6 +84,19 @@ download-knapsack-report:
       - qa/knapsack/ee-*.json
     expire_in: 1 day
 
+# e2e test jobs run on separate runner which has separate cache setup
+cache-gems:
+  extends:
+    - .ruby-image
+    - .bundle-install
+    - .qa-cache-push
+    - .rules:prepare
+  stage: .pre
+  tags:
+    - e2e
+  script:
+    - echo "Populated qa cache"
+
 # ==========================================
 # Test stage
 # ==========================================
@@ -104,8 +111,11 @@ download-knapsack-report:
 _ee:quarantine:
   extends:
     - .qa
-    - .manual-qa
     - .rules:test:quarantine
+  needs:
+    - trigger-omnibus
+  stage: test
+  allow_failure: true
   variables:
     QA_RSPEC_TAGS: --tag quarantine
 
@@ -438,23 +448,6 @@ allure-report:
     ALLURE_MERGE_REQUEST_IID: $CI_MERGE_REQUEST_IID
     ALLURE_JOB_NAME: e2e-package-and-test
 
-notify-slack:
-  extends:
-    - .notify-slack-qa
-    - .ruby-image
-    - .bundle-install
-    - .rules:report:process-results
-  stage: .post
-  variables:
-    ALLURE_JOB_NAME: package-and-qa
-    SLACK_ICON_EMOJI: ci_failing
-    STATUS_SYM: ☠️
-    STATUS: failed
-  when: on_failure
-  script:
-    - bundle exec gitlab-qa-report --prepare-stage-reports "$CI_PROJECT_DIR/gitlab-qa-run-*/**/rspec-*.xml" # generate summary
-    - !reference [.notify-slack-qa, script]
-
 upload-knapsack-report:
   extends:
     - .generate-knapsack-report-base
@@ -478,7 +471,7 @@ relate-test-failures:
   script:
     - |
       bundle exec gitlab-qa-report \
-        --relate-failure-issue "gitlab-qa-run-*/**/rspec-*.json" \
+        --relate-failure-issue "$CI_PROJECT_DIR/gitlab-qa-run-*/**/rspec-*.json" \
         --project "$QA_FAILURES_REPORTING_PROJECT" \
         --max-diff-ratio "$QA_FAILURES_MAX_DIFF_RATIO"
 
@@ -495,5 +488,29 @@ generate-test-session:
   script:
     - |
       bundle exec gitlab-qa-report \
-        --generate-test-session "gitlab-qa-run-*/**/rspec-*.json" \
+        --generate-test-session "$CI_PROJECT_DIR/gitlab-qa-run-*/**/rspec-*.json" \
         --project "$QA_TESTCASE_SESSIONS_PROJECT"
+  artifacts:
+    when: always
+    expire_in: 1d
+    paths:
+      - qa/REPORT_ISSUE_URL
+
+notify-slack:
+  extends:
+    - .notify-slack-qa
+    - .ruby-image
+    - .bundle-install
+    - .rules:report:process-results
+  stage: .post
+  needs:
+    - generate-test-session
+  variables:
+    ALLURE_JOB_NAME: e2e-package-and-test
+    SLACK_ICON_EMOJI: ci_failing
+    STATUS_SYM: ☠️
+    STATUS: failed
+  when: on_failure
+  script:
+    - bundle exec gitlab-qa-report --prepare-stage-reports "$CI_PROJECT_DIR/gitlab-qa-run-*/**/rspec-*.xml" # generate summary
+    - !reference [.notify-slack-qa, script]

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

@@ -69,7 +69,7 @@ qa:update-qa-cache:
 populate-e2e-test-vars:
   extends:
     - .qa-job-base
-    - .qa:rules:determine-qa-tests
+    - .qa:rules:determine-e2e-tests
   stage: prepare
   variables:
     ENV_FILE: $CI_PROJECT_DIR/qa_tests_vars.env
@@ -83,7 +83,7 @@ populate-e2e-test-vars:
 
 e2e-test-pipeline-generate:
   extends:
-    - .qa:rules:determine-qa-tests
+    - .qa:rules:determine-e2e-tests
   stage: prepare
   when: on_success
   needs:
@@ -99,7 +99,7 @@ e2e-test-pipeline-generate:
 
 e2e:package-and-test:
   extends:
-    - .qa:rules:package-and-qa
+    - .qa:rules:package-and-test
   stage: qa
   when: on_success
   needs:

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

@@ -8,11 +8,13 @@
 
 .base-script:
   script:
+    - source ./scripts/rspec_helpers.sh
     # Only install knapsack after bundle install! Otherwise oddly some native
     # gems could not be found under some circumstance. No idea why, hours wasted.
     - run_timed_command "gem install knapsack --no-document"
-    - run_timed_command "scripts/gitaly-test-spawn"
-    - source ./scripts/rspec_helpers.sh
+    - echo -e "\e[0Ksection_start:`date +%s`:gitaly-test-spawn[collapsed=true]\r\e[0KStarting Gitaly"
+    - run_timed_command "scripts/gitaly-test-spawn"  # Do not use 'bundle exec' here
+    - echo -e "\e[0Ksection_end:`date +%s`:gitaly-test-spawn\r\e[0K"
 
 .minimal-rspec-tests:
   variables:
@@ -966,7 +968,7 @@ rspec fail-fast:
   needs: ["setup-test-env", "retrieve-tests-metadata", "compile-test-assets", "detect-tests"]
   script:
     - !reference [.base-script, script]
-    - rspec_fail_fast tmp/matching_tests.txt "--tag ~quarantine"
+    - rspec_fail_fast "${RSPEC_MATCHING_TESTS_PATH}" "--tag ~quarantine"
   artifacts:
     expire_in: 7d
     paths:
@@ -976,10 +978,10 @@ rspec foss-impact:
   extends:
     - .rspec-base-pg12-as-if-foss
     - .rails:rules:rspec-foss-impact
-  needs: ["setup-test-env", "retrieve-tests-metadata", "compile-test-assets as-if-foss", "detect-tests as-if-foss"]
+  needs: ["setup-test-env", "retrieve-tests-metadata", "compile-test-assets as-if-foss", "detect-tests"]
   script:
     - !reference [.base-script, script]
-    - rspec_matched_foss_tests tmp/matching_foss_tests.txt "--tag ~quarantine"
+    - rspec_matched_foss_tests "${RSPEC_MATCHING_TESTS_PATH}" "--tag ~quarantine"
   artifacts:
     expire_in: 7d
     paths:

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

@@ -162,7 +162,7 @@ allure-report-qa-blocking:
     - review-qa-smoke
     - review-qa-reliable
   variables:
-    ALLURE_JOB_NAME: review-qa-blocking
+    ALLURE_JOB_NAME: e2e-review-qa-blocking
 
 allure-report-qa-all:
   extends:
@@ -170,7 +170,7 @@ allure-report-qa-all:
     - .review:rules:review-qa-all-report
   needs: ["review-qa-all"]
   variables:
-    ALLURE_JOB_NAME: review-qa-all
+    ALLURE_JOB_NAME: e2e-review-qa-all
 
 upload-knapsack-report:
   extends:

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

@@ -133,7 +133,7 @@
 .if-dot-com-gitlab-org-and-security-merge-request-and-qa-tests-specified: &if-dot-com-gitlab-org-and-security-merge-request-and-qa-tests-specified
   if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/security$)/ && $CI_MERGE_REQUEST_IID && $QA_TESTS'
 
-.if-dot-com-gitlab-org-and-security-merge-request-manual-ff-package-and-qa: &if-dot-com-gitlab-org-and-security-merge-request-manual-ff-package-and-qa
+.if-dot-com-gitlab-org-and-security-merge-request-manual-ff-package-and-e2e: &if-dot-com-gitlab-org-and-security-merge-request-manual-ff-package-and-e2e
   if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/security$)/ && $CI_MERGE_REQUEST_IID && $QA_MANUAL_FF_PACKAGE_AND_QA'
 
 .if-dot-com-gitlab-org-and-security-tag: &if-dot-com-gitlab-org-and-security-tag
@@ -916,7 +916,7 @@
     - <<: *if-default-refs
       changes: *qa-patterns
 
-.qa:rules:determine-qa-tests:
+.qa:rules:determine-e2e-tests:
   rules:
     - <<: *if-not-ee
       when: never
@@ -930,7 +930,7 @@
     - <<: *if-force-ci
       allow_failure: true
 
-.qa:rules:package-and-qa:
+.qa:rules:package-and-test:
   rules:
     - <<: *if-fork-merge-request
       when: never
@@ -940,7 +940,7 @@
       when: never
     - <<: *if-merge-request-targeting-stable-branch
       allow_failure: true
-    - <<: *if-dot-com-gitlab-org-and-security-merge-request-manual-ff-package-and-qa
+    - <<: *if-dot-com-gitlab-org-and-security-merge-request-manual-ff-package-and-e2e
       changes: *feature-flag-development-config-patterns
       when: manual
       allow_failure: true
@@ -968,6 +968,7 @@
       variables:
         SKIP_REPORT_IN_ISSUES: "false"
         PROCESS_TEST_RESULTS: "true"
+        KNAPSACK_GENERATE_REPORT: "true"
     - <<: *if-force-ci
       when: manual
       allow_failure: true
@@ -1516,6 +1517,12 @@
       changes: ["vendor/gems/omniauth-gitlab/**/*"]
     - <<: *if-merge-request-labels-run-all-rspec
 
+.vendor:rules:omniauth-google-oauth2:
+  rules:
+    - <<: *if-merge-request
+      changes: ["vendor/gems/omniauth-google-oauth2/**/*"]
+    - <<: *if-merge-request-labels-run-all-rspec
+
 .vendor:rules:omniauth-salesforce:
   rules:
     - <<: *if-merge-request

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

@@ -110,10 +110,13 @@ generate-frontend-fixtures-mapping:
     paths:
       - ${FRONTEND_FIXTURES_MAPPING_PATH}
 
-.detect-test-base:
+detect-tests:
+  extends: .rails:rules:detect-tests
   image: ${GITLAB_DEPENDENCY_PROXY}ruby:${RUBY_VERSION}
   needs: []
   stage: prepare
+  variables:
+    RSPEC_TESTS_MAPPING_ENABLED: "true"
   script:
     - source ./scripts/utils.sh
     - source ./scripts/rspec_helpers.sh
@@ -123,42 +126,23 @@ generate-frontend-fixtures-mapping:
     - retrieve_frontend_fixtures_mapping
     - |
       if [ -n "$CI_MERGE_REQUEST_IID" ]; then
-        tooling/bin/find_changes ${CHANGES_FILE};
-        tooling/bin/find_tests ${CHANGES_FILE} ${MATCHED_TESTS_FILE};
-        tooling/bin/find_changes ${CHANGES_FILE} ${MATCHED_TESTS_FILE} ${FRONTEND_FIXTURES_MAPPING_PATH};
-        echo "Changed files: $(cat $CHANGES_FILE)";
-        echo "Related rspec tests: $(cat $MATCHED_TESTS_FILE)";
+        mkdir -p $(dirname "$RSPEC_CHANGED_FILES_PATH")
+        tooling/bin/find_changes ${RSPEC_CHANGED_FILES_PATH};
+        tooling/bin/find_tests ${RSPEC_CHANGED_FILES_PATH} ${RSPEC_MATCHING_TESTS_PATH};
+        tooling/bin/find_changes ${RSPEC_CHANGED_FILES_PATH} ${RSPEC_MATCHING_TESTS_PATH} ${FRONTEND_FIXTURES_MAPPING_PATH};
+        echo "Changed files: $(cat $RSPEC_CHANGED_FILES_PATH)";
+        echo "Related rspec tests: $(cat $RSPEC_MATCHING_TESTS_PATH)";
       fi
   artifacts:
     expire_in: 7d
     paths:
-      - ${CHANGES_FILE}
-      - ${MATCHED_TESTS_FILE}
+      - ${RSPEC_CHANGED_FILES_PATH}
+      - ${RSPEC_MATCHING_TESTS_PATH}
       - ${FRONTEND_FIXTURES_MAPPING_PATH}
 
-detect-tests:
-  extends:
-    - .detect-test-base
-    - .rails:rules:detect-tests
-  variables:
-    RSPEC_TESTS_MAPPING_ENABLED: "true"
-    CHANGES_FILE: tmp/changed_files.txt
-    MATCHED_TESTS_FILE: tmp/matching_tests.txt
-
-detect-tests as-if-foss:
-  extends:
-    - .detect-test-base
-    - .rails:rules:detect-tests
-    - .as-if-foss
-  variables:
-    CHANGES_FILE: tmp/changed_foss_files.txt
-    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
+    - detect-tests
     - .rails:rules:detect-previous-failed-tests
   variables:
     PREVIOUS_FAILED_TESTS_DIR: tmp/previous_failed_tests/

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

@@ -123,7 +123,7 @@ rubocop:
       if [ -z "${CI_MERGE_REQUEST_IID}" ] || [ "${RUN_ALL_RUBOCOP}" == "true" ]; then
         run_timed_command "bundle exec rubocop --parallel"
       else
-        run_timed_command "bundle exec rubocop --parallel --force-exclusion $(cat tmp/changed_files.txt)"
+        run_timed_command "bundle exec rubocop --parallel --force-exclusion $(cat ${RSPEC_CHANGED_FILES_PATH})"
       fi
 
 qa:metadata-lint:

.gitlab/ci/vendored-gems.gitlab-ci.yml

@@ -46,6 +46,14 @@ vendor omniauth-gitlab:
     include: vendor/gems/omniauth-gitlab/.gitlab-ci.yml
     strategy: depend
 
+vendor omniauth-google-oauth2:
+  extends:
+    - .vendor:rules:omniauth-google-oauth2
+  needs: []
+  trigger:
+    include: vendor/gems/omniauth-google-oauth2/.gitlab-ci.yml
+    strategy: depend
+
 vendor omniauth-salesforce:
   extends:
     - .vendor:rules:omniauth-salesforce

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

@@ -26,7 +26,6 @@ the noise (due to constantly failing tests, flaky tests, and so on) so that new
 - [ ] Dequarantine test check-list
   - [ ] Follow the [Dequarantining Tests guide](https://about.gitlab.com/handbook/engineering/quality/quality-engineering/debugging-qa-test-failures/#dequarantining-tests).
   - [ ] Confirm the test consistently passes on the target GitLab environment(s).
-    - [ ] (Optionally) [Trigger a manual GitLab-QA pipeline](https://about.gitlab.com/handbook/engineering/quality/quality-engineering/tips-and-tricks/#running-gitlab-qa-pipeline-against-a-specific-gitlab-release) against a specific GitLab environment using the `RELEASE` variable from the `package-and-qa` job of the current merge request.
 - [ ] 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. -->

.gitlab/merge_request_templates/Security Release.md

@@ -21,7 +21,7 @@ See [the general developer security release guidelines](https://gitlab.com/gitla
   - [ ] Ensure it's approved according to our [Approval Guidelines].
   - [ ] Ensure it's approved by an AppSec engineer.
     - Please see the security release [Code reviews and Approvals] documentation for details on which AppSec team member to ping for approval.
-    - Trigger the [`package-and-qa` build]. The docker image generated will be used by the AppSec engineer to validate the security vulnerability has been remediated.
+    - Trigger the [`e2e:package-and-test` job]. The docker image generated will be used by the AppSec engineer to validate the security vulnerability has been remediated.
 - [ ] For a backport MR targeting a versioned stable branch (`X-Y-stable-ee`).
   - [ ] Milestone is set to the version this backport applies to. A closed milestone can be assigned via [quick actions].
   - [ ] Ensure it's approved by a maintainer.

.rubocop.yml

@@ -566,9 +566,6 @@ Graphql/Descriptions:
 RSpec/ImplicitSubject:
   Enabled: false
 
-RSpec/ReceiveNever:
-  Enabled: false
-
 # Already covered by `RSpec::Configuration#on_potential_false_positives = :raise`.
 # See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86429
 RSpec/UnspecifiedException:

.rubocop_todo/layout/hash_alignment.yml

@@ -3,29 +3,7 @@
 Layout/HashAlignment:
   Exclude:
     - 'ee/spec/lib/ee/gitlab/usage_data_spec.rb'
-    - 'lib/gitlab/no_cache_headers.rb'
-    - 'lib/gitlab/sidekiq_daemon/memory_killer.rb'
-    - 'lib/gitlab/sidekiq_middleware/server_metrics.rb'
-    - 'lib/gitlab/slash_commands/presenters/base.rb'
-    - 'lib/gitlab/template/gitignore_template.rb'
-    - 'lib/gitlab/visibility_level.rb'
-    - 'lib/product_analytics/event_params.rb'
-    - 'lib/sidebars/projects/menus/infrastructure_menu.rb'
-    - 'lib/tasks/gitlab/import_export/export.rake'
-    - 'lib/tasks/gitlab/import_export/import.rake'
-    - 'lib/tasks/tanuki_emoji.rake'
-    - 'spec/controllers/concerns/product_analytics_tracking_spec.rb'
-    - 'spec/controllers/concerns/redis_tracking_spec.rb'
-    - 'spec/controllers/import/bitbucket_controller_spec.rb'
-    - 'spec/controllers/oauth/token_info_controller_spec.rb'
-    - 'spec/controllers/omniauth_callbacks_controller_spec.rb'
-    - 'spec/controllers/projects/artifacts_controller_spec.rb'
-    - 'spec/controllers/projects/feature_flags_controller_spec.rb'
-    - 'spec/controllers/projects/grafana_api_controller_spec.rb'
     - 'spec/controllers/projects/merge_requests_controller_spec.rb'
-    - 'spec/controllers/projects/pipeline_schedules_controller_spec.rb'
-    - 'spec/controllers/projects/registry/tags_controller_spec.rb'
-    - 'spec/controllers/projects/service_desk_controller_spec.rb'
     - 'spec/lib/backup/gitaly_backup_spec.rb'
     - 'spec/lib/banzai/filter/repository_link_filter_spec.rb'
     - 'spec/lib/gitlab/asciidoc_spec.rb'

.rubocop_todo/style/format_string.yml

@@ -65,6 +65,7 @@ Style/FormatString:
     - 'app/helpers/members_helper.rb'
     - 'app/helpers/merge_requests_helper.rb'
     - 'app/helpers/mirror_helper.rb'
+    - 'app/helpers/notify_helper.rb'
     - 'app/helpers/preferences_helper.rb'
     - 'app/helpers/profiles_helper.rb'
     - 'app/helpers/projects/project_members_helper.rb'

Gemfile

@@ -46,7 +46,7 @@ gem 'omniauth-alicloud', '~> 1.0.1'
 gem 'omniauth-facebook', '~> 4.0.0'
 gem 'omniauth-github', '~> 1.4'
 gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md
-gem 'omniauth-google-oauth2', '~> 0.6.0'
+gem 'omniauth-google-oauth2', '~> 0.6.0', path: 'vendor/gems/omniauth-google-oauth2' # See gem README.md
 gem 'omniauth-oauth2-generic', '~> 0.2.2'
 gem 'omniauth-saml', '~> 1.10'
 gem 'omniauth-shibboleth', '~> 1.3.0'
@@ -385,7 +385,9 @@ group :development, :test do
   gem 'haml_lint', '~> 0.40.0', require: false
   gem 'bundler-audit', '~> 0.7.0.1', require: false
 
+  # Benchmarking & profiling
   gem 'benchmark-ips', '~> 2.3.0', require: false
+  gem 'benchmark-memory', '~> 0.1', require: false
 
   gem 'knapsack', '~> 1.21.1'
   gem 'crystalball', '~> 0.7.0', require: false
@@ -460,7 +462,6 @@ gem 'ruby-prof', '~> 1.3.0'
 gem 'stackprof', '~> 0.2.21', require: false
 gem 'rbtrace', '~> 0.4', require: false
 gem 'memory_profiler', '~> 0.9', require: false
-gem 'benchmark-memory', '~> 0.1', require: false
 gem 'activerecord-explain-analyze', '~> 0.1', require: false
 
 # OAuth

Gemfile.lock

@@ -47,6 +47,14 @@ PATH
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.7.1)
 
+PATH
+  remote: vendor/gems/omniauth-google-oauth2
+  specs:
+    omniauth-google-oauth2 (0.6.0)
+      jwt (>= 2.0)
+      omniauth (>= 1.9, < 3)
+      omniauth-oauth2 (>= 1.5)
+
 PATH
   remote: vendor/gems/omniauth-salesforce
   specs:
@@ -925,10 +933,6 @@ GEM
     omniauth-github (1.4.0)
       omniauth (~> 1.5)
       omniauth-oauth2 (>= 1.4.0, < 2.0)
-    omniauth-google-oauth2 (0.6.0)
-      jwt (>= 2.0)
-      omniauth (>= 1.1.1)
-      omniauth-oauth2 (>= 1.5)
     omniauth-oauth (1.2.0)
       oauth
       omniauth (>= 1.0, < 3)
@@ -1673,7 +1677,7 @@ DEPENDENCIES
   omniauth-facebook (~> 4.0.0)
   omniauth-github (~> 1.4)
   omniauth-gitlab (~> 4.0.0)!
-  omniauth-google-oauth2 (~> 0.6.0)
+  omniauth-google-oauth2 (~> 0.6.0)!
   omniauth-oauth2-generic (~> 0.2.2)
   omniauth-salesforce (~> 1.0.5)!
   omniauth-saml (~> 1.10)

app/assets/javascripts/batch_comments/components/submit_dropdown.vue

@@ -82,8 +82,11 @@ export default {
 
         this.autosave.reset();
 
-        if (window.mrTabs && this.note) {
-          window.location.hash = `note_${this.getCurrentUserLastNote.id}`;
+        if (window.mrTabs && (this.noteData.note || this.noteData.approve)) {
+          if (this.noteData.note) {
+            window.location.hash = `note_${this.getCurrentUserLastNote.id}`;
+          }
+
           window.mrTabs.tabShown('show');
 
           setTimeout(() =>

app/assets/javascripts/boards/components/board_blocked_icon.vue

 <script>
 import { GlIcon, GlLink, GlPopover, GlLoadingIcon } from '@gitlab/ui';
 import { blockingIssuablesQueries, issuableTypes } from '~/boards/constants';
-import { TYPE_ISSUE } from '~/graphql_shared/constants';
+import { TYPE_ISSUE, TYPE_EPIC } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import { truncate } from '~/lib/utils/text_utility';
 import { __, n__, s__, sprintf } from '~/locale';
@@ -10,10 +10,12 @@ export default {
   i18n: {
     issuableType: {
       [issuableTypes.issue]: __('issue'),
+      [issuableTypes.epic]: __('epic'),
     },
   },
   graphQLIdType: {
     [issuableTypes.issue]: TYPE_ISSUE,
+    [issuableTypes.epic]: TYPE_EPIC,
   },
   referenceFormatter: {
     [issuableTypes.issue]: (r) => r.split('/')[1],
@@ -40,7 +42,7 @@ export default {
       type: String,
       required: true,
       validator(value) {
-        return [issuableTypes.issue].includes(value);
+        return [issuableTypes.issue, issuableTypes.epic].includes(value);
       },
     },
   },
@@ -53,14 +55,21 @@ export default {
         return blockingIssuablesQueries[this.issuableType].query;
       },
       variables() {
+        if (this.isEpic) {
+          return {
+            fullPath: this.item.group.fullPath,
+            iid: Number(this.item.iid),
+          };
+        }
         return {
           id: convertToGraphQLId(this.$options.graphQLIdType[this.issuableType], this.item.id),
         };
       },
       update(data) {
         this.skip = true;
+        const issuable = this.isEpic ? data?.group?.issuable : data?.issuable;
 
-        return data?.issuable?.blockingIssuables?.nodes || [];
+        return issuable?.blockingIssuables?.nodes || [];
       },
       error(error) {
         const message = sprintf(s__('Boards|Failed to fetch blocking %{issuableType}s'), {
@@ -77,13 +86,16 @@ export default {
     };
   },
   computed: {
+    isEpic() {
+      return this.issuableType === issuableTypes.epic;
+    },
     displayedIssuables() {
       const { defaultDisplayLimit, referenceFormatter } = this.$options;
       return this.blockingIssuables.slice(0, defaultDisplayLimit).map((i) => {
         return {
           ...i,
           title: truncate(i.title, this.$options.textTruncateWidth),
-          reference: referenceFormatter[this.issuableType](i.reference),
+          reference: this.isEpic ? i.reference : referenceFormatter[this.issuableType](i.reference),
         };
       });
     },
@@ -106,6 +118,9 @@ export default {
         },
       );
     },
+    blockIcon() {
+      return this.issuableType === issuableTypes.issue ? 'issue-block' : 'entity-blocked';
+    },
     glIconId() {
       return `blocked-icon-${this.uniqueId}`;
     },
@@ -153,7 +168,7 @@ export default {
     <gl-icon
       :id="glIconId"
       ref="icon"
-      name="issue-block"
+      :name="blockIcon"
       class="issue-blocked-icon gl-mr-2 gl-cursor-pointer gl-text-red-500"
       data-testid="issue-blocked-icon"
       @mouseenter="handleMouseEnter"

app/assets/javascripts/boards/components/board_card_inner.vue

@@ -274,16 +274,16 @@ export default {
         class="gl-display-flex align-items-start flex-wrap-reverse board-card-number-container gl-overflow-hidden"
       >
         <gl-loading-icon v-if="item.isLoading" size="lg" class="gl-mt-5" />
-        <work-item-type-icon
-          v-if="showWorkItemTypeIcon"
-          :work-item-type="item.type"
-          show-tooltip-on-hover
-        />
         <span
           v-if="item.referencePath"
           class="board-card-number gl-overflow-hidden gl-display-flex gl-mr-3 gl-mt-3 gl-text-secondary"
           :class="{ 'gl-font-base': isEpicBoard }"
         >
+          <work-item-type-icon
+            v-if="showWorkItemTypeIcon"
+            :work-item-type="item.type"
+            show-tooltip-on-hover
+          />
           <tooltip-on-truncate
             v-if="showReferencePath"
             :title="itemReferencePath"