.eslintignore

@@ -9,3 +9,4 @@
 /sitespeed-result/
 /fixtures/**/*.graphql
 spec/fixtures/**/*.graphql
+**/contracts/consumer/

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

@@ -226,7 +226,7 @@
   services:
     - name: postgres:12
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
-    - name: redis:5.0-alpine
+    - name: redis:6.0-alpine
   variables:
     POSTGRES_HOST_AUTH_METHOD: trust
 
@@ -255,7 +255,7 @@
   services:
     - name: postgres:12
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
-    - name: redis:5.0-alpine
+    - name: redis:6.0-alpine
     - name: elasticsearch:7.17.0
       command: ["elasticsearch", "-E", "discovery.type=single-node"]
   variables:

.gitlab/issue_templates/Dogfooding.md

 <!--Lightweight issue template to encourage Dogfooding and educate team members about the importance of Dogfooding -->
 
-/label ~"dogfooding" ~"group::" ~"section::"  ~"Category::" 
+/label ~"dogfooding" ~"group::" ~"section::"  ~"Category:"
 
 ## Feature to Dogfood
 <!--Link to Description of feature (Documentation, Epic, Opportunity Canvas, etc.) -->

.gitlab/issue_templates/Feature proposal - detailed.md

@@ -4,7 +4,7 @@
 
 <!-- What is the problem and solution you're proposing? This content sets the overall vision for the feature and serves as the release notes that will populate in various places, including the [release post blog](https://about.gitlab.com/releases/categories/releases/) and [Gitlab project releases](https://gitlab.com/gitlab-org/gitlab/-/releases). " -->
 
-### Problem to solve 
+### Problem to solve
 
 <!-- What problem do we solve? Try to define the who/what/why of the opportunity as a user story. For example, "As a (who), I want (what), so I can (why/value)." -->
 
@@ -37,7 +37,6 @@ Personas are described at https://about.gitlab.com/handbook/marketing/product-ma
 For example, "The user should be able to use the UI/API/.gitlab-ci.yml with GitLab to <perform a specific task>"
 https://about.gitlab.com/handbook/engineering/ux/ux-research-training/user-story-mapping/ -->
 
-
 ### Proposal
 
 <!-- How are we going to solve the problem? Try to include the user journey! https://about.gitlab.com/handbook/journeys/#user-journey -->
@@ -55,9 +54,9 @@ Consider adding checkboxes and expectations of users with certain levels of memb
 * [ ] Add expected impact to Reporter (20) members
 * [ ] Add expected impact to Developer (30) members
 * [ ] Add expected impact to Maintainer (40) members
-* [ ] Add expected impact to Owner (50) members 
+* [ ] Add expected impact to Owner (50) members
 
-Please consider performing a threat model for the code changes that are introduced as part of this feature. To get started, refer to our Threat Modeling handbook page https://about.gitlab.com/handbook/security/threat_modeling/#threat-modeling. 
+Please consider performing a threat model for the code changes that are introduced as part of this feature. To get started, refer to our Threat Modeling handbook page https://about.gitlab.com/handbook/security/threat_modeling/#threat-modeling.
 
 Don't hesitate to reach out to the Application Security Team (`@gitlab-com/gl-security/appsec`) to discuss any security concerns.
 -->
@@ -91,7 +90,7 @@ See the test engineering planning process and reach out to your counterpart Soft
 * Ultimate/Gold
 -->
 
-### Feature Usage Metrics 
+### Feature Usage Metrics
 
 <!-- How are you going to track usage of this feature? Think about user behavior and their interaction with the product. What indicates someone is getting value from it?
 

.gitlab/issue_templates/Fulfillment Group UX Issue.md

@@ -2,7 +2,7 @@
 
 The goal of this template is to ensure we have captured all the information available to the product designer so they can approach the problem creatively and efficiently. Please add links to SSOT if this informatin exists elsewhere. -->
 
-### Who will use this solution? 
+### Who will use this solution?
 
 <!-- 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.
 
@@ -54,5 +54,5 @@ Personas are described at https://about.gitlab.com/handbook/marketing/product-ma
 
 
 
-/label ~"group::" ~"section::"  ~"Category::"  ~UX 
+/label ~"group::" ~"section::"  ~"Category:"  ~UX
 

.gitpod.yml

@@ -20,6 +20,8 @@ tasks:
         gdk config set gitlab.rails.port 443
         gdk config set gitlab.rails.https.enabled true
         gdk config set webpack.host 127.0.0.1
+        gdk config set webpack.static false
+        gdk config set webpack.live_reload false
         # make documentation builds available
         gdk config set gitlab_docs.enabled true
         # reconfigure GDK
@@ -49,6 +51,8 @@ tasks:
         gdk config set gitlab.rails.port 443
         gdk config set gitlab.rails.https.enabled true
         gdk config set webpack.host 127.0.0.1
+        gdk config set webpack.static false
+        gdk config set webpack.live_reload false
         # reconfigure GDK
         echo "$(date) – Reconfiguring GDK" | tee -a /workspace/startup.log
         gdk reconfigure

.rubocop_todo.yml

@@ -6,11 +6,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 314
-# Cop supports --auto-correct.
-Capybara/CurrentPathExpectation:
-  Enabled: false
-
 # Offense count: 221
 Capybara/VisibilityMatcher:
   Enabled: false

.rubocop_todo/database/multiple_databases.yml

@@ -5,9 +5,6 @@ Database/MultipleDatabases:
   - ee/lib/gitlab/geo/geo_tasks.rb
   - ee/lib/gitlab/geo/health_check.rb
   - ee/lib/gitlab/geo/log_cursor/daemon.rb
-  - ee/lib/pseudonymizer/dumper.rb
-  - ee/lib/pseudonymizer/pager.rb
-  - ee/spec/lib/pseudonymizer/dumper_spec.rb
   - ee/spec/services/ee/merge_requests/update_service_spec.rb
   - lib/backup/database.rb
   - lib/backup/manager.rb
@@ -18,10 +15,7 @@ Database/MultipleDatabases:
   - lib/gitlab/database/migrations/observers/query_log.rb
   - lib/gitlab/database/partitioning_migration_helpers/backfill_partitioned_table.rb
   - lib/gitlab/database.rb
-  - lib/gitlab/gitlab_import/importer.rb
   - lib/gitlab/health_checks/db_check.rb
-  - lib/gitlab/import_export/group/relation_tree_restorer.rb
-  - lib/gitlab/legacy_github_import/importer.rb
   - lib/gitlab/seeder.rb
   - spec/db/schema_spec.rb
   - spec/initializers/database_config_spec.rb

.rubocop_todo/graphql/argument_uniqueness.yml

+---
+GraphQL/ArgumentUniqueness:
+  Exclude:
+    - app/graphql/resolvers/merge_requests_resolver.rb

.rubocop_todo/graphql/unused_argument.yml

+---
+GraphQL/UnusedArgument:
+  Exclude:
+    - app/graphql/mutations/jira_import/start.rb
+    - app/graphql/resolvers/packages_base_resolver.rb

.rubocop_todo/rails/include_url_helper.yml

----
-Rails/IncludeUrlHelper:
-  Exclude:
-  - ee/spec/helpers/ee/projects/security/configuration_helper_spec.rb
-  - ee/spec/lib/banzai/filter/cross_project_issuable_information_filter_spec.rb
-  - spec/helpers/merge_requests_helper_spec.rb
-  - spec/helpers/nav/top_nav_helper_spec.rb
-  - spec/helpers/notify_helper_spec.rb
-  - spec/lib/banzai/filter/reference_redactor_filter_spec.rb
-  - spec/lib/banzai/reference_redactor_spec.rb

.rubocop_todo/rspec/instance_variable.yml

+---
+RSpec/InstanceVariable:
+  Exclude:
+    - ee/spec/controllers/admin/application_settings_controller_spec.rb
+    - ee/spec/controllers/admin/geo/settings_controller_spec.rb
+    - ee/spec/controllers/ee/sessions_controller_spec.rb
+    - ee/spec/controllers/groups/groups_controller_spec.rb
+    - ee/spec/controllers/groups/omniauth_callbacks_controller_spec.rb
+    - ee/spec/controllers/passwords_controller_spec.rb
+    - ee/spec/features/markdown/markdown_spec.rb
+    - ee/spec/frontend/fixtures/dast_profiles.rb
+    - ee/spec/frontend/fixtures/epic.rb
+    - ee/spec/graphql/types/vulnerability_request_response_header_type_spec.rb
+    - ee/spec/graphql/types/vulnerability_request_type_spec.rb
+    - ee/spec/graphql/types/vulnerability_response_type_spec.rb
+    - ee/spec/helpers/ee/issuables_helper_spec.rb
+    - ee/spec/helpers/ee/namespace_storage_limit_alert_helper_spec.rb
+    - ee/spec/helpers/ee/wiki_helper_spec.rb
+    - ee/spec/helpers/notes_helper_spec.rb
+    - ee/spec/helpers/search_helper_spec.rb
+    - ee/spec/lib/ee/gitlab/elastic/helper_spec.rb
+    - ee/spec/lib/gitlab/elastic/search_results_spec.rb
+    - ee/spec/lib/gitlab/reference_extractor_spec.rb
+    - ee/spec/services/ee/merge_requests/update_service_spec.rb
+    - ee/spec/services/ee/notification_service_spec.rb
+    - ee/spec/services/ee/users/create_service_spec.rb
+    - ee/spec/services/ee/users/destroy_service_spec.rb
+    - ee/spec/services/geo/metrics_update_service_spec.rb
+    - ee/spec/services/groups/create_service_spec.rb
+    - ee/spec/services/groups/participants_service_spec.rb
+    - ee/spec/services/projects/create_from_template_service_spec.rb
+    - ee/spec/services/projects/create_service_spec.rb
+    - ee/spec/support/shared_examples/views/subscription_shared_examples.rb
+    - ee/spec/tasks/geo_rake_spec.rb
+    - ee/spec/views/projects/security/corpus_management/show.html.haml_spec.rb
+    - ee/spec/views/projects/security/dast_profiles/show.html.haml_spec.rb
+    - ee/spec/views/projects/security/dast_scanner_profiles/new.html.haml_spec.rb
+    - ee/spec/views/projects/security/dast_site_profiles/new.html.haml_spec.rb
+    - qa/qa/specs/features/api/1_manage/import_large_github_repo_spec.rb
+    - qa/qa/specs/features/api/1_manage/project_access_token_spec.rb
+    - qa/qa/specs/features/api/1_manage/user_access_termination_spec.rb
+    - qa/qa/specs/features/browser_ui/1_manage/login/2fa_recovery_spec.rb
+    - qa/qa/specs/features/browser_ui/1_manage/login/log_in_with_2fa_spec.rb
+    - qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
+    - qa/qa/specs/features/browser_ui/1_manage/project/dashboard_images_spec.rb
+    - qa/qa/specs/features/browser_ui/1_manage/project/invite_group_to_project_spec.rb
+    - qa/qa/specs/features/browser_ui/1_manage/project/protected_tags_spec.rb
+    - qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_file_size_spec.rb
+    - qa/qa/specs/features/browser_ui/3_create/repository/push_over_ssh_spec.rb
+    - qa/qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb
+    - qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb
+    - qa/qa/specs/features/browser_ui/3_create/web_ide/link_to_line_in_web_ide_spec.rb
+    - qa/qa/specs/features/browser_ui/3_create/web_ide/web_terminal_spec.rb
+    - qa/qa/specs/features/ee/api/1_manage/user/minimal_access_user_spec.rb
+    - qa/qa/specs/features/ee/browser_ui/12_geo/attachment_replication_spec.rb
+    - qa/qa/specs/features/ee/browser_ui/12_geo/geo_replication_ci_job_log_artifacts_spec.rb
+    - qa/qa/specs/features/ee/browser_ui/12_geo/rename_replication_spec.rb
+    - qa/qa/specs/features/ee/browser_ui/13_secure/create_merge_request_with_secure_spec.rb
+    - qa/qa/specs/features/ee/browser_ui/13_secure/license_compliance_spec.rb
+    - qa/qa/specs/features/ee/browser_ui/13_secure/merge_request_license_widget_spec.rb
+    - qa/qa/specs/features/ee/browser_ui/13_secure/project_security_dashboard_spec.rb
+    - qa/qa/specs/features/ee/browser_ui/13_secure/security_reports_spec.rb
+    - qa/qa/specs/features/ee/browser_ui/13_secure/vulnerability_management_spec.rb
+    - qa/qa/specs/features/ee/browser_ui/1_manage/group/group_audit_logs_1_spec.rb
+    - qa/qa/specs/features/ee/browser_ui/1_manage/group/group_file_template_spec.rb
+    - qa/qa/specs/features/ee/browser_ui/1_manage/group/group_ldap_sync_spec.rb
+    - qa/qa/specs/features/ee/browser_ui/1_manage/group/group_saml_non_enforced_sso_spec.rb
+    - qa/qa/specs/features/ee/browser_ui/1_manage/group/restrict_by_ip_address_spec.rb
+    - qa/qa/specs/features/ee/browser_ui/1_manage/project/project_templates_spec.rb
+    - qa/qa/specs/features/ee/browser_ui/2_plan/integrations/jira_issues_list_spec.rb
+    - qa/qa/specs/features/ee/browser_ui/2_plan/issue_boards/project_issue_boards_spec.rb
+    - qa/qa/specs/features/ee/browser_ui/2_plan/multiple_assignees_for_issues/more_than_four_assignees_spec.rb
+    - qa/qa/specs/features/ee/browser_ui/3_create/repository/code_owners_spec.rb
+    - qa/qa/specs/features/ee/browser_ui/3_create/repository/push_rules_spec.rb
+    - qa/qa/specs/features/ee/browser_ui/4_verify/cancelling_merge_request_in_merge_train_spec.rb
+    - qa/spec/support/repeater_spec.rb
+    - spec/commands/metrics_server/metrics_server_spec.rb
+    - spec/controllers/admin/clusters_controller_spec.rb
+    - spec/controllers/admin/topics/avatars_controller_spec.rb
+    - spec/controllers/concerns/renders_commits_spec.rb
+    - spec/controllers/confirmations_controller_spec.rb
+    - spec/controllers/groups/avatars_controller_spec.rb
+    - spec/controllers/groups/clusters_controller_spec.rb
+    - spec/controllers/import/bitbucket_controller_spec.rb
+    - spec/controllers/import/bitbucket_server_controller_spec.rb
+    - spec/controllers/metrics_controller_spec.rb
+    - spec/controllers/omniauth_callbacks_controller_spec.rb
+    - spec/controllers/passwords_controller_spec.rb
+    - spec/controllers/profiles/avatars_controller_spec.rb
+    - spec/controllers/projects/clusters_controller_spec.rb
+    - spec/controllers/sessions_controller_spec.rb
+    - spec/features/admin/admin_runners_spec.rb
+    - spec/features/calendar_spec.rb
+    - spec/features/issues/user_filters_issues_spec.rb
+    - spec/features/markdown/copy_as_gfm_spec.rb
+    - spec/features/markdown/gitlab_flavored_markdown_spec.rb
+    - spec/features/markdown/keyboard_shortcuts_spec.rb
+    - spec/features/markdown/markdown_spec.rb
+    - spec/features/merge_request/batch_comments_spec.rb
+    - spec/features/merge_request/user_sees_pipelines_spec.rb
+    - spec/features/merge_requests/user_lists_merge_requests_spec.rb
+    - spec/features/projects/diffs/diff_show_spec.rb
+    - spec/features/triggers_spec.rb
+    - spec/features/u2f_spec.rb
+    - spec/finders/admin/plans_finder_spec.rb
+    - spec/finders/groups_finder_spec.rb
+    - spec/finders/issues_finder_spec.rb
+    - spec/frontend/fixtures/listbox.rb
+    - spec/frontend/fixtures/raw.rb
+    - spec/frontend/fixtures/sessions.rb
+    - spec/frontend/fixtures/tabs.rb
+    - spec/frontend/fixtures/timezones.rb
+    - spec/frontend/fixtures/u2f.rb
+    - spec/frontend/fixtures/webauthn.rb
+    - spec/helpers/application_helper_spec.rb
+    - spec/helpers/award_emoji_helper_spec.rb
+    - spec/helpers/issuables_description_templates_helper_spec.rb
+    - spec/helpers/issuables_helper_spec.rb
+    - spec/helpers/notes_helper_spec.rb
+    - spec/helpers/projects_helper_spec.rb
+    - spec/helpers/search_helper_spec.rb
+    - spec/helpers/tree_helper_spec.rb
+    - spec/helpers/wiki_helper_spec.rb
+    - spec/lib/api/helpers/authentication_spec.rb
+    - spec/lib/banzai/filter/asset_proxy_filter_spec.rb
+    - spec/lib/extracts_path_spec.rb
+    - spec/lib/extracts_ref_spec.rb
+    - spec/lib/gitlab/auth/auth_finders_spec.rb
+    - spec/lib/gitlab/auth/ldap/person_spec.rb
+    - spec/lib/gitlab/background_migration/recalculate_vulnerabilities_occurrences_uuid_spec.rb
+    - spec/lib/gitlab/bitbucket_import/importer_spec.rb
+    - spec/lib/gitlab/chat_name_token_spec.rb
+    - spec/lib/gitlab/ci/lint_spec.rb
+    - spec/lib/gitlab/ci/status/composite_spec.rb
+    - spec/lib/gitlab/contributions_calendar_spec.rb
+    - spec/lib/gitlab/diff/parser_spec.rb
+    - spec/lib/gitlab/email/hook/smime_signature_interceptor_spec.rb
+    - spec/lib/gitlab/git/commit_spec.rb
+    - spec/lib/gitlab/git/diff_collection_spec.rb
+    - spec/lib/gitlab/git/diff_spec.rb
+    - spec/lib/gitlab/git/repository_spec.rb
+    - spec/lib/gitlab/http_spec.rb
+    - spec/lib/gitlab/import_export/group/legacy_tree_restorer_spec.rb
+    - spec/lib/gitlab/import_export/group/tree_restorer_spec.rb
+    - spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
+    - spec/lib/gitlab/patch/prependable_spec.rb
+    - spec/lib/gitlab/popen_spec.rb
+    - spec/lib/gitlab/project_transfer_spec.rb
+    - spec/lib/gitlab/reference_extractor_spec.rb
+    - spec/lib/gitlab/tcp_checker_spec.rb
+    - spec/lib/gitlab/user_access_spec.rb
+    - spec/lib/gitlab/version_info_spec.rb
+    - spec/lib/gitlab/x509/certificate_spec.rb
+    - spec/mailers/emails/issues_spec.rb
+    - spec/migrations/20220106163326_add_has_issues_on_vulnerability_reads_trigger_spec.rb
+    - spec/migrations/rename_services_to_integrations_spec.rb
+    - spec/migrations/replace_external_wiki_triggers_spec.rb
+    - spec/models/group_spec.rb
+    - spec/models/integrations/assembla_spec.rb
+    - spec/models/integrations/campfire_spec.rb
+    - spec/models/integrations/irker_spec.rb
+    - spec/models/member_spec.rb
+    - spec/models/members/project_member_spec.rb
+    - spec/models/namespace_spec.rb
+    - spec/models/note_spec.rb
+    - spec/models/postgresql/replication_slot_spec.rb
+    - spec/models/project_spec.rb
+    - spec/models/user_spec.rb
+    - spec/models/users/in_product_marketing_email_spec.rb
+    - spec/rack_servers/puma_spec.rb
+    - spec/requests/api/admin/plan_limits_spec.rb
+    - spec/requests/api/merge_requests_spec.rb
+    - spec/requests/api/users_spec.rb
+    - spec/requests/git_http_spec.rb
+    - spec/requests/openid_connect_spec.rb
+    - spec/requests/projects/issues/discussions_spec.rb
+    - spec/rubocop/cop/migration/update_column_in_batches_spec.rb
+    - spec/serializers/pipeline_serializer_spec.rb
+    - spec/services/ci/create_pipeline_service/logger_spec.rb
+    - spec/services/ci/process_sync_events_service_spec.rb
+    - spec/services/labels/update_service_spec.rb
+    - spec/services/members/destroy_service_spec.rb
+    - spec/services/merge_requests/close_service_spec.rb
+    - spec/services/merge_requests/refresh_service_spec.rb
+    - spec/services/merge_requests/reopen_service_spec.rb
+    - spec/services/merge_requests/update_service_spec.rb
+    - spec/services/milestones/create_service_spec.rb
+    - spec/services/notes/post_process_service_spec.rb
+    - spec/services/notes/update_service_spec.rb
+    - spec/services/notification_service_spec.rb
+    - spec/services/pages/zip_directory_service_spec.rb
+    - spec/services/projects/create_from_template_service_spec.rb
+    - spec/services/projects/download_service_spec.rb
+    - spec/services/projects/fork_service_spec.rb
+    - spec/services/upload_service_spec.rb
+    - spec/support/shared_contexts/controllers/ldap_omniauth_callbacks_controller_shared_context.rb
+    - spec/support/shared_contexts/email_shared_context.rb
+    - spec/support/shared_examples/features/wiki/user_views_wiki_empty_shared_examples.rb
+    - spec/support/shared_examples/path_extraction_shared_examples.rb
+    - spec/support/shared_examples/requests/api/notes_shared_examples.rb
+    - spec/support_specs/helpers/stub_feature_flags_spec.rb
+    - spec/views/search/_results.html.haml_spec.rb
+    - spec/workers/emails_on_push_worker_spec.rb

GITALY_SERVER_VERSION

-4e5774f37ab8581cf0a988ffca97a6252078ddc8
+a928ebb0951f52bfccbfc2e67543abe8bc3f3963

Gemfile

@@ -290,7 +290,7 @@ gem 'autoprefixer-rails', '10.2.5.1'
 gem 'terser', '1.0.2'
 
 gem 'addressable', '~> 2.8'
-gem 'tanuki_emoji', '~> 0.5'
+gem 'tanuki_emoji', '~> 0.6'
 gem 'gon', '~> 6.4.0'
 gem 'request_store', '~> 1.5'
 gem 'base32', '~> 0.3.0'
@@ -374,7 +374,7 @@ group :development, :test do
   gem 'spring', '~> 2.1.0'
   gem 'spring-commands-rspec', '~> 1.0.4'
 
-  gem 'gitlab-styles', '~> 6.6.0', require: false
+  gem 'gitlab-styles', '~> 7.0.0', require: false
 
   gem 'haml_lint', '~> 0.36.0', require: false
   gem 'bundler-audit', '~> 0.7.0.1', require: false
@@ -476,7 +476,7 @@ gem 'ssh_data', '~> 1.2'
 gem 'spamcheck', '~> 0.1.0'
 
 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 14.8.0.pre.rc1'
+gem 'gitaly', '~> 14.9.0.pre.rc2'
 
 # KAS GRPC protocol definitions
 gem 'kas-grpc', '~> 0.0.2'

Gemfile.lock

@@ -455,7 +455,7 @@ GEM
       rails (>= 3.2.0)
     git (1.7.0)
       rchardet (~> 1.8)
-    gitaly (14.8.0.pre.rc1)
+    gitaly (14.9.0.pre.rc2)
       grpc (~> 1.0)
     github-markup (1.7.0)
     gitlab (4.16.1)
@@ -501,7 +501,7 @@ GEM
       openid_connect (~> 1.2)
     gitlab-sidekiq-fetcher (0.8.0)
       sidekiq (~> 6.1)
-    gitlab-styles (6.6.0)
+    gitlab-styles (7.0.0)
       rubocop (~> 0.91, >= 0.91.1)
       rubocop-gitlab-security (~> 0.1.1)
       rubocop-graphql (~> 0.10)
@@ -1115,7 +1115,7 @@ GEM
       parser (>= 2.7.1.5)
     rubocop-gitlab-security (0.1.1)
       rubocop (>= 0.51)
-    rubocop-graphql (0.10.3)
+    rubocop-graphql (0.13.0)
       rubocop (>= 0.87, < 2)
     rubocop-performance (1.9.2)
       rubocop (>= 0.90.0, < 2.0)
@@ -1261,7 +1261,7 @@ GEM
     sys-filesystem (1.4.3)
       ffi (~> 1.1)
     sysexits (1.2.0)
-    tanuki_emoji (0.5.0)
+    tanuki_emoji (0.6.0)
     temple (0.8.2)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
@@ -1475,7 +1475,7 @@ DEPENDENCIES
   gettext (~> 3.3)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly (~> 14.8.0.pre.rc1)
+  gitaly (~> 14.9.0.pre.rc2)
   github-markup (~> 1.7.0)
   gitlab-chronic (~> 0.10.5)
   gitlab-dangerfiles (~> 2.10.2)
@@ -1489,7 +1489,7 @@ DEPENDENCIES
   gitlab-net-dns (~> 0.9.1)
   gitlab-omniauth-openid-connect (~> 0.9.0)
   gitlab-sidekiq-fetcher (= 0.8.0)
-  gitlab-styles (~> 6.6.0)
+  gitlab-styles (~> 7.0.0)
   gitlab_chronic_duration (~> 0.10.6.2)
   gitlab_omniauth-ldap (~> 2.1.1)
   gon (~> 6.4.0)
@@ -1649,7 +1649,7 @@ DEPENDENCIES
   stackprof (~> 0.2.15)
   state_machines-activerecord (~> 0.8.0)
   sys-filesystem (~> 1.4.3)
-  tanuki_emoji (~> 0.5)
+  tanuki_emoji (~> 0.6)
   terser (= 1.0.2)
   test-prof (~> 1.0.7)
   test_file_finder (~> 0.1.3)

app/assets/javascripts/api.js

@@ -92,6 +92,7 @@ const Api = {
   groupNotificationSettingsPath: '/api/:version/groups/:id/notification_settings',
   notificationSettingsPath: '/api/:version/notification_settings',
   deployKeysPath: '/api/:version/deploy_keys',
+  secureFilesPath: '/api/:version/projects/:project_id/secure_files',
 
   group(groupId, callback = () => {}) {
     const url = Api.buildUrl(Api.groupPath).replace(':id', groupId);
@@ -957,6 +958,13 @@ const Api = {
     return axios.get(url, { params: { per_page: DEFAULT_PER_PAGE, ...params } });
   },
 
+  // TODO: replace this when GraphQL support has been added https://gitlab.com/gitlab-org/gitlab/-/issues/352184
+  projectSecureFiles(projectId, options = {}) {
+    const url = Api.buildUrl(this.secureFilesPath).replace(':project_id', projectId);
+
+    return axios.get(url, { params: { per_page: DEFAULT_PER_PAGE, ...options } });
+  },
+
   async updateNotificationSettings(projectId, groupId, data = {}) {
     let url = Api.buildUrl(this.notificationSettingsPath);
 

app/assets/javascripts/behaviors/markdown/editor_extensions.js

@@ -48,54 +48,48 @@ import Video from './nodes/video';
 // from GFM should have a node or mark here.
 // The GFM-to-HTML-to-GFM cycle is tested in spec/features/markdown/copy_as_gfm_spec.rb.
 
-export default [
-  new Doc(),
-  new Paragraph(),
-  new Text(),
+export default {
+  nodes: [
+    Doc(),
+    Paragraph(),
+    Text(),
 
-  new Blockquote(),
-  new CodeBlock(),
-  new HardBreak(),
-  new Heading({ maxLevel: 6 }),
-  new HorizontalRule(),
-  new Image(),
+    Blockquote(),
+    CodeBlock(),
+    HardBreak(),
+    Heading(),
+    HorizontalRule(),
+    Image(),
 
-  new Table(),
-  new TableHead(),
-  new TableBody(),
-  new TableHeaderRow(),
-  new TableRow(),
-  new TableCell(),
+    Table(),
+    TableHead(),
+    TableBody(),
+    TableHeaderRow(),
+    TableRow(),
+    TableCell(),
 
-  new Emoji(),
-  new Reference(),
+    Emoji(),
+    Reference(),
 
-  new TableOfContents(),
-  new Video(),
-  new Audio(),
+    TableOfContents(),
+    Video(),
+    Audio(),
 
-  new BulletList(),
-  new OrderedList(),
-  new ListItem(),
+    BulletList(),
+    OrderedList(),
+    ListItem(),
 
-  new DescriptionList(),
-  new DescriptionTerm(),
-  new DescriptionDetails(),
+    DescriptionList(),
+    DescriptionTerm(),
+    DescriptionDetails(),
 
-  new TaskList(),
-  new OrderedTaskList(),
-  new TaskListItem(),
+    TaskList(),
+    OrderedTaskList(),
+    TaskListItem(),
 
-  new Summary(),
-  new Details(),
+    Summary(),
+    Details(),
+  ],
 
-  new Bold(),
-  new Italic(),
-  new Strike(),
-  new InlineDiff(),
-
-  new Link(),
-  new Code(),
-  new MathMark(),
-  new InlineHTML(),
-];
+  marks: [Bold(), Italic(), Strike(), InlineDiff(), Link(), Code(), MathMark(), InlineHTML()],
+};

app/assets/javascripts/behaviors/markdown/marks/bold.js

-/* eslint-disable class-methods-use-this */
-
-import { Bold as BaseBold } from 'tiptap-extensions';
 import { defaultMarkdownSerializer } from '~/lib/prosemirror_markdown_serializer';
 
 // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter
-export default class Bold extends BaseBold {
-  get toMarkdown() {
-    return defaultMarkdownSerializer.marks.strong;
-  }
-}
+export default () => {
+  return {
+    name: 'bold',
+    schema: {
+      parseDOM: [
+        {
+          tag: 'strong',
+        },
+      ],
+      toDOM: () => ['strong', 0],
+    },
+    toMarkdown: defaultMarkdownSerializer.marks.strong,
+  };
+};

app/assets/javascripts/behaviors/markdown/marks/code.js

-/* eslint-disable class-methods-use-this */
-
-import { Code as BaseCode } from 'tiptap-extensions';
 import { defaultMarkdownSerializer } from '~/lib/prosemirror_markdown_serializer';
 
 // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter
-export default class Code extends BaseCode {
-  get toMarkdown() {
-    return defaultMarkdownSerializer.marks.code;
-  }
-}
+export default () => ({
+  name: 'code',
+  schema: {
+    excludes: '_',
+    parseDOM: [{ tag: 'code' }],
+    toDOM: () => ['code', 0],
+  },
+  toMarkdown: defaultMarkdownSerializer.marks.code,
+});