.gitlab-ci.yml

@@ -16,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.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36"
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/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
@@ -96,6 +96,9 @@ variables:
   # Default latest tag for particular branch
   QA_IMAGE_BRANCH: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-ee-qa:${CI_COMMIT_REF_SLUG}"
 
+  REGISTRY_HOST: "registry.gitlab.com"
+  REGISTRY_GROUP: "gitlab-org"
+
   # Preparing custom clone path to reduce space used by all random forks
   # on GitLab.com's Shared Runners. Our main forks - especially the security
   # ones - will have this variable overwritten in the project settings, so that

.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.33-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/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"
@@ -331,7 +331,7 @@ bundle-size-review:
   extends:
     - .default-retry
     - .frontend:rules:bundle-size-review
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:danger
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:danger
   stage: test
   needs: ["compile-production-assets"]
   script:

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

@@ -213,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.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36"
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/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"]
@@ -222,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.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36"
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/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"]
@@ -231,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.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-13-graphicsmagick-1.3.36"
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/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"]
@@ -240,7 +240,7 @@
     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.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36"
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/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"]
@@ -251,7 +251,7 @@
     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.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36"
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/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"]
@@ -262,7 +262,7 @@
     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.33-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-13-graphicsmagick-1.3.36"
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/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"]
@@ -274,7 +274,7 @@
 
 .use-kaniko:
   image:
-    name: registry.gitlab.com/gitlab-org/gitlab-build-images:kaniko
+    name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:kaniko
     entrypoint: [""]
   before_script:
     - source scripts/utils.sh

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

@@ -57,11 +57,12 @@ update-qa-cache:
     - install_gitlab_gem
     - tooling/bin/find_change_diffs ${CHANGES_DIFFS_DIR}
   script:
+    - tooling/bin/qa/check_if_qa_only_spec_changes ${CHANGES_FILE} ${ONLY_QA_CHANGES_FILE}
+    - '[ -f $ONLY_QA_CHANGES_FILE ] && export QA_TESTS="`cat $ONLY_QA_CHANGES_FILE`"'
+    - 'echo "QA_TESTS: $QA_TESTS"'
+    - exit_code=0 && tooling/bin/qa/package_and_qa_check ${CHANGES_DIFFS_DIR} || exit_code=$?
+    - echo $exit_code
     - |
-      tooling/bin/qa/check_if_qa_only_spec_changes ${CHANGES_FILE} ${ONLY_QA_CHANGES_FILE}
-      [ -f $ONLY_QA_CHANGES_FILE ] && export QA_TESTS="`cat $ONLY_QA_CHANGES_FILE`"
-      echo "QA_TESTS: $QA_TESTS"
-      tooling/bin/qa/package_and_qa_check ${CHANGES_DIFFS_DIR} && exit_code=$?
       if [ $exit_code -eq 0 ]; then
         ./scripts/trigger-build omnibus
       elif [ $exit_code -eq 1 ]; then
@@ -89,6 +90,7 @@ update-qa-cache:
     CHANGES_FILE: tmp/changed_files.txt
     ONLY_QA_CHANGES_FILE: tmp/qa_only_changed_files.txt
     CHANGES_DIFFS_DIR: tmp/diffs
+    ALLURE_JOB_NAME: $CI_JOB_NAME
 
 .package-and-qa-ff-base:
   script:

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

@@ -18,9 +18,13 @@
   variables:
     RSPEC_TESTS_MAPPING_ENABLED: "true"
 
-.decomposed-database-rspec:
+.decomposed-database:
   variables:
     DECOMPOSED_DB: "true"
+
+.decomposed-database-rspec:
+  extends: .decomposed-database
+  variables:
     GITLAB_LOAD_BALANCING_REUSE_PRIMARY_ci: "main"
     GITLAB_USE_MODEL_LOAD_BALANCING: "true"
 
@@ -342,9 +346,8 @@ rspec fast_spec_helper minimal:
 db:rollback:
   extends: .db-job-base
   script:
-    - if [[ -d "ee/" ]]; then task="db:migrate:main"; else task="db:migrate"; fi
-    - bundle exec rake "${task}" VERSION=20181228175414
-    - bundle exec rake "${task}" SKIP_SCHEMA_VERSION_CHECK=true
+    - scripts/db_tasks db:migrate VERSION=20181228175414
+    - scripts/db_tasks db:migrate SKIP_SCHEMA_VERSION_CHECK=true
 
 db:migrate:reset:
   extends: .db-job-base
@@ -369,21 +372,34 @@ db:migrate-from-previous-major-version:
     - git checkout -f $CI_COMMIT_SHA
     - SETUP_DB=false USE_BUNDLE_INSTALL=true bash scripts/prepare_build.sh
   script:
-    - if [[ -d "ee/" ]]; then task="db:migrate:main"; else task="db:migrate"; fi
-    - run_timed_command "bundle exec rake ${task}"
+    - run_timed_command "scripts/db_tasks db:migrate"
 
-db:check-schema:
+db:migrate-from-previous-major-version-decomposed:
   extends:
     - db:migrate-from-previous-major-version
+    - .decomposed-database
+    - .rails:rules:decomposed-databases
+
+.db:check-schema-base:
+  extends:
     - .rails:rules:ee-mr-and-default-branch-only
   variables:
     TAG_TO_CHECKOUT: "v14.4.0"
   script:
-    - if [[ -d "ee/" ]]; then task="db:migrate:main"; else task="db:migrate"; fi
-    - run_timed_command "bundle exec rake ${task}"
+    - run_timed_command "scripts/db_tasks db:migrate"
     - scripts/schema_changed.sh
     - scripts/validate_migration_timestamps
 
+db:check-schema:
+  extends:
+    - db:migrate-from-previous-major-version
+    - .db:check-schema-base
+
+db:check-schema-decomposed:
+  extends:
+    - db:migrate-from-previous-major-version-decomposed
+    - .db:check-schema-base
+
 db:check-migrations:
   extends:
     - .db-job-base
@@ -393,6 +409,12 @@ db:check-migrations:
     - scripts/validate_migration_schema
   allow_failure: true
 
+db:check-migrations-decomposed:
+  extends:
+    - db:check-migrations
+    - .decomposed-database
+    - .rails:rules:decomposed-databases
+
 db:gitlabcom-database-testing:
   extends: .rails:rules:db:gitlabcom-database-testing
   stage: test
@@ -491,6 +513,11 @@ rspec:coverage:
     - rspec unit pg12 minimal
     - rspec integration pg12 minimal
     - rspec system pg12 minimal
+    # FOSS/EE decomposed jobs
+    - rspec migration pg12 decomposed
+    - rspec unit pg12 decomposed
+    - rspec integration pg12 decomposed
+    - rspec system pg12 decomposed
     # EE jobs
     - rspec-ee migration pg12
     - rspec-ee unit pg12
@@ -501,6 +528,11 @@ rspec:coverage:
     - rspec-ee unit pg12 minimal
     - rspec-ee integration pg12 minimal
     - rspec-ee system pg12 minimal
+    # EE decomposed jobs
+    - rspec-ee migration pg12 decomposed
+    - rspec-ee unit pg12 decomposed
+    - rspec-ee integration pg12 decomposed
+    - rspec-ee system pg12 decomposed
     # Geo jobs
     - rspec-ee unit pg12 geo
     - rspec-ee integration pg12 geo
@@ -512,6 +544,19 @@ rspec:coverage:
     # Memory jobs
     - memory-static
     - memory-on-boot
+    # As-if-FOSS jobs
+    - rspec migration pg12-as-if-foss
+    - rspec migration pg12-as-if-foss minimal
+    - rspec migration pg12-as-if-foss decomposed
+    - rspec unit pg12-as-if-foss
+    - rspec unit pg12-as-if-foss minimal
+    - rspec unit pg12-as-if-foss decomposed
+    - rspec integration pg12-as-if-foss
+    - rspec integration pg12-as-if-foss minimal
+    - rspec integration pg12-as-if-foss decomposed
+    - rspec system pg12-as-if-foss
+    - rspec system pg12-as-if-foss minimal
+    - rspec system pg12-as-if-foss decomposed
   script:
     - run_timed_command "bundle exec scripts/merge-simplecov"
     - run_timed_command "bundle exec scripts/gather-test-memory-data"

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

@@ -34,7 +34,7 @@ review-build-cng:
 .review-workflow-base:
   extends:
     - .default-retry
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-helm3.5-kubectl1.17
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:gitlab-helm3.5-kubectl1.17
   resource_group: "review/${CI_COMMIT_REF_NAME}"
   variables:
     HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
@@ -105,4 +105,4 @@ review-stop:
   stage: deploy
   needs: []
   script:
-    - delete_k8s_release_namespace
+    - delete_namespace

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

@@ -58,7 +58,7 @@
 
 .allure-report-base:
   image:
-    name: ${GITLAB_DEPENDENCY_PROXY}andrcuns/allure-report-publisher:0.4.1
+    name: ${GITLAB_DEPENDENCY_PROXY}andrcuns/allure-report-publisher:0.4.2
     entrypoint: [""]
   stage: post-qa
   variables:

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

@@ -2,17 +2,20 @@ review-cleanup:
   extends:
     - .default-retry
     - .review:rules:review-cleanup
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-helm3-kubectl1.14
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:gitlab-helm3-kubectl1.14
   stage: prepare
   environment:
-    name: review/auto-cleanup
+    name: review/${CI_COMMIT_REF_SLUG}${FREQUENCY}
     action: stop
   before_script:
     - source scripts/utils.sh
+    - source scripts/review_apps/review-apps.sh
     - source scripts/review_apps/gcp_cleanup.sh
     - install_gitlab_gem
     - setup_gcp_dependencies
   script:
+    - delete_release
+    - delete_namespace
     - ruby -rrubygems scripts/review_apps/automated_cleanup.rb
     - gcp_cleanup
 

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

@@ -650,8 +650,6 @@
       changes: *code-backstage-patterns
     - <<: *if-security-merge-request
       changes: *code-backstage-patterns
-    - <<: *if-default-refs
-      changes: *backend-patterns
     - <<: *if-merge-request-not-approved
       when: never
     - <<: *if-default-refs
@@ -670,9 +668,6 @@
     - <<: *if-default-refs
       changes: *core-frontend-patterns
       when: never
-    - <<: *if-default-refs
-      changes: *backend-patterns
-      when: never
     - <<: *if-merge-request
       changes: *ci-patterns
       when: never
@@ -1623,6 +1618,9 @@
       allow_failure: true
     - <<: *if-dot-com-gitlab-org-merge-request
       changes: *qa-patterns
+    - <<: *if-dot-com-gitlab-org-schedule
+      variables:
+        KNAPSACK_GENERATE_REPORT: "true"
 
 .review:rules:review-build-cng:
   rules:
@@ -1662,10 +1660,6 @@
 
 .review:rules:review-qa-reliable:
   rules:
-    - <<: *if-dot-com-ee-2-hourly-schedule
-      allow_failure: true
-      variables:
-        KNAPSACK_GENERATE_REPORT: "true"
     - when: on_success
       allow_failure: true
 
@@ -1676,10 +1670,6 @@
       changes: *code-patterns
       when: manual
       allow_failure: true # manual jobs needs to be allowd to fail, otherwise they block the pipeline
-    - <<: *if-dot-com-ee-2-hourly-schedule
-      allow_failure: true
-      variables:
-        KNAPSACK_GENERATE_REPORT: "true"
     - when: on_success
       allow_failure: true
 
@@ -1699,13 +1689,13 @@
 # Reliable suite will pass most of the time so this should yield best distribution
 .review:rules:knapsack-report-qa-reliable:
   rules:
-    - <<: *if-dot-com-ee-2-hourly-schedule
+    - if: '$KNAPSACK_GENERATE_REPORT == "true"'
       when: on_success
       allow_failure: true
 
 .review:rules:knapsack-report-qa-all:
   rules:
-    - <<: *if-dot-com-ee-2-hourly-schedule
+    - if: '$KNAPSACK_GENERATE_REPORT == "true"'
       when: always
       allow_failure: true
 

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

@@ -53,7 +53,7 @@ generate-apollo-graphl-schema:
     - .static-analysis-base
     - .frontend:rules:default-frontend-jobs
   image:
-    name: registry.gitlab.com/gitlab-org/gitlab-build-images:apollo
+    name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:apollo
     entrypoint: [""]
   needs: ['graphql-schema-dump']
   variables:

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

@@ -22,8 +22,8 @@ workhorse:verify:
 
 workhorse:test using go 1.16:
   extends: .workhorse:test
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7-golang-1.16-git-2.31
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:ruby-2.7-golang-1.16-git-2.31
 
 workhorse:test using go 1.17:
   extends: .workhorse:test
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7-golang-1.17-git-2.31
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:ruby-2.7-golang-1.17-git-2.31

.gitlab/issue_templates/Experiment Implementation.md

@@ -20,6 +20,6 @@
 - [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 |
+| sequence | activity | category | action | label | property | value |
 | -------- | -------- | ------ | ----- | ------- | -------- | ----- |
-|  |  |  |  | json schema |  |  |
+|  |  |  |  |  |  |  |

.rubocop_todo.yml

@@ -289,17 +289,6 @@ Performance/DeleteSuffix:
     - 'ee/app/models/geo/upload_registry.rb'
     - 'ee/app/workers/geo/file_download_dispatch_worker/attachment_job_finder.rb'
 
-# Offense count: 13
-# Cop supports --auto-correct.
-Performance/Detect:
-  Exclude:
-    - 'ee/spec/controllers/projects/dependencies_controller_spec.rb'
-    - 'ee/spec/requests/api/dependencies_spec.rb'
-    - 'qa/qa/runtime/feature.rb'
-    - 'spec/lib/gitlab/git/tree_spec.rb'
-    - 'spec/lib/gitlab/import_export/project/tree_restorer_spec.rb'
-    - 'spec/models/event_spec.rb'
-
 # Offense count: 121
 Performance/MethodObjectAsBlock:
   Enabled: false
@@ -827,11 +816,6 @@ Style/RescueModifier:
 Style/SingleArgumentDig:
   Enabled: false
 
-# Offense count: 45
-# Cop supports --auto-correct.
-Style/SlicingWithRange:
-  Enabled: false
-
 # Offense count: 63
 # Configuration parameters: AllowModifier.
 Style/SoleNestedConditional:

.rubocop_todo/gitlab/delegate_predicate_methods.yml

@@ -6,6 +6,5 @@ Gitlab/DelegatePredicateMethods:
   - app/models/concerns/integrations/base_data_fields.rb
   - app/models/project.rb
   - ee/app/models/concerns/ee/ci/metadatable.rb
-  - ee/app/models/ee/namespace.rb
   - ee/app/models/license.rb
   - lib/gitlab/ci/trace/stream.rb

.rubocop_todo/rails/save_bang.yml

@@ -19,13 +19,6 @@ Rails/SaveBang:
   - ee/spec/models/elasticsearch_indexed_namespace_spec.rb
   - ee/spec/models/gitlab_subscription_spec.rb
   - ee/spec/models/issue_spec.rb
-  - ee/spec/models/label_note_spec.rb
-  - ee/spec/models/lfs_object_spec.rb
-  - ee/spec/models/license_spec.rb
-  - ee/spec/models/merge_request_spec.rb
-  - ee/spec/models/merge_train_spec.rb
-  - ee/spec/models/project_ci_cd_setting_spec.rb
-  - ee/spec/models/project_spec.rb
   - ee/spec/models/protected_environment_spec.rb
   - ee/spec/models/repository_spec.rb
   - ee/spec/models/scim_identity_spec.rb
@@ -60,10 +53,6 @@ Rails/SaveBang:
   - ee/spec/services/status_page/trigger_publish_service_spec.rb
   - ee/spec/services/todo_service_spec.rb
   - ee/spec/services/vulnerability_feedback/create_service_spec.rb
-  - qa/qa/specs/features/browser_ui/3_create/repository/push_mirroring_over_http_spec.rb
-  - qa/qa/specs/features/browser_ui/3_create/repository/push_mirroring_lfs_over_http_spec.rb
-  - qa/qa/specs/features/ee/browser_ui/3_create/repository/pull_mirroring_over_http_spec.rb
-  - qa/qa/specs/features/ee/browser_ui/3_create/repository/pull_mirroring_over_ssh_with_key_spec.rb
   - spec/lib/backup/manager_spec.rb
   - spec/lib/gitlab/alerting/alert_spec.rb
   - spec/lib/gitlab/analytics/cycle_analytics/records_fetcher_spec.rb

.rubocop_todo/style/open_struct_use.yml

@@ -2,10 +2,8 @@
 Style/OpenStructUse:
   Exclude:
   - app/helpers/application_settings_helper.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/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
@@ -15,7 +13,6 @@ Style/OpenStructUse:
   - lib/gitlab/testing/request_inspector_middleware.rb
   - lib/mattermost/session.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/factories/go_module_versions.rb
@@ -34,7 +31,6 @@ Style/OpenStructUse:
   - 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/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/models/design_management/design_action_spec.rb
@@ -47,5 +43,3 @@ Style/OpenStructUse:
   - spec/support/helpers/import_spec_helper.rb
   - spec/support/helpers/login_helpers.rb
   - spec/support/helpers/repo_helpers.rb
-  - spec/tooling/rspec_flaky/flaky_example_spec.rb
-  - tooling/rspec_flaky/flaky_example.rb

GITALY_SERVER_VERSION

-896612200106b19068dfdb4f8f67de0dd4807c0a
+0e0aeb5ca4488903f41acd392911bd89d1ad3d6d

GITLAB_PAGES_VERSION

-1.48.0
+1.49.0

Gemfile

@@ -153,7 +153,7 @@ gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
 # Markdown and HTML processing
 gem 'html-pipeline', '~> 2.13.2'
 gem 'deckar01-task_list', '2.3.1'
-gem 'gitlab-markup', '~> 1.7.1'
+gem 'gitlab-markup', '~> 1.8.0'
 gem 'github-markup', '~> 1.7.0', require: 'github/markup'
 gem 'commonmarker', '~> 0.23.2'
 gem 'kramdown', '~> 2.3.1'
@@ -464,7 +464,7 @@ gem 'health_check', '~> 3.0'
 
 # System information
 gem 'vmstat', '~> 2.3.0'
-gem 'sys-filesystem', '~> 1.1.6'
+gem 'sys-filesystem', '~> 1.4.3'
 
 # NTP client
 gem 'net-ntp'

Gemfile.lock

@@ -489,7 +489,7 @@ GEM
       with_env (= 1.1.0)
       xml-simple (~> 1.1.5)
     gitlab-mail_room (0.0.9)
-    gitlab-markup (1.7.1)
+    gitlab-markup (1.8.0)
     gitlab-net-dns (0.9.1)
     gitlab-omniauth-openid-connect (0.8.0)
       addressable (~> 2.7)
@@ -906,7 +906,7 @@ GEM
     orm_adapter (0.5.0)
     os (1.1.1)
     parallel (1.20.1)
-    parser (3.0.2.0)
+    parser (3.0.3.2)
       ast (~> 2.4.1)
     parslet (1.8.2)
     pastel (0.8.0)
@@ -1255,8 +1255,8 @@ GEM
       activesupport (>= 3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.4)
-    sys-filesystem (1.1.9)
-      ffi
+    sys-filesystem (1.4.3)
+      ffi (~> 1.1)
     sysexits (1.2.0)
     tanuki_emoji (0.5.0)
     temple (0.8.2)
@@ -1482,7 +1482,7 @@ DEPENDENCIES
   gitlab-license (~> 2.0)
   gitlab-license_finder (~> 6.0)
   gitlab-mail_room (~> 0.0.9)
-  gitlab-markup (~> 1.7.1)
+  gitlab-markup (~> 1.8.0)
   gitlab-net-dns (~> 0.9.1)
   gitlab-omniauth-openid-connect (~> 0.8.0)
   gitlab-sidekiq-fetcher (= 0.8.0)
@@ -1645,7 +1645,7 @@ DEPENDENCIES
   sshkey (~> 2.0)
   stackprof (~> 0.2.15)
   state_machines-activerecord (~> 0.8.0)
-  sys-filesystem (~> 1.1.6)
+  sys-filesystem (~> 1.4.3)
   tanuki_emoji (~> 0.5)
   terser (= 1.0.2)
   test-prof (~> 1.0.7)