diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 03af9990722..45f14dc0033 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -1128,7 +1128,7 @@
     - <<: *if-not-canonical-namespace
       when: never
     - <<: *if-merge-request-targeting-stable-branch
-      when: on_failure
+      when: always
 
 ###############
 # Pages rules #
diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml
index be389f5bb36..bfe30034c7c 100644
--- a/.rubocop_todo/layout/argument_alignment.yml
+++ b/.rubocop_todo/layout/argument_alignment.yml
@@ -583,7 +583,6 @@ Layout/ArgumentAlignment:
     - 'app/models/webauthn_registration.rb'
     - 'app/models/wiki_page.rb'
     - 'app/models/work_item.rb'
-    - 'app/policies/project_snippet_policy.rb'
     - 'app/services/ci/archive_trace_service.rb'
     - 'app/services/ci/ensure_stage_service.rb'
     - 'app/services/ci/list_config_variables_service.rb'
@@ -1448,13 +1447,6 @@ Layout/ArgumentAlignment:
     - 'ee/spec/models/upload_spec.rb'
     - 'ee/spec/models/vulnerabilities/finding_spec.rb'
     - 'ee/spec/models/vulnerabilities/state_transition_spec.rb'
-    - 'ee/spec/policies/dast/pre_scan_verification_policy_spec.rb'
-    - 'ee/spec/policies/dast/pre_scan_verification_step_policy_spec.rb'
-    - 'ee/spec/policies/deployment_policy_spec.rb'
-    - 'ee/spec/policies/epic_policy_spec.rb'
-    - 'ee/spec/policies/merge_request_policy_spec.rb'
-    - 'ee/spec/policies/vulnerabilities/feedback_policy_spec.rb'
-    - 'ee/spec/policies/vulnerabilities/merge_request_link_policy_spec.rb'
     - 'ee/spec/requests/admin/impersonation_tokens_controller_spec.rb'
     - 'ee/spec/requests/api/analytics/product_analytics_spec.rb'
     - 'ee/spec/requests/api/analytics/project_deployment_frequency_spec.rb'
@@ -2443,11 +2435,6 @@ Layout/ArgumentAlignment:
     - 'spec/models/user_detail_spec.rb'
     - 'spec/models/user_spec.rb'
     - 'spec/models/wiki_page/meta_spec.rb'
-    - 'spec/policies/ci/build_policy_spec.rb'
-    - 'spec/policies/ci/pipeline_policy_spec.rb'
-    - 'spec/policies/ci/pipeline_schedule_policy_spec.rb'
-    - 'spec/policies/environment_policy_spec.rb'
-    - 'spec/policies/group_policy_spec.rb'
     - 'spec/requests/admin/applications_controller_spec.rb'
     - 'spec/requests/admin/impersonation_tokens_controller_spec.rb'
     - 'spec/requests/api/access_requests_spec.rb'
diff --git a/app/assets/javascripts/lib/mermaid.js b/app/assets/javascripts/lib/mermaid.js
index c72561ce69d..60b46989375 100644
--- a/app/assets/javascripts/lib/mermaid.js
+++ b/app/assets/javascripts/lib/mermaid.js
@@ -12,8 +12,9 @@ const drawDiagram = (source) => {
     // eslint-disable-next-line no-unsanitized/property
     element.innerHTML = svgCode;
 
-    const height = parseInt(element.firstElementChild.getAttribute('height'), 10);
-    const width = parseInt(element.firstElementChild.style.maxWidth, 10);
+    element.firstElementChild.removeAttribute('height');
+    const { height, width } = element.firstElementChild.getBoundingClientRect();
+
     setIframeRenderedSize(height, width);
   };
   mermaid.mermaidAPI.render('mermaid', source, insertSvg);
diff --git a/app/assets/javascripts/notes/components/discussion_counter.vue b/app/assets/javascripts/notes/components/discussion_counter.vue
index 37935e9c3c6..ba5ffc60917 100644
--- a/app/assets/javascripts/notes/components/discussion_counter.vue
+++ b/app/assets/javascripts/notes/components/discussion_counter.vue
@@ -157,7 +157,7 @@ export default {
               v-if="resolveAllDiscussionsIssuePath && !allResolved"
               :href="resolveAllDiscussionsIssuePath"
             >
-              {{ __('Create issue to resolve all threads') }}
+              {{ __('Resolve all with new issue') }}
             </gl-dropdown-item>
           </gl-dropdown>
         </gl-button-group>
diff --git a/app/assets/javascripts/performance_bar/components/performance_bar_app.vue b/app/assets/javascripts/performance_bar/components/performance_bar_app.vue
index 2c5f4354d38..4bd86d4982e 100644
--- a/app/assets/javascripts/performance_bar/components/performance_bar_app.vue
+++ b/app/assets/javascripts/performance_bar/components/performance_bar_app.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlLink } from '@gitlab/ui';
+import { GlLink, GlPopover } from '@gitlab/ui';
 import SafeHtml from '~/vue_shared/directives/safe_html';
 import { glEmojiTag } from '~/emoji';
 import { mergeUrlParams } from '~/lib/utils/url_utility';
@@ -11,6 +11,7 @@ import RequestSelector from './request_selector.vue';
 
 export default {
   components: {
+    GlPopover,
     AddRequest,
     DetailedMetric,
     GlLink,
@@ -153,6 +154,7 @@ export default {
     this.currentRequest = this.requestId;
   },
   methods: {
+    glEmojiTag,
     changeCurrentRequest(newRequestId) {
       this.currentRequest = newRequestId;
       this.$emit('change-request', newRequestId);
@@ -183,8 +185,17 @@ export default {
           class="current-host"
           :class="{ canary: currentRequest.details.host.canary }"
         >
-          <span v-safe-html:[$options.safeHtmlConfig]="birdEmoji"></span>
-          {{ currentRequest.details.host.hostname }}
+          <span id="canary-emoji" v-safe-html:[$options.safeHtmlConfig]="birdEmoji"></span>
+          <gl-popover placement="bottom" target="canary-emoji" content="Canary" />
+          <span
+            id="host-emoji"
+            v-safe-html:[$options.safeHtmlConfig]="glEmojiTag('computer')"
+          ></span>
+          <gl-popover
+            placement="bottom"
+            target="host-emoji"
+            :content="currentRequest.details.host.hostname"
+          />
         </span>
       </div>
       <detailed-metric
@@ -220,7 +231,11 @@ export default {
         }}</gl-link>
       </div>
       <div v-if="showFlamegraphButtons" id="peek-flamegraph" class="view">
-        <span class="gl-text-white-200">{{ s__('PerformanceBar|Flamegraph with mode:') }}</span>
+        <span id="flamegraph-emoji" class="gl-text-white-200">
+          <span v-safe-html:[$options.safeHtmlConfig]="glEmojiTag('fire')"></span>
+          <span v-safe-html:[$options.safeHtmlConfig]="glEmojiTag('bar_chart')"></span>
+        </span>
+        <gl-popover placement="bottom" target="flamegraph-emoji" content="Flamegraph" />
         <gl-link class="gl-text-blue-200" :href="flamegraphPath('wall', currentRequestId)">{{
           s__('PerformanceBar|wall')
         }}</gl-link>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue
index 4f1abca8840..f011270ce71 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue
@@ -58,7 +58,7 @@ export default {
         variant="confirm"
         category="secondary"
       >
-        {{ s__('mrWidget|Create issue to resolve all threads') }}
+        {{ s__('mrWidget|Resolve all with new issue') }}
       </gl-button>
     </template>
   </state-container>
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss
index c452c401cfb..aefac300839 100644
--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -222,18 +222,6 @@
   max-width: 100%;
 }
 
-/*
-* Mixin that handles the position of sticky alerts at the top. It accounts for the performance bar
-*/
-// stylelint-disable-next-line length-zero-no-unit
-@mixin sticky-top-positioning($extra: 0px) {
-  top: calc(#{$header-height} + #{$extra});
-
-  .with-performance-bar & {
-    top: calc(#{$header-height} + #{$performance-bar-height} + #{$extra});
-  }
-}
-
 /*
 * Mixin that handles the container for the job logs (CI/CD and kubernetes pod logs)
 */
diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb
index 119a61c1bcb..28ae730eda5 100644
--- a/app/controllers/projects/settings/ci_cd_controller.rb
+++ b/app/controllers/projects/settings/ci_cd_controller.rb
@@ -132,7 +132,7 @@ module Projects
         @shared_runners_count = active_shared_runners.count
         @shared_runners = active_shared_runners.page(params[:shared_runners_page]).per(NUMBER_OF_RUNNERS_PER_PAGE).with_tags
 
-        parent_group_runners = ::Ci::Runner.belonging_to_parent_group_of_project(@project.id)
+        parent_group_runners = ::Ci::Runner.belonging_to_parent_groups_of_project(@project.id)
         @group_runners_count = parent_group_runners.count
         @group_runners = parent_group_runners.page(params[:group_runners_page]).per(NUMBER_OF_RUNNERS_PER_PAGE).with_tags
       end
diff --git a/app/mailers/emails/profile.rb b/app/mailers/emails/profile.rb
index a191bd4a8f6..54a4c4be6a8 100644
--- a/app/mailers/emails/profile.rb
+++ b/app/mailers/emails/profile.rb
@@ -177,6 +177,19 @@ module Emails
         mail_with_locale(to: @user.notification_email_or_default, subject: subject(_("New email address added")))
       end
     end
+
+    def new_achievement_email(user, achievement)
+      return unless user&.active?
+
+      @user = user
+      @achievement = achievement
+
+      Gitlab::I18n.with_locale(@user.preferred_language) do
+        email_with_layout(
+          to: @user.notification_email_or_default,
+          subject: subject(s_("Achievements|%{namespace_full_path} awarded you the %{achievement_name} achievement") % { namespace_full_path: @achievement.namespace.full_path, achievement_name: @achievement.name }))
+      end
+    end
   end
 end
 
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index 38dc8b1e18d..1e5108a873e 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -134,7 +134,7 @@ module Ci
       belonging_to_group(group_self_and_ancestors_ids)
     }
 
-    scope :belonging_to_parent_group_of_project, -> (project_id) {
+    scope :belonging_to_parent_groups_of_project, -> (project_id) {
       raise ArgumentError, "only 1 project_id allowed for performance reasons" unless project_id.is_a?(Integer)
 
       project_groups = ::Group.joins(:projects).where(projects: { id: project_id })
@@ -148,7 +148,7 @@ module Ci
       from_union(
         [
           belonging_to_project(project_id),
-          project.group_runners_enabled? ? belonging_to_parent_group_of_project(project_id) : nil,
+          project.group_runners_enabled? ? belonging_to_parent_groups_of_project(project_id) : nil,
           project.shared_runners
         ].compact,
         remove_duplicates: false
diff --git a/app/models/project.rb b/app/models/project.rb
index fd41d72110b..914a5bac1c6 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -2066,7 +2066,7 @@ class Project < ApplicationRecord
   end
 
   def group_runners
-    @group_runners ||= group_runners_enabled? ? Ci::Runner.belonging_to_parent_group_of_project(self.id) : Ci::Runner.none
+    @group_runners ||= group_runners_enabled? ? Ci::Runner.belonging_to_parent_groups_of_project(self.id) : Ci::Runner.none
   end
 
   def all_runners
diff --git a/app/policies/project_snippet_policy.rb b/app/policies/project_snippet_policy.rb
index b8f0be9b4c5..e11c1a39757 100644
--- a/app/policies/project_snippet_policy.rb
+++ b/app/policies/project_snippet_policy.rb
@@ -25,10 +25,12 @@ class ProjectSnippetPolicy < BasePolicy
   # is used to hide/show various snippet-related controls, so we can't just
   # move all of the handling here.
   rule do
-    all?(private_snippet | (internal_snippet & external_user),
-         ~project.guest,
-         ~is_author,
-         ~can?(:read_all_resources))
+    all?(
+      private_snippet | (internal_snippet & external_user),
+      ~project.guest,
+      ~is_author,
+      ~can?(:read_all_resources)
+    )
   end.prevent :read_snippet
 
   rule { internal_snippet & ~is_author & ~admin & ~project.maintainer }.policy do
diff --git a/app/services/achievements/award_service.rb b/app/services/achievements/award_service.rb
index 674bb8837fb..3cefb0442d5 100644
--- a/app/services/achievements/award_service.rb
+++ b/app/services/achievements/award_service.rb
@@ -22,6 +22,7 @@ module Achievements
         awarded_by_user: current_user)
       return error_awarding(user_achievement) unless user_achievement.persisted?
 
+      NotificationService.new.new_achievement_email(recipient, achievement).deliver_later
       ServiceResponse.success(payload: user_achievement)
     rescue ActiveRecord::RecordNotFound => e
       error(e.message)
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index 47bc36fce70..c9b8e052bf6 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -810,6 +810,10 @@ class NotificationService
     end
   end
 
+  def new_achievement_email(user, achievement)
+    mailer.new_achievement_email(user, achievement)
+  end
+
   protected
 
   def new_resource_email(target, current_user, method)
diff --git a/app/views/notify/new_achievement_email.html.haml b/app/views/notify/new_achievement_email.html.haml
new file mode 100644
index 00000000000..f802684fb56
--- /dev/null
+++ b/app/views/notify/new_achievement_email.html.haml
@@ -0,0 +1,7 @@
+- namespace_link = link_to(@achievement.namespace.full_path, group_url(@achievement.namespace))
+- profile_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">' % { url: user_url(@user) }
+
+%p
+  = sprintf(s_("Achievements|%{namespace_link} awarded you the %{bold_start}%{achievement_name}%{bold_end} achievement!"), { namespace_link: namespace_link, achievement_name: @achievement.name, bold_start: '<b>', bold_end: '</b>' }).html_safe
+%p
+  = sprintf(s_("Achievements|View your achievements on your %{link_start}profile%{link_end}."), { link_start: profile_link_start, link_end: '</a>' }).html_safe
diff --git a/app/views/notify/new_achievement_email.text.erb b/app/views/notify/new_achievement_email.text.erb
new file mode 100644
index 00000000000..6d66c1130bf
--- /dev/null
+++ b/app/views/notify/new_achievement_email.text.erb
@@ -0,0 +1,4 @@
+<%= sprintf(s_("Achievements|%{namespace_full_path} awarded you the %{achievement_name} achievement!"),
+  { namespace_full_path: @achievement.namespace.full_path, achievement_name: @achievement.name }) %>
+
+<%= s_("Achievements|View your achievements on your profile.") %>
diff --git a/app/views/shared/issuable/form/_merge_params.html.haml b/app/views/shared/issuable/form/_merge_params.html.haml
index 09086d3aa82..8e9793cdba5 100644
--- a/app/views/shared/issuable/form/_merge_params.html.haml
+++ b/app/views/shared/issuable/form/_merge_params.html.haml
@@ -9,22 +9,25 @@
     %label
       = _('Merge options')
     - if issuable.can_remove_source_branch?(current_user)
-      .form-check.gl-mb-3
+      .form-check.gl-pl-0
         = hidden_field_tag 'merge_request[force_remove_source_branch]', '0', id: nil
-        = check_box_tag 'merge_request[force_remove_source_branch]', '1', issuable.force_remove_source_branch?, class: 'form-check-input js-form-update'
-        = label_tag 'merge_request[force_remove_source_branch]', class: 'form-check-label' do
-          = _("Delete source branch when merge request is accepted.")
+        = render Pajamas::CheckboxTagComponent.new(name: 'merge_request[force_remove_source_branch]', checked: issuable.force_remove_source_branch?, value: '1', checkbox_options: { class: 'js-form-update' }) do |c|
+          = c.label do
+            = _("Delete source branch when merge request is accepted.")
+
     - if !project.squash_never?
-      .form-check
+      .form-check.gl-pl-0
         - if project.squash_always?
           = hidden_field_tag 'merge_request[squash]', '1', id: nil
-          = check_box_tag 'merge_request[squash]', '1', project.squash_enabled_by_default?, class: 'form-check-input', disabled: 'true'
+          = render Pajamas::CheckboxTagComponent.new(name: 'merge_request[squash]', checked: project.squash_enabled_by_default?, value: '1', checkbox_options: { class: 'js-form-update', disabled: true }) do |c|
+            = c.label do
+              = _("Squash commits when merge request is accepted.")
+              = link_to sprite_icon('question-o'), help_page_path('user/project/merge_requests/squash_and_merge'), target: '_blank', rel: 'noopener noreferrer'
+            = c.help_text do
+              = _('Required in this project.')
         - else
           = hidden_field_tag 'merge_request[squash]', '0', id: nil
-          = check_box_tag 'merge_request[squash]', '1', issuable_squash_option?(issuable, project), class: 'form-check-input js-form-update'
-        = label_tag 'merge_request[squash]', class: 'form-check-label' do
-          = _("Squash commits when merge request is accepted.")
-          = link_to sprite_icon('question-o'), help_page_path('user/project/merge_requests/squash_and_merge'), target: '_blank', rel: 'noopener noreferrer'
-        - if project.squash_always?
-          .gl-text-gray-400
-            = _('Required in this project.')
+          = render Pajamas::CheckboxTagComponent.new(name: 'merge_request[squash]', checked: issuable_squash_option?(issuable, project), value: '1', checkbox_options: { class: 'js-form-update' }) do |c|
+            = c.label do
+              = _("Squash commits when merge request is accepted.")
+              = link_to sprite_icon('question-o'), help_page_path('user/project/merge_requests/squash_and_merge'), target: '_blank', rel: 'noopener noreferrer'
diff --git a/config/feature_flags/development/multiple_environment_approval_rules_fe.yml b/config/feature_flags/development/multiple_environment_approval_rules_fe.yml
deleted file mode 100644
index d97c6114a67..00000000000
--- a/config/feature_flags/development/multiple_environment_approval_rules_fe.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: multiple_environment_approval_rules_fe
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105719
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384334
-milestone: '15.7'
-type: development
-group: group::configure
-default_enabled: false
diff --git a/db/migrate/20230405102815_add_unique_namespace_index_to_storage_limit_exclusions.rb b/db/migrate/20230405102815_add_unique_namespace_index_to_storage_limit_exclusions.rb
new file mode 100644
index 00000000000..d732fb35ce9
--- /dev/null
+++ b/db/migrate/20230405102815_add_unique_namespace_index_to_storage_limit_exclusions.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddUniqueNamespaceIndexToStorageLimitExclusions < Gitlab::Database::Migration[2.1]
+  TABLE_NAME = 'namespaces_storage_limit_exclusions'
+  OLD_INDEX_NAME = 'index_namespaces_storage_limit_exclusions_on_namespace_id'
+  NEW_INDEX_NAME = 'unique_idx_namespaces_storage_limit_exclusions_on_namespace_id'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index TABLE_NAME, :namespace_id,
+      unique: true,
+      name: NEW_INDEX_NAME
+
+    remove_concurrent_index_by_name TABLE_NAME, OLD_INDEX_NAME
+  end
+
+  def down
+    add_concurrent_index TABLE_NAME, :namespace_id,
+      unique: false,
+      name: OLD_INDEX_NAME
+
+    remove_concurrent_index_by_name TABLE_NAME, NEW_INDEX_NAME
+  end
+end
diff --git a/db/post_migrate/20230404023648_ensure_suggestions_note_id_bigint_backfill_is_finished_for_gitlab_dot_com.rb b/db/post_migrate/20230404023648_ensure_suggestions_note_id_bigint_backfill_is_finished_for_gitlab_dot_com.rb
new file mode 100644
index 00000000000..adf33df6fc2
--- /dev/null
+++ b/db/post_migrate/20230404023648_ensure_suggestions_note_id_bigint_backfill_is_finished_for_gitlab_dot_com.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class EnsureSuggestionsNoteIdBigintBackfillIsFinishedForGitlabDotCom < Gitlab::Database::Migration[2.1]
+  include Gitlab::Database::MigrationHelpers::ConvertToBigint
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  disable_ddl_transaction!
+
+  def up
+    return unless should_run?
+
+    ensure_batched_background_migration_is_finished(
+      job_class_name: 'CopyColumnUsingBackgroundMigrationJob',
+      table_name: 'suggestions',
+      column_name: 'id',
+      job_arguments: [['note_id'], ['note_id_convert_to_bigint']]
+    )
+  end
+
+  def down
+    # no-op
+  end
+
+  private
+
+  def should_run?
+    com_or_dev_or_test_but_not_jh?
+  end
+end
diff --git a/db/post_migrate/20230404023915_swap_suggestions_note_id_to_bigint_for_gitlab_dot_com.rb b/db/post_migrate/20230404023915_swap_suggestions_note_id_to_bigint_for_gitlab_dot_com.rb
new file mode 100644
index 00000000000..fb5c379c015
--- /dev/null
+++ b/db/post_migrate/20230404023915_swap_suggestions_note_id_to_bigint_for_gitlab_dot_com.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+class SwapSuggestionsNoteIdToBigintForGitlabDotCom < Gitlab::Database::Migration[2.1]
+  include Gitlab::Database::MigrationHelpers::ConvertToBigint
+
+  disable_ddl_transaction!
+
+  TABLE_NAME = 'suggestions'
+
+  def up
+    return unless should_run?
+
+    swap
+  end
+
+  def down
+    return unless should_run?
+
+    swap
+  end
+
+  def swap
+    # This will replace the existing index_suggestions_on_note_id_and_relative_order
+    add_concurrent_index TABLE_NAME, [:note_id_convert_to_bigint, :relative_order], unique: true,
+      name: 'index_suggestions_on_note_id_convert_to_bigint_relative_order'
+
+    # This will replace the existing fk_rails_33b03a535c
+    add_concurrent_foreign_key TABLE_NAME, :notes, column: :note_id_convert_to_bigint,
+      name: 'fk_suggestions_note_id_convert_to_bigint',
+      on_delete: :cascade
+
+    with_lock_retries(raise_on_exhaustion: true) do
+      execute "LOCK TABLE notes, #{TABLE_NAME} IN ACCESS EXCLUSIVE MODE"
+
+      execute "ALTER TABLE #{TABLE_NAME} RENAME COLUMN note_id TO note_id_tmp"
+      execute "ALTER TABLE #{TABLE_NAME} RENAME COLUMN note_id_convert_to_bigint TO note_id"
+      execute "ALTER TABLE #{TABLE_NAME} RENAME COLUMN note_id_tmp TO note_id_convert_to_bigint"
+
+      function_name = Gitlab::Database::UnidirectionalCopyTrigger
+        .on_table(TABLE_NAME, connection: connection)
+        .name(:note_id, :note_id_convert_to_bigint)
+      execute "ALTER FUNCTION #{quote_table_name(function_name)} RESET ALL"
+
+      # Swap defaults
+      change_column_default TABLE_NAME, :note_id, nil
+      change_column_default TABLE_NAME, :note_id_convert_to_bigint, 0
+
+      execute 'DROP INDEX IF EXISTS index_suggestions_on_note_id_and_relative_order'
+      rename_index TABLE_NAME, 'index_suggestions_on_note_id_convert_to_bigint_relative_order',
+        'index_suggestions_on_note_id_and_relative_order'
+
+      execute "ALTER TABLE #{TABLE_NAME} DROP CONSTRAINT IF EXISTS fk_rails_33b03a535c"
+      rename_constraint(TABLE_NAME, 'fk_suggestions_note_id_convert_to_bigint', 'fk_rails_33b03a535c')
+    end
+  end
+
+  def should_run?
+    com_or_dev_or_test_but_not_jh?
+  end
+end
diff --git a/db/schema_migrations/20230404023648 b/db/schema_migrations/20230404023648
new file mode 100644
index 00000000000..c9ac5581cf3
--- /dev/null
+++ b/db/schema_migrations/20230404023648
@@ -0,0 +1 @@
+ef9f641608397a12e6b5384667194a8b3e5b929c76c365105f47fd00c5c7f219
\ No newline at end of file
diff --git a/db/schema_migrations/20230404023915 b/db/schema_migrations/20230404023915
new file mode 100644
index 00000000000..99d7f3ec63c
--- /dev/null
+++ b/db/schema_migrations/20230404023915
@@ -0,0 +1 @@
+20bfe6e7faf02d4b20babf0f80d51bfd3618f3fd1faf512af948f1976d8c5838
\ No newline at end of file
diff --git a/db/schema_migrations/20230405102815 b/db/schema_migrations/20230405102815
new file mode 100644
index 00000000000..a5c8f90fe6b
--- /dev/null
+++ b/db/schema_migrations/20230405102815
@@ -0,0 +1 @@
+60ae9405a4d4f4c41abc0b6b29c557701ae10957622297d093c70fade32e2863
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 352ff598cb5..ff48cb12b75 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -22746,7 +22746,7 @@ ALTER SEQUENCE subscriptions_id_seq OWNED BY subscriptions.id;
 
 CREATE TABLE suggestions (
     id bigint NOT NULL,
-    note_id integer NOT NULL,
+    note_id_convert_to_bigint integer DEFAULT 0 NOT NULL,
     relative_order smallint NOT NULL,
     applied boolean DEFAULT false NOT NULL,
     commit_id character varying,
@@ -22755,7 +22755,7 @@ CREATE TABLE suggestions (
     lines_above integer DEFAULT 0 NOT NULL,
     lines_below integer DEFAULT 0 NOT NULL,
     outdated boolean DEFAULT false NOT NULL,
-    note_id_convert_to_bigint bigint DEFAULT 0 NOT NULL
+    note_id bigint NOT NULL
 );
 
 CREATE SEQUENCE suggestions_id_seq
@@ -31260,8 +31260,6 @@ CREATE INDEX index_namespaces_on_updated_at ON namespaces USING btree (updated_a
 
 CREATE INDEX index_namespaces_public_groups_name_id ON namespaces USING btree (name, id) WHERE (((type)::text = 'Group'::text) AND (visibility_level = 20));
 
-CREATE INDEX index_namespaces_storage_limit_exclusions_on_namespace_id ON namespaces_storage_limit_exclusions USING btree (namespace_id);
-
 CREATE INDEX index_namespaces_sync_events_on_namespace_id ON namespaces_sync_events USING btree (namespace_id);
 
 CREATE INDEX index_next_over_limit_check_at_asc_order ON namespace_details USING btree (next_over_limit_check_at NULLS FIRST);
@@ -32872,6 +32870,8 @@ CREATE UNIQUE INDEX uniq_pkgs_debian_project_distributions_project_id_and_suite
 
 CREATE UNIQUE INDEX unique_ci_builds_token_encrypted_and_partition_id ON ci_builds USING btree (token_encrypted, partition_id) WHERE (token_encrypted IS NOT NULL);
 
+CREATE UNIQUE INDEX unique_idx_namespaces_storage_limit_exclusions_on_namespace_id ON namespaces_storage_limit_exclusions USING btree (namespace_id);
+
 CREATE UNIQUE INDEX unique_index_ci_build_pending_states_on_partition_id_build_id ON ci_build_pending_states USING btree (partition_id, build_id);
 
 CREATE UNIQUE INDEX unique_index_for_project_pages_unique_domain ON project_settings USING btree (pages_unique_domain) WHERE (pages_unique_domain IS NOT NULL);
diff --git a/doc/administration/dedicated/index.md b/doc/administration/dedicated/index.md
index 1991d0b64cc..25b53c97d8b 100644
--- a/doc/administration/dedicated/index.md
+++ b/doc/administration/dedicated/index.md
@@ -203,7 +203,7 @@ Prerequisites:
 
 To activate SAML for your GitLab Dedicated instance:
 
-1. Read the [GitLab documentation about SAML](../../integration/saml.md#https://docs.gitlab.com/ee/integration/saml.html#configure-saml-on-your-idp) to gather all data your identity provider requires for configuration. You can also find some providers and their requirements in the [group SAML documentation](../../user/group/saml_sso/index.md#set-up-identity-provider).
+1. Read the [GitLab documentation about SAML](../../integration/saml.md#https://docs.gitlab.com/ee/integration/saml.html#configure-saml-on-your-idp) to gather all data your identity provider requires for configuration. You can also find some providers and their requirements in the [group SAML documentation](../../user/group/saml_sso/index.md#set-up-your-identity-provider).
 1. To make the necessary changes, include in your [support ticket](#configuration-changes) the desired [SAML configuration block](../../integration/saml.md#configure-saml-support-in-gitlab) that will be set on the GitLab application. At a minimum, GitLab needs the following information to enable SAML for your instance:
    - Assertion consumer service URL
    - Certificate fingerprint or certificate
diff --git a/doc/development/contributing/first_contribution.md b/doc/development/contributing/first_contribution.md
new file mode 100644
index 00000000000..0c4b5b21171
--- /dev/null
+++ b/doc/development/contributing/first_contribution.md
@@ -0,0 +1,340 @@
+---
+stage: none
+group: Development
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
+---
+
+# Tutorial: Make a GitLab contribution
+
+Anyone can contribute to the development of GitLab.
+
+Maybe you want to add functionality that you feel is missing. Or maybe
+you noticed some UI text that you want to improve.
+
+This tutorial will walk you through the process of updating UI text
+and related files by using the GitLab Development Kit and the GitLab community fork.
+You can follow this example exactly to familiarize yourself with the process,
+or you can choose other UI text to update.
+
+## Steps
+
+To make a contribution, you will:
+
+1. [Configure the GitLab Development Kit](#step-1-configure-the-gitlab-development-kit)
+1. [Make your code updates](#step-2-change-the-code)
+1. [Push your changes to the community fork](#step-3-push-your-changes-to-the-community-fork)
+1. [Create a merge request](#step-4-create-a-merge-request)
+
+## Prerequisites
+
+On your local machine:
+
+- Ensure Git is installed.
+  (From the command line, type `git -v`. If you get a result, you have Git installed.)
+- Install a source code editor, or decide which tool you're going to use to edit files.
+
+On GitLab.com:
+
+- Create an account. Ensure you can successfully sign in.
+- Go to the [`gitlab-community/community-members` group](https://gitlab.com/gitlab-community/community-members)
+  and select **Request access**. This action will give you access to the GitLab
+  community fork, where you'll author your changes.
+
+## Step 1: Configure the GitLab Development Kit
+
+The GitLab Development Kit (GDK) is a local version of GitLab that's yours to play with.
+It's just like an installation of self-managed GitLab. It includes sample projects you
+can use to test functionality, and it gives you access to administrator functionality.
+You can run it on your local machine, or use GitPod to run a remote version.
+
+![GDK](img/gdk_home.png)
+
+If you've never used the GDK before, and you think you might contribute
+more than once, you should install it.
+If you already have a working GDK, you should
+[update it to use the community fork](#an-existing-gdk-installation).
+
+### A new GDK installation
+
+Set aside about two hours to install the GDK. If all goes smoothly, it
+should take about an hour to install.
+
+Sometimes the installation needs some tweaks to make it work, so you should
+also set aside some time for troubleshooting.
+It might seem like a lot of work, but after you have the GDK running,
+you'll be able to contribute much more often and more easily.
+
+To install the GDK:
+
+1. Ensure you're on
+   [one of the supported platforms](https://gitlab.com/gitlab-org/gitlab-development-kit/-/tree/main/#supported-platforms)
+   (macOS, Ubuntu, etc.).
+1. Choose the directory where you want to install the GDK.
+   In this location, a repository called `gitlab-development-kit` will be created,
+   and the application will be installed.
+1. From the command line, go to that directory.
+   In this example, we will use the `development` directory.
+
+   ```shell
+   cd development
+   ```
+
+1. Run the one-line installation command:
+
+   ```shell
+   curl "https://gitlab.com/gitlab-org/gitlab-development-kit/-/raw/main/support/install" | bash
+   ```
+
+1. For the message `Where would you like to install the GDK? [./gitlab-development-kit]`,
+   press Enter to accept the default location.
+
+1. For the message `Which GitLab repo URL would you like to clone?`, enter the GitLab community fork:
+
+   ```shell
+   https://gitlab.com/gitlab-community/gitlab.git
+   ```
+
+While the installation is running, copy any messages that are displayed.
+If you have any problems with the installation, you can use this output as
+part of troubleshooting.
+
+When the installation is complete:
+
+1. Go to the directory where the GDK was installed:
+
+   ```shell
+   cd gitlab-development-kit
+   ```
+
+1. Start the GDK:
+
+   ```shell
+   gdk start
+   ```
+
+1. Connect to the GDK by using the URL provided. It should be something like <http://127.0.0.1:3000>.
+1. Use the username `root` and the password `5iveL!fe`. You will be prompted
+   to reset your password the first time you sign in.
+
+If you have any problems, try going to the `gitlab-development-kit/gitlab`
+directory and running these commands:
+
+```shell
+yarn install && bundle install
+bundle exec rails db:migrate RAILS_ENV=development
+```
+
+From the `gitlab-development-kit` folder, you can also try running `gdk doctor`.
+
+For more advanced troubleshooting, see
+[the troubleshooting docs](https://gitlab.com/gitlab-org/gitlab-development-kit/-/tree/main/doc/troubleshooting).
+
+### An existing GDK installation
+
+If you have an existing GDK installation, you should update it so it's
+using the community fork.
+
+1. Delete the existing `gitlab-development-kit/gitlab` directory.
+1. Clone the community fork into that location:
+
+   ```shell
+   cd gitlab-development-kit
+   git clone https://gitlab.com/gitlab-community/gitlab.git
+   ```
+
+To confirm it was successful:
+
+1. Ensure the `gitlab-development-kit/gitlab` directory exists.
+1. Go to the top `gitlab-development-kit` directory and run `gdk stop` and `gdk start`.
+
+If you get errors, run `gdk doctor` to troubleshoot. For more advanced troubleshooting, see
+[the troubleshooting docs](https://gitlab.com/gitlab-org/gitlab-development-kit/-/tree/main/doc/troubleshooting).
+
+## Step 2: Change the code
+
+Now for the fun part. Let's edit some code.
+
+In this example, I found some UI text I'd like to change.
+In the upper-right corner in GitLab, I selected my avatar and then **Preferences**.
+I want to change this text:
+
+![UI text](img/ui_text_before.png)
+
+Other settings on the page start with the word `Customize` and skip the `This setting allows you to` part.
+I'll update this phrase to match the others.
+
+1. Search the `gitlab-development-kit/gitlab` directory for the string `This setting allows you to customize`.
+
+   The results show one `.haml` file, two `.md` files, one `.pot` file, and
+   several `.po` files.
+
+1. Open the `.haml` file. This file is where the UI text resides.
+1. Update the string. In this case, I'll remove the words before `customize`
+   and start the word `customize` with a capital `C`.
+1. Save the file.
+
+You can check that you were successful:
+
+- In the `gitlab-development-kit/gitlab` directory, type `git status`
+  to show the file you modified:
+
+  ```shell
+          modified:   app/views/profiles/preferences/show.html.haml
+  ```
+
+- Refresh the web browser where you're viewing the GDK.
+  The changes should be displayed. Take a screenshot.
+
+  ![UI text](img/ui_text_after.png)
+
+### Update the translation files
+
+English UI strings are localized into many languages.
+These strings are saved in a `.pot` file, which you must update
+any time you update UI text.
+
+To generate the localization file:
+
+1. Ensure you are in the `gitlab-development-kit/gitlab` directory.
+1. Run the following command:
+
+   ```shell
+   bin/rake gettext:compile
+   ```
+
+   After several minutes, a `.pot` file is generated in the `/locale` directory.
+
+Now, in the `gitlab-development-kit/gitlab` directory, if you type `git status`
+you should have both files listed:
+
+```shell
+        modified:   app/views/profiles/preferences/show.html.haml
+        modified:   locale/gitlab.pot
+```
+
+For more information about localization, see [internationalization](../i18n/externalization.md).
+
+### Update the documentation
+
+Documentation for GitLab is published on <https://docs.gitlab.com>.
+When you add or update a feature, you must update the docs as well.
+
+1. To find the documentation for a feature, the easiest thing is to search the
+   docs site. In this case, the setting is described on this documentation page:
+
+   ```plaintext
+   https://docs.gitlab.com/ee/user/profile/preferences.html
+   ```
+
+1. The URL shows you the location of the file in the `/doc` directory.
+   In this case, the location is:
+
+   ```plaintext
+   doc/user/profile/preferences.md
+   ```
+
+1. Go to this location in your local `gitlab` repository and update the `.md` file
+   and any related images.
+
+Now when you run `git status`, you should have something like:
+
+```plaintext
+        modified:   app/views/profiles/preferences/show.html.haml
+        modified:   doc/user/profile/img/profile-preferences-syntax-themes.png
+        modified:   doc/user/profile/preferences.md
+        modified:   locale/gitlab.pot
+```
+
+To view these changes in action, you can
+[check out a merge request where these changes have already been made](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116472).
+
+## Step 3: Push your changes to the community fork
+
+Now you're going to push your changes to the community fork. This is the next step
+in getting your changes put into the main GitLab repository.
+
+1. Ensure you are in the `gitlab-development-kit/gitlab` directory.
+1. Create a branch. You don't want to work in the `master` branch.
+   Instead, you want to create a branch for your work. In this example,
+   we're going to call the branch `ui-updates`.
+
+   ```shell
+   git checkout -b ui-updates
+   ```
+
+1. Add the files to the staging area.
+
+   ```shell
+   git add .
+   ```
+
+1. Provide a commit message. GitLab has somewhat strict
+   [commit message guidelines](merge_request_workflow.md#commit-messages-guidelines).
+   To be safe, a general rule is to use three to five words, start with a capital letter,
+   and do **not** end with a period.
+
+   ```shell
+   git commit -m "Updating UI text
+
+   Standardizing the text on this page so
+   that each area uses consistent language.
+
+   Changelog: changed"
+   ```
+
+   The `Changelog: changed` is because we're changing an existing feature. If we were adding a feature, we'd
+   use `Changelog: added`. For details, see [changelog entries](../changelog.md).
+
+1. Push the changes to the community fork. At the same time, set the fork as your upstream,
+   so that it will be in sync for any future contributions.
+
+   ```shell
+   git push --set-upstream origin ui-updates
+   ```
+
+## Step 4: Create a merge request
+
+Now you're ready to push changes from the community fork to the main GitLab repository!
+
+1. Go to [the community fork on GitLab.com](https://gitlab.com/gitlab-community/gitlab).
+   You should see a message like this one:
+
+   ![Create merge request banner](img/mr_button.png)
+
+   Select **Create merge request**.
+   If you don't see this message, on the left sidebar, select **Merge requests > New merge request**.
+
+1. Take a look at the branch names. You should be merging from your branch
+   in the community fork to the `master` branch in the GitLab repository.
+
+   ![New merge request](img/new_merge_request.png)
+
+1. Fill out the information and then select **Save changes**.
+   Don't worry if your merge request is not complete. If you don't want anyone
+   from GitLab to review it, you can select the **Mark as draft** checkbox.
+   If you're not happy with the merge request after you create it, you can
+   close it, no harm done.
+
+1. Select the **Changes** tab. It should look something like this:
+
+   ![Changes tab](img/changes_tab.png)
+
+   The red text shows the code before you made changes. The green shows what
+   the code looks like now.
+
+1. If you're happy with this merge request and want to start the review process, type
+   `@gitlab-bot ready` in a comment and then select **Comment**.
+
+   ![GitLab bot ready comment](img/bot_ready.png)
+
+Someone from GitLab will look at your request and let you know what the next steps are.
+
+Now, any time you want to make a contribution to GitLab, you can just
+go to the `gitlab-development-kit` folder and run `gdk update`. Then make
+your changes in the `gitlab` directory and push them to the fork.
+
+If you need help at any point in the process, type `@gitlab-bot help` in a comment
+or initiate a [mentor session](https://about.gitlab.com/community/contribute/mentor-sessions/)
+on [Discord](https://discord.gg/gitlab).
+
+Congratulations on submitting your request, and thank you for your contribution!
diff --git a/doc/development/contributing/img/bot_ready.png b/doc/development/contributing/img/bot_ready.png
new file mode 100644
index 00000000000..85116c8957b
Binary files /dev/null and b/doc/development/contributing/img/bot_ready.png differ
diff --git a/doc/development/contributing/img/changes_tab.png b/doc/development/contributing/img/changes_tab.png
new file mode 100644
index 00000000000..2158e9dd183
Binary files /dev/null and b/doc/development/contributing/img/changes_tab.png differ
diff --git a/doc/development/contributing/img/gdk_home.png b/doc/development/contributing/img/gdk_home.png
new file mode 100644
index 00000000000..77505850609
Binary files /dev/null and b/doc/development/contributing/img/gdk_home.png differ
diff --git a/doc/development/contributing/img/mr_button.png b/doc/development/contributing/img/mr_button.png
new file mode 100644
index 00000000000..5bf08b44412
Binary files /dev/null and b/doc/development/contributing/img/mr_button.png differ
diff --git a/doc/development/contributing/img/new_merge_request.png b/doc/development/contributing/img/new_merge_request.png
new file mode 100644
index 00000000000..34512d06dd2
Binary files /dev/null and b/doc/development/contributing/img/new_merge_request.png differ
diff --git a/doc/development/contributing/img/ui_text_after.png b/doc/development/contributing/img/ui_text_after.png
new file mode 100644
index 00000000000..3a54e7ef653
Binary files /dev/null and b/doc/development/contributing/img/ui_text_after.png differ
diff --git a/doc/development/contributing/img/ui_text_before.png b/doc/development/contributing/img/ui_text_before.png
new file mode 100644
index 00000000000..afd75a11ac2
Binary files /dev/null and b/doc/development/contributing/img/ui_text_before.png differ
diff --git a/doc/development/documentation/site_architecture/index.md b/doc/development/documentation/site_architecture/index.md
index d4553614fad..849308f3086 100644
--- a/doc/development/documentation/site_architecture/index.md
+++ b/doc/development/documentation/site_architecture/index.md
@@ -33,7 +33,7 @@ Then you can use one of these approaches:
   of the documentation in the external repository. The landing page is indexed and
   searchable on <https://docs.gitlab.com>, but the rest of the documentation is not.
   For example, the [GitLab Workflow extension for VS Code](../../../user/project/repository/vscode.md).
-  We do not encourage the use of [pages with lists of links](../topic_types/index.md#topics-and-resources),
+  We do not encourage the use of [pages with lists of links](../topic_types/index.md#pages-and-topics-to-avoid),
   so only use this option if the recommended options are not feasible.
 
 ## Monthly release process (versions)
diff --git a/doc/development/documentation/styleguide/word_list.md b/doc/development/documentation/styleguide/word_list.md
index 767276bebcb..0459c7caa58 100644
--- a/doc/development/documentation/styleguide/word_list.md
+++ b/doc/development/documentation/styleguide/word_list.md
@@ -583,7 +583,14 @@ you can use **Pages** thereafter.
 
 ## GitLab Runner
 
-Use title case for **GitLab Runner**. This is the product you install. See also [runners](#runner-runners) and [this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/233529).
+Use title case for **GitLab Runner**. This is the product you install. For more information about the decision for this usage,
+see [this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/233529).
+
+See also:
+
+- [runners](#runner-runners)
+- [runner managers](#runner-manager-runner-managers)
+- [runner workers](#runner-worker-runner-workers)
 
 ## GitLab SaaS
 
@@ -852,6 +859,23 @@ Use lowercase for **merge requests**. If you use **MR** as the acronym, spell it
 
 Use lowercase for **milestones**.
 
+## Minimal Access
+
+When writing about the Minimal Access role:
+
+- Use a capital **M** and a capital **A**.
+- Write it out:
+  - Use: if you are assigned the Minimal Access role
+  - Instead of: if you are a Minimal Access user
+
+- When the Minimal Access role is the minimum required role:
+  - Use: at least the Minimal Access role
+  - Instead of: the Minimal Access role or higher
+
+Do not use bold.
+
+Do not use **Minimal Access permissions**. A user who is assigned the Minimal Access role has a set of associated permissions.
+
 ## n/a, N/A, not applicable
 
 When possible, use **not applicable**. Spelling out the phrase helps non-English speaking users and avoids
@@ -1137,6 +1161,14 @@ Use lowercase for **runners**. These are the agents that run CI/CD jobs. See als
 When referring to runners, if you have to specify that the runners are installed on a customer's GitLab instance,
 use **self-managed** rather than **self-hosted**.
 
+## runner manager, runner managers
+
+Use lowercase for **runner managers**. These are a type of runner that can create multiple runners for autoscaling. See also [GitLab Runner](#gitlab-runner).
+
+## runner worker, runner workers
+
+Use lowercase for **runner workers**. This is the process created by the runner on the host computing platform to run jobs. See also [GitLab Runner](#gitlab-runner).
+
 ## (s)
 
 Do not use **(s)** to make a word optionally plural. It can slow down comprehension. For example:
diff --git a/doc/development/documentation/topic_types/index.md b/doc/development/documentation/topic_types/index.md
index 511c8cdb345..37ed876fc59 100644
--- a/doc/development/documentation/topic_types/index.md
+++ b/doc/development/documentation/topic_types/index.md
@@ -16,14 +16,38 @@ Each topic on a page should be one of the following topic types:
 Even if a page is short, the page usually starts with a concept and then
 includes a task or reference topic.
 
-The tech writing team sometimes uses the acronym `CTRT` to refer to our topic types.
+The tech writing team sometimes uses the acronym `CTRT` to refer to the topic types.
 The acronym refers to the first letter of each topic type.
 
-In addition to the four primary topic types, we also have:
+## Other page and topic types
 
-- [Tutorials](tutorial.md) (a page type)
-- [Get started](#get-started) (a page type)
-- [Glossaries](glossary.md) (a topic or page type)
+In addition to the four primary topic types, you can use the following:
+
+- Page types: [Tutorials](tutorial.md) and [Get started](#get-started)
+- Topic type: [Related topics](#related-topics)
+- Page or topic type: [Glossaries](glossary.md)
+
+## Pages and topics to avoid
+
+You should avoid:
+
+- Pages that are exclusively links to other pages. The only exception are
+  top-level pages that aid with navigation.
+- Topics that have one or two sentences only. In these cases:
+  - Incorporate the information in another topic.
+  - If the sentence links to another page, use a [Related topics](#related-topics) link instead.
+
+## Topic title guidelines
+
+In general, for topic titles:
+
+- Be clear and direct. Make every word count.
+- Use articles and prepositions.
+- Follow [capitalization](../styleguide/index.md#capitalization) guidelines.
+- Do not repeat text from earlier topic titles. For example, if the page is about merge requests,
+  instead of `Troubleshooting merge requests`, use only `Troubleshooting`.
+
+See also [guidelines for heading levels in Markdown](../styleguide/index.md#heading-levels-in-markdown).
 
 ## Related topics
 
@@ -63,22 +87,3 @@ consider using subsections for each distinct task.
 
 In the left nav, use `Get started` as the text. On the page itself, spell out
 the full name. For example, `Get started with application security`.
-
-## Topics and resources
-
-Some pages are solely a list of links to other documentation.
-
-We do not encourage this page type. Lists of links can get out-of-date quickly
-and offer little value to users, who prefer to search to find information.
-
-## Topic title guidelines
-
-In general, for topic titles:
-
-- Be clear and direct. Make every word count.
-- Use articles and prepositions.
-- Follow [capitalization](../styleguide/index.md#capitalization) guidelines.
-- Do not repeat text from earlier topic titles. For example, if the page is about merge requests,
-  instead of `Troubleshooting merge requests`, use only `Troubleshooting`.
-
-See also [guidelines for heading levels in Markdown](../styleguide/index.md#heading-levels-in-markdown).
diff --git a/doc/development/testing_guide/flaky_tests.md b/doc/development/testing_guide/flaky_tests.md
index 762342a5341..a7a5e7a97d5 100644
--- a/doc/development/testing_guide/flaky_tests.md
+++ b/doc/development/testing_guide/flaky_tests.md
@@ -151,7 +151,7 @@ usually a good idea.
 
 ## Quarantined tests
 
-When a test fails in `master`,
+When we have a flaky test in `master`, quarantine the test after the first failure and
 create [a ~"failure::flaky-test" issue](https://about.gitlab.com/handbook/engineering/workflow/#broken-master).
 
 If the test cannot be fixed in a timely fashion, there is an impact on the
diff --git a/doc/tutorials/fuzz_testing_tutorial.md b/doc/tutorials/fuzz_testing_tutorial.md
new file mode 100644
index 00000000000..5a8209d9716
--- /dev/null
+++ b/doc/tutorials/fuzz_testing_tutorial.md
@@ -0,0 +1,243 @@
+---
+stage: Secure
+group: Dynamic Analysis
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
+---
+
+# Tutorial: Perform fuzz testing in GitLab **(ULTIMATE)**
+
+[Coverage-guided fuzz testing](../user/application_security/coverage_fuzzing/index.md#coverage-guided-fuzz-testing-process) sends unexpected, malformed, or random data to your application, and then monitors
+your application for unstable behaviors and crashes.
+
+This helps you discover bugs and potential security issues that other QA processes may miss.
+
+You should use fuzz testing in addition to other security scanners and your own test processes.
+If you're using GitLab CI/CD, you can run fuzz tests as part your CI/CD workflow.
+
+To set up, configure, and perform coverage-guided fuzz testing
+using JavaScript in this tutorial, you:
+
+1. [Fork the project template](#fork-the-project-template) to create a project
+   to run the fuzz tests in.
+1. [Create the fuzz targets](#create-the-fuzz-targets).
+1. [Enable coverage-guided fuzz testing](#enable-coverage-guided-fuzz-testing)
+   in your forked project.
+1. [Run the fuzz test](#run-the-fuzz-test) to identify security vulnerabilities.
+1. [Fix any vulnerabilities](#fix-the-vulnerabilities) identified by the fuzz test.
+
+## Fork the project template
+
+First, to create a project to try out fuzz testing in, you must fork the `fuzz-testing`
+project template:
+
+1. Open the [`fuzz-testing` project template](https://gitlab.com/gitlab-org/tutorial-project-templates/fuzz-testing).
+1. [Fork the project template](../user/project/repository/forking_workflow.md).
+1. When forking the project template:
+   - Name the forked project `fuzz-testing-demo`.
+   - Select an appropriate [namespace](../user/namespace/index.md).
+   - Set [project visibility](../user/public_access.md) to **Private**.
+
+You have successfully forked the `fuzz-testing` project template. Before you can
+start fuzz testing, remove the relationship between the project template and the fork:
+
+1. On the left sidebar, select **Settings > General**.
+1. Expand **Advanced**.
+1. In the **Remove fork relationship** section, select **Remove fork relationship**.
+   Enter the name of the project when prompted.
+
+Your project is ready and you can now create the fuzz test. Next you will create
+the fuzz targets.
+
+## Create the fuzz targets
+
+Now you have a project for fuzz testing, you create the fuzz targets. A fuzz target
+is a function or program that, given an input, makes a call to the application
+being tested.
+
+In this tutorial, the fuzz targets call a function of the `my-tools.js` file using
+a random buffer as a parameter.
+
+To create the two fuzz target files:
+
+1. On the top bar, select **Main menu > Projects** and select the `fuzz-testing-demo` project.
+1. Create a file in the root directory of the project.
+1. Name the file `fuzz-sayhello.js` and add the following code:
+
+   ```javascript
+   let tools = require('./my-tools')
+
+   function fuzz(buf) {
+     const text = buf.toString()
+     tools.sayHello(text)
+   }
+
+   module.exports = {
+     fuzz
+   }
+   ```
+
+   You can also copy this code from the `fuzz-testing-demo/fuzzers/fuzz-sayhello.js`
+   project file.
+
+1. Name the **Target Branch** `add-fuzz-test` and write a descriptive commit message.
+   - Do not select the **Start a new merge request with these changes** checkbox yet.
+1. Select **Commit changes**.
+1. Return to the root directory of the project.
+1. Make sure you are in the `add-fuzz-test` branch.
+1. Create the second file named `fuzz-readme.js` and add the following code:
+
+   ```javascript
+   let tools = require('./my-tools')
+   function fuzz(buf) {
+       const text = buf.toString()
+       tools.readmeContent(text)
+   }
+   module.exports = {
+       fuzz
+   }
+   ```
+
+   You can also copy this code from the `fuzz-testing-demo/fuzzers/fuzz-readme.js`
+   project file.
+
+1. Write a descriptive commit message.
+1. Make sure the **Target Branch** is `add-fuzz-test`.
+1. Select **Commit changes**.
+
+You now have two fuzz targets that can make calls to the application being tested.
+Next you will enable the fuzz testing.
+
+## Enable coverage-guided fuzz testing
+
+To enable coverage-guided fuzz testing, create a CI/CD pipeline running
+the `gitlab-cov-fuzz` CLI to execute the fuzz test on the two fuzz targets.
+
+To create the pipeline file:
+
+1. Make sure you are in the `add-fuzz-test` branch.
+1. In the root directory of the `fuzz-testing-demo` project, create a new file.
+1. Name the file `.gitlab-ci.yml` and add the following code:
+
+   ```yaml
+   image: node:18
+
+   stages:
+     - fuzz
+
+   include:
+     - template: Coverage-Fuzzing.gitlab-ci.yml
+
+   readme_fuzz_target:
+     extends: .fuzz_base
+     tags: [saas-linux-large-amd64] # Optional
+     variables:
+       COVFUZZ_ADDITIONAL_ARGS: '--fuzzTime=60'
+     script:
+       - npm config set @gitlab-org:registry https://gitlab.com/api/v4/packages/npm/ && npm i -g @gitlab-org/jsfuzz
+       - ./gitlab-cov-fuzz run --engine jsfuzz -- fuzz-readme.js
+
+   hello_fuzzing_target:
+     extends: .fuzz_base
+     tags: [saas-linux-large-amd64] # Optional
+     variables:
+       COVFUZZ_ADDITIONAL_ARGS: '--fuzzTime=60'
+     script:
+       - npm config set @gitlab-org:registry https://gitlab.com/api/v4/packages/npm/ && npm i -g @gitlab-org/jsfuzz
+       - ./gitlab-cov-fuzz run --engine jsfuzz -- fuzz-sayhello.js
+   ```
+
+   This step adds the following to your pipeline:
+   - A `fuzz` stage using a template.
+   - Two jobs, `readme_fuzz_target` and `hello_fuzzing_target`. Each job runs using
+     the `jsfuzz` engine, which reports unhandled exceptions as crashes.
+
+   You can also copy this code from the `fuzz-testing-demo/fuzzers/fuzzers.yml`
+   project file.
+
+1. Write a descriptive commit message.
+1. Make sure the **Target Branch** is `add-fuzz-test`.
+1. Select **Commit changes**.
+
+You have successfully enabled coverage-guided fuzz testing. Next you will run the
+fuzz test using the pipeline you've just created.
+
+## Run the fuzz test
+
+To run the fuzz test:
+
+1. On the left sidebar, select **Merge requests**.
+1. Select **New merge request**.
+1. In the **Source branch** section, select the `add-fuzz-test` branch.
+1. In the **Target branch** section, make sure that your namespace and the `main` branch are selected.
+1. Select **Compare branches and continue**.
+1. [Create the merge request](../user/project/merge_requests/creating_merge_requests.md).
+
+Creating the merge request triggers a new pipeline, which runs the fuzz test.
+When the pipeline is finished running, you should see a security vulnerability
+alert on the merge request page.
+
+To see more information on each vulnerability, select the individual **Uncaught-exception** links.
+
+You have successfully run the fuzz test and identified vulnerabilities to fix.
+
+## Fix the vulnerabilities
+
+The fuzz test identified two security vulnerabilities. To fix those
+vulnerabilities, you use the `my-tools.js` library.
+
+To create the `my-tools.js` file:
+
+1. Make sure you are in the `add-fuzz-test` branch of the project.
+1. Go to the root directory of your project and open the `my-tools.js` file.
+1. Replace the contents of this file with the following code:
+
+   ```javascript
+   const fs = require('fs')
+
+   function sayHello(name) {
+     if(name.includes("z")) {
+       //throw new Error("😡 error name: " + name)
+       console.log("😡 error name: " + name)
+     } else {
+       return "😀 hello " + name
+     }
+   }
+
+   function readmeContent(name) {
+
+     let fileName = name => {
+       if(name.includes("w")) {
+         return "./README.txt"
+       } else {
+         return "./README.md"
+       }
+     }
+
+     //const data = fs.readFileSync(fileName(name), 'utf8')
+     try {
+       const data = fs.readFileSync(fileName(name), 'utf8')
+       return data
+     } catch (err) {
+       console.error(err.message)
+       return ""
+     }
+
+   }
+
+   module.exports = {
+     sayHello, readmeContent
+   }
+   ```
+
+   You can also copy the code from the `fuzz-testing-demo/javascript/my-tools.js`
+   project file.
+
+1. Select **Commit changes**. This triggers another pipeline to run another fuzz test.
+1. When the pipeline is finished, check the merge request **Overview** page. You
+   should see that the security scan detected no new potential vulnerabilities.
+1. Merge your changes.
+
+Congratulations, you've successfully run a fuzz test and fixed the identified
+security vulnerabilities!
+
+For more information, see [coverage-guided fuzz testing](../user/application_security/coverage_fuzzing/index.md).
diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md
index c71ea6576ef..096b4dc2cc5 100644
--- a/doc/user/discussions/index.md
+++ b/doc/user/discussions/index.md
@@ -316,7 +316,7 @@ At the top of the page, the number of unresolved threads is updated:
 
 If you have multiple unresolved threads in a merge request, you can
 create an issue to resolve them separately. In the merge request, at the top of the page,
-select the ellipsis icon button (**{ellipsis_v}**) in the threads control and then select **Create issue to resolve all threads**:
+select the ellipsis icon button (**{ellipsis_v}**) in the threads control and then select **Resolve all with new issue**:
 
 ![Open new issue for all unresolved threads](img/create_new_issue_v15_4.png)
 
diff --git a/doc/user/group/saml_sso/index.md b/doc/user/group/saml_sso/index.md
index 6c53e6fdcfe..a730bbc6c23 100644
--- a/doc/user/group/saml_sso/index.md
+++ b/doc/user/group/saml_sso/index.md
@@ -18,7 +18,7 @@ Users can sign in to GitLab through their SAML identity provider.
 
 You can configure SAML SSO for the top-level group only.
 
-## Set up identity provider
+## Set up your identity provider
 
 The SAML standard means that you can use a wide range of identity providers with GitLab. Your identity provider might have relevant documentation. It can be generic SAML documentation or specifically targeted for GitLab.
 
@@ -34,7 +34,7 @@ If you have any questions on configuring the SAML app, contact your provider's s
 If you are having issues setting up your identity provider, see the
 [troubleshooting documentation](#troubleshooting).
 
-### Set up Azure
+### Azure
 
 To set up SSO with Azure as your identity provider:
 
@@ -67,7 +67,7 @@ View a demo of [SCIM provisioning on Azure using SAML SSO for groups](https://yo
 
 For more information, see an [example configuration page](example_saml_config.md#azure-active-directory).
 
-### Set up Google Workspace
+### Google Workspace
 
 To set up Google Workspace as your identity provider:
 
@@ -110,7 +110,7 @@ For more information, see an [example configuration page](example_saml_config.md
 <i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
 View a demo of [how to configure SAML with Google Workspaces and set up Group Sync](https://youtu.be/NKs0FSQVfCY).
 
-### Set up Okta
+### Okta
 
 To set up SSO with Okta as your identity provider:
 
@@ -145,7 +145,7 @@ For a demo of the Okta SAML setup including SCIM, see [Demo: Okta Group SAML & S
 
 For more information, see an [example configuration page](example_saml_config.md#okta)
 
-### Set up OneLogin
+### OneLogin
 
 OneLogin supports its own [GitLab (SaaS) application](https://onelogin.service-now.com/support?id=kb_article&sys_id=92e4160adbf16cd0ca1c400e0b961923&kb_category=50984e84db738300d5505eea4b961913).
 
@@ -173,7 +173,7 @@ To set up OneLogin as your identity provider:
 1. Make sure the identity provider is set to have provider-initiated calls
    to link existing GitLab accounts.
 
-### Set up identity provider using metadata
+### Use metadata
 
 To configure some identity providers, you need a GitLab metadata URL.
 To find this URL:
@@ -200,7 +200,7 @@ users cannot access any of the SAML groups. To mitigate this, you can disable
 
 To change identity providers:
 
-1. [Configure](#set-up-identity-provider) the group with the new identity provider.
+1. [Configure](#set-up-your-identity-provider) the group with the new identity provider.
 1. Optional. If the **NameID** is not identical, [change the **NameID** for users](#change-nameid-for-one-or-more-users).
 
 #### Change email domains
@@ -231,7 +231,7 @@ After you set up your identity provider to work with GitLab, you must configure
 1. Select **Save changes**.
 
 NOTE:
-The certificate [fingerprint algorithm](../../../integration/saml.md#configure-saml-on-your-idp) must be in SHA1. When configuring the identity provider (such as [Google Workspace](#set-up-google-workspace)), use a secure signature algorithm.
+The certificate [fingerprint algorithm](../../../integration/saml.md#configure-saml-on-your-idp) must be in SHA1. When configuring the identity provider (such as [Google Workspace](#google-workspace)), use a secure signature algorithm.
 
 If you are having issues configuring GitLab, see the [troubleshooting documentation](#troubleshooting).
 
@@ -424,7 +424,7 @@ The **NameID** should not be an email address or username because:
   sign in.
 
 For more information on the recommended value and format for specific identity
-providers, see the [set up identity provider documentation](#set-up-identity-provider).
+providers, see [set up your identity provider](#set-up-your-identity-provider).
 
 WARNING:
 After users have signed into GitLab using SSO SAML, changing the **NameID** value
diff --git a/doc/user/group/saml_sso/scim_setup.md b/doc/user/group/saml_sso/scim_setup.md
index 9c4ae9e7a27..38a1c4125aa 100644
--- a/doc/user/group/saml_sso/scim_setup.md
+++ b/doc/user/group/saml_sso/scim_setup.md
@@ -116,7 +116,7 @@ For each attribute:
 1. Select the required settings.
 1. Select **Ok**.
 
-If your SAML configuration differs from [the recommended SAML settings](index.md#set-up-azure), select the mapping
+If your SAML configuration differs from [the recommended SAML settings](index.md#azure), select the mapping
 attributes and modify them accordingly. In particular, the `objectId` source attribute must map to the `externalId`
 target attribute.
 
@@ -133,7 +133,7 @@ Prerequisites:
   product tier is required to use SCIM on Okta.
 - [GitLab is configured](#configure-gitlab).
 - SAML application for [Okta](https://developer.okta.com/docs/guides/build-sso-integration/saml2/main/) set up as
-  described in the [Okta setup notes](index.md#set-up-okta).
+  described in the [Okta setup notes](index.md#okta).
 - Your Okta SAML setup matches the [configuration steps exactly](index.md), especially the NameID configuration.
 
 To configure Okta for SCIM:
diff --git a/doc/user/group/saml_sso/troubleshooting.md b/doc/user/group/saml_sso/troubleshooting.md
index 103ab0b6ed6..62c13e8909b 100644
--- a/doc/user/group/saml_sso/troubleshooting.md
+++ b/doc/user/group/saml_sso/troubleshooting.md
@@ -244,7 +244,7 @@ If all users are receiving a `404` when attempting to sign in using SAML, confir
 If you receive a `404` during setup when using "verify configuration", make sure you have used the correct
 [SHA-1 generated fingerprint](../../../integration/saml.md#configure-saml-on-your-idp).
 
-If a user is trying to sign in for the first time and the GitLab single sign-on URL has not [been configured](index.md#set-up-identity-provider), they may see a 404.
+If a user is trying to sign in for the first time and the GitLab single sign-on URL has not [been configured](index.md#set-up-your-identity-provider), they may see a 404.
 As outlined in the [user access section](index.md#link-saml-to-your-existing-gitlabcom-account), a group Owner needs to provide the URL to users.
 
 If all users are receiving a `404` after signing in to the identity provider (IdP):
diff --git a/doc/user/profile/achievements.md b/doc/user/profile/achievements.md
index c06700bd2ef..06815521368 100644
--- a/doc/user/profile/achievements.md
+++ b/doc/user/profile/achievements.md
@@ -141,6 +141,7 @@ mutation achievementsUpdate($file: Upload!) {
 ## Award an achievement
 
 You can award an achievement to a user to recognize their contributions.
+The user receives an email notification when they are awarded an achievement.
 
 Prerequisites:
 
diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb
index 8947319711c..b5e1634004a 100644
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
@@ -422,6 +422,12 @@ module Backup
       end
     end
 
+    def puts_available_timestamps
+      available_timestamps.each do |available_timestamp|
+        puts_time " " + available_timestamp
+      end
+    end
+
     def unpack(source_backup_id)
       if source_backup_id.blank? && non_tarred_backup?
         puts_time "Non tarred backup found in #{backup_path}, using that"
@@ -437,7 +443,7 @@ module Backup
         elsif backup_file_list.many? && source_backup_id.nil?
           puts_time 'Found more than one backup:'
           # print list of available backups
-          puts_time " " + available_timestamps.join("\n ")
+          puts_available_timestamps
 
           if incremental?
             puts_time 'Please specify which one you want to create an incremental backup for:'
diff --git a/lib/gitlab/ci/templates/Terraform/Base.latest.gitlab-ci.yml b/lib/gitlab/ci/templates/Terraform/Base.latest.gitlab-ci.yml
index bc23a7c2a95..3249bd2bcac 100644
--- a/lib/gitlab/ci/templates/Terraform/Base.latest.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Terraform/Base.latest.gitlab-ci.yml
@@ -52,6 +52,9 @@ cache:
     - gitlab-terraform plan-json
   resource_group: ${TF_STATE_NAME}
   artifacts:
+    # The next line, which disables public access to pipeline artifacts, may not be available everywhere.
+    # See: https://docs.gitlab.com/ee/ci/yaml/#artifactspublic
+    public: false
     paths:
       - ${TF_ROOT}/plan.cache
     reports:
diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake
index e814d59aaf9..b4d59ba9412 100644
--- a/lib/tasks/gitlab/gitaly.rake
+++ b/lib/tasks/gitlab/gitaly.rake
@@ -34,7 +34,7 @@ Usage: rake "gitlab:gitaly:install[/installation/dir,/storage/path]")
             env["BUNDLE_DEPLOYMENT"] = 'false'
           end
 
-          output, status = Gitlab::Popen.popen([make_cmd, 'clean-build', 'all'], nil, env)
+          output, status = Gitlab::Popen.popen([make_cmd, 'clean', 'all'], nil, env)
           raise "Gitaly failed to compile: #{output}" unless status&.zero?
         end
       end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 37e48359464..287c552eb07 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -2169,9 +2169,24 @@ msgstr ""
 msgid "AccountValidation|Verification is required to discourage and reduce the abuse on GitLab infrastructure. If you verify with a credit or debit card, %{strong_start}GitLab will not charge your card, it will only be used for validation.%{strong_end} %{learn_more_link}"
 msgstr ""
 
+msgid "Achievements|%{namespace_full_path} awarded you the %{achievement_name} achievement"
+msgstr ""
+
+msgid "Achievements|%{namespace_full_path} awarded you the %{achievement_name} achievement!"
+msgstr ""
+
+msgid "Achievements|%{namespace_link} awarded you the %{bold_start}%{achievement_name}%{bold_end} achievement!"
+msgstr ""
+
 msgid "Achievements|Awarded %{timeAgo} by %{namespace}"
 msgstr ""
 
+msgid "Achievements|View your achievements on your %{link_start}profile%{link_end}."
+msgstr ""
+
+msgid "Achievements|View your achievements on your profile."
+msgstr ""
+
 msgid "Acknowledge"
 msgstr ""
 
@@ -12161,9 +12176,6 @@ msgstr ""
 msgid "Create issue"
 msgstr ""
 
-msgid "Create issue to resolve all threads"
-msgstr ""
-
 msgid "Create label"
 msgstr ""
 
@@ -31531,9 +31543,6 @@ msgstr ""
 msgid "PerformanceBar|First Contentful Paint"
 msgstr ""
 
-msgid "PerformanceBar|Flamegraph with mode:"
-msgstr ""
-
 msgid "PerformanceBar|Frontend resources"
 msgstr ""
 
@@ -35621,9 +35630,6 @@ msgstr ""
 msgid "ProtectedEnvironment|Allowed to deploy"
 msgstr ""
 
-msgid "ProtectedEnvironment|Allowed to deploy and approve"
-msgstr ""
-
 msgid "ProtectedEnvironment|Allowed to deploy to %{project} / %{environment}"
 msgstr ""
 
@@ -37345,6 +37351,9 @@ msgstr ""
 msgid "Resolve"
 msgstr ""
 
+msgid "Resolve all with new issue"
+msgstr ""
+
 msgid "Resolve any conflicts. %{linkStart}How do I fix them?%{linkEnd}"
 msgstr ""
 
@@ -48676,6 +48685,9 @@ msgstr ""
 msgid "Vulnerability|Additional Info"
 msgstr ""
 
+msgid "Vulnerability|Assert:"
+msgstr ""
+
 msgid "Vulnerability|Bug Bounty"
 msgstr ""
 
@@ -52524,9 +52536,6 @@ msgid_plural "mrWidget|Closes issues"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "mrWidget|Create issue to resolve all threads"
-msgstr ""
-
 msgid "mrWidget|Delete source branch"
 msgstr ""
 
@@ -52607,6 +52616,9 @@ msgstr ""
 msgid "mrWidget|Remove from merge train"
 msgstr ""
 
+msgid "mrWidget|Resolve all with new issue"
+msgstr ""
+
 msgid "mrWidget|Resolve conflicts"
 msgstr ""
 
diff --git a/qa/qa/page/project/import/github.rb b/qa/qa/page/project/import/github.rb
index fb227209b48..6248af98a78 100644
--- a/qa/qa/page/project/import/github.rb
+++ b/qa/qa/page/project/import/github.rb
@@ -71,7 +71,11 @@ module QA
           # @param [String] source_project_name
           # @param [Integer] wait
           # @return [Boolean]
-          def has_imported_project?(gh_project_name, wait: QA::Support::WaitForRequests::DEFAULT_MAX_WAIT_TIME)
+          def has_imported_project?(
+            gh_project_name,
+            wait: QA::Support::WaitForRequests::DEFAULT_MAX_WAIT_TIME,
+            allow_partial_import: false
+          )
             within_element(:project_import_row, source_project: gh_project_name, skip_finished_loading_check: true) do
               wait_until(
                 max_duration: wait,
@@ -80,18 +84,12 @@ module QA
                 skip_finished_loading_check_on_refresh: true
               ) do
                 status_selector = 'import_status_indicator'
-                is_partial_import = has_css?(status_selector, text: 'Partially completed')
 
-                # Temporarily adding this for investigation purposes. This makes sure that the details section is
-                # expanded when the screenshot is taken when the test fails. This can be removed or repurposed later
-                # after investigation. Related: https://gitlab.com/gitlab-org/gitlab/-/issues/385252#note_1211218434
-                if is_partial_import
-                  within_element_by_index(:import_status_indicator, 0) do
-                    find('button').click
-                  end
+                return has_element?(status_selector, text: "Complete", wait: 1) unless allow_partial_import # rubocop:disable Cop/AvoidReturnFromBlocks
+
+                ["Partially completed", "Complete"].any? do |status|
+                  has_element?(status_selector, text: status, wait: 1)
                 end
-
-                has_element?(status_selector, text: "Complete")
               end
             end
           end
diff --git a/qa/qa/resource/project_imported_from_github.rb b/qa/qa/resource/project_imported_from_github.rb
index 1e6b2ff620e..ed8074b1440 100644
--- a/qa/qa/resource/project_imported_from_github.rb
+++ b/qa/qa/resource/project_imported_from_github.rb
@@ -3,7 +3,7 @@
 module QA
   module Resource
     class ProjectImportedFromGithub < Resource::Project
-      attr_accessor :issue_events_import, :full_notes_import, :attachments_import
+      attr_accessor :issue_events_import, :full_notes_import, :attachments_import, :allow_partial_import
 
       attribute :github_repo_id do
         github_client.repository(github_repository_path).id
@@ -24,7 +24,7 @@ module QA
           import_page.select_advanced_option(:attachments_import) if attachments_import
 
           import_page.import!(github_repository_path, group.full_path, name)
-          import_page.wait_for_success(github_repository_path, wait: 240)
+          import_page.wait_for_success(github_repository_path, wait: 240, allow_partial_import: allow_partial_import)
         end
 
         reload!
diff --git a/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb b/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb
index 0bdb5930f30..d281944d3a1 100644
--- a/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb
+++ b/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j
       find('.discussions-counter .dropdown-toggle').click
 
       within('.discussions-counter') do
-        expect(page).to have_link(_("Create issue to resolve all threads"), href: new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid))
+        expect(page).to have_link(_("Resolve all with new issue"), href: new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid))
       end
     end
 
@@ -44,7 +44,7 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j
 
       it 'hides the link for creating a new issue' do
         expect(page).not_to have_selector resolve_all_discussions_link_selector
-        expect(page).not_to have_content "Create issue to resolve all threads"
+        expect(page).not_to have_content "Resolve all with new issue"
       end
     end
 
@@ -69,7 +69,7 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j
         end
 
         it 'does not show a link to create a new issue' do
-          expect(page).not_to have_link 'Create issue to resolve all threads'
+          expect(page).not_to have_link 'Resolve all with new issue'
         end
       end
 
@@ -83,13 +83,13 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j
         end
 
         it 'has a link to resolve all threads by creating an issue' do
-          expect(page).to have_link 'Create issue to resolve all threads', href: new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid)
+          expect(page).to have_link 'Resolve all with new issue', href: new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid)
         end
 
         context 'creating an issue for threads' do
           before do
             page.within '.mr-state-widget' do
-              page.click_link 'Create issue to resolve all threads', href: new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid)
+              page.click_link 'Resolve all with new issue', href: new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid)
 
               wait_for_all_requests
             end
diff --git a/spec/frontend/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions_spec.js b/spec/frontend/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions_spec.js
index 58b9f162815..fe916fcf6cb 100644
--- a/spec/frontend/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions_spec.js
@@ -40,7 +40,7 @@ describe('UnresolvedDiscussions', () => {
       expect(text).toContain('all threads must be resolved.');
 
       expect(wrapper.element.innerText).toContain('Jump to first unresolved thread');
-      expect(wrapper.element.innerText).toContain('Create issue to resolve all threads');
+      expect(wrapper.element.innerText).toContain('Resolve all with new issue');
       expect(wrapper.element.querySelector('.js-create-issue').getAttribute('href')).toEqual(
         TEST_HOST,
       );
@@ -54,7 +54,7 @@ describe('UnresolvedDiscussions', () => {
       expect(text).toContain('all threads must be resolved.');
 
       expect(wrapper.element.innerText).toContain('Jump to first unresolved thread');
-      expect(wrapper.element.innerText).not.toContain('Create issue to resolve all threads');
+      expect(wrapper.element.innerText).not.toContain('Resolve all with new issue');
       expect(wrapper.element.querySelector('.js-create-issue')).toEqual(null);
     });
   });
diff --git a/spec/lib/backup/manager_spec.rb b/spec/lib/backup/manager_spec.rb
index d8835bf0e37..1733d21c23f 100644
--- a/spec/lib/backup/manager_spec.rb
+++ b/spec/lib/backup/manager_spec.rb
@@ -664,8 +664,8 @@ RSpec.describe Backup::Manager, feature_category: :backup_restore do
 
         it 'prints the list of available backups' do
           expect { subject.create }.to raise_error SystemExit # rubocop:disable Rails/SaveBang
-          expect(progress).to have_received(:puts)
-            .with(a_string_matching('1451606400_2016_01_01_1.2.3\n 1451520000_2015_12_31'))
+          expect(progress).to have_received(:puts).with(a_string_matching('1451606400_2016_01_01_1.2.3'))
+          expect(progress).to have_received(:puts).with(a_string_matching('1451520000_2015_12_31'))
         end
 
         it 'fails the operation and prints an error' do
@@ -981,8 +981,8 @@ RSpec.describe Backup::Manager, feature_category: :backup_restore do
 
       it 'prints the list of available backups' do
         expect { subject.restore }.to raise_error SystemExit
-        expect(progress).to have_received(:puts)
-          .with(a_string_matching('1451606400_2016_01_01_1.2.3\n 1451520000_2015_12_31'))
+        expect(progress).to have_received(:puts).with(a_string_matching('1451606400_2016_01_01_1.2.3'))
+        expect(progress).to have_received(:puts).with(a_string_matching('1451520000_2015_12_31'))
       end
 
       it 'fails the operation and prints an error' do
diff --git a/spec/mailers/emails/profile_spec.rb b/spec/mailers/emails/profile_spec.rb
index c796801fdf9..140b067f7aa 100644
--- a/spec/mailers/emails/profile_spec.rb
+++ b/spec/mailers/emails/profile_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'email_spec'
 
-RSpec.describe Emails::Profile do
+RSpec.describe Emails::Profile, feature_category: :user_profile do
   include EmailSpec::Matchers
   include_context 'gitlab email notification'
 
@@ -541,4 +541,31 @@ RSpec.describe Emails::Profile do
       is_expected.to have_body_text /#{profile_emails_path}/
     end
   end
+
+  describe 'awarded a new achievement' do
+    let(:user) { build(:user) }
+    let(:achievement) { build(:achievement) }
+
+    subject { Notify.new_achievement_email(user, achievement) }
+
+    it_behaves_like 'an email sent from GitLab'
+    it_behaves_like 'it should not have Gmail Actions links'
+    it_behaves_like 'a user cannot unsubscribe through footer link'
+
+    it 'is sent to the user' do
+      is_expected.to deliver_to user.email
+    end
+
+    it 'has the correct subject' do
+      is_expected.to have_subject("#{achievement.namespace.full_path} awarded you the #{achievement.name} achievement")
+    end
+
+    it 'includes a link to the profile page' do
+      is_expected.to have_body_text(group_url(achievement.namespace))
+    end
+
+    it 'includes a link to the awarding group' do
+      is_expected.to have_body_text(user_url(user))
+    end
+  end
 end
diff --git a/spec/migrations/ensure_suggestions_note_id_bigint_backfill_is_finished_for_gitlab_dot_com_spec.rb b/spec/migrations/ensure_suggestions_note_id_bigint_backfill_is_finished_for_gitlab_dot_com_spec.rb
new file mode 100644
index 00000000000..f8dd700b160
--- /dev/null
+++ b/spec/migrations/ensure_suggestions_note_id_bigint_backfill_is_finished_for_gitlab_dot_com_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe EnsureSuggestionsNoteIdBigintBackfillIsFinishedForGitlabDotCom, feature_category: :database do
+  describe '#up' do
+    let(:migration_arguments) do
+      {
+        job_class_name: 'CopyColumnUsingBackgroundMigrationJob',
+        table_name: 'suggestions',
+        column_name: 'id',
+        job_arguments: [['note_id'], ['note_id_convert_to_bigint']]
+      }
+    end
+
+    it 'ensures the migration is completed for GitLab.com, dev, or test' do
+      expect_next_instance_of(described_class) do |instance|
+        expect(instance).to receive(:com_or_dev_or_test_but_not_jh?).and_return(true)
+        expect(instance).to receive(:ensure_batched_background_migration_is_finished).with(migration_arguments)
+      end
+
+      migrate!
+    end
+
+    it 'skips the check for other instances' do
+      expect_next_instance_of(described_class) do |instance|
+        expect(instance).to receive(:com_or_dev_or_test_but_not_jh?).and_return(false)
+        expect(instance).not_to receive(:ensure_batched_background_migration_is_finished)
+      end
+
+      migrate!
+    end
+  end
+end
diff --git a/spec/migrations/swap_suggestions_note_id_to_bigint_for_gitlab_dot_com_spec.rb b/spec/migrations/swap_suggestions_note_id_to_bigint_for_gitlab_dot_com_spec.rb
new file mode 100644
index 00000000000..48d72ec151e
--- /dev/null
+++ b/spec/migrations/swap_suggestions_note_id_to_bigint_for_gitlab_dot_com_spec.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe SwapSuggestionsNoteIdToBigintForGitlabDotCom, feature_category: :database do
+  describe '#up' do
+    before do
+      # A we call `schema_migrate_down!` before each example, and for this migration
+      # `#down` is same as `#up`, we need to ensure we start from the expected state.
+      connection = described_class.new.connection
+      connection.execute('ALTER TABLE suggestions ALTER COLUMN note_id TYPE integer')
+      connection.execute('ALTER TABLE suggestions ALTER COLUMN note_id_convert_to_bigint TYPE bigint')
+    end
+
+    # rubocop: disable RSpec/AnyInstanceOf
+    it 'swaps the integer and bigint columns for GitLab.com, dev, or test' do
+      allow_any_instance_of(described_class).to receive(:com_or_dev_or_test_but_not_jh?).and_return(true)
+
+      suggestions = table(:suggestions)
+
+      disable_migrations_output do
+        reversible_migration do |migration|
+          migration.before -> {
+            suggestions.reset_column_information
+
+            expect(suggestions.columns.find { |c| c.name == 'note_id' }.sql_type).to eq('integer')
+            expect(suggestions.columns.find { |c| c.name == 'note_id_convert_to_bigint' }.sql_type).to eq('bigint')
+          }
+
+          migration.after -> {
+            suggestions.reset_column_information
+
+            expect(suggestions.columns.find { |c| c.name == 'note_id' }.sql_type).to eq('bigint')
+            expect(suggestions.columns.find { |c| c.name == 'note_id_convert_to_bigint' }.sql_type).to eq('integer')
+          }
+        end
+      end
+    end
+
+    it 'is a no-op for other instances' do
+      allow_any_instance_of(described_class).to receive(:com_or_dev_or_test_but_not_jh?).and_return(false)
+
+      suggestions = table(:suggestions)
+
+      disable_migrations_output do
+        reversible_migration do |migration|
+          migration.before -> {
+            suggestions.reset_column_information
+
+            expect(suggestions.columns.find { |c| c.name == 'note_id' }.sql_type).to eq('integer')
+            expect(suggestions.columns.find { |c| c.name == 'note_id_convert_to_bigint' }.sql_type).to eq('bigint')
+          }
+
+          migration.after -> {
+            suggestions.reset_column_information
+
+            expect(suggestions.columns.find { |c| c.name == 'note_id' }.sql_type).to eq('integer')
+            expect(suggestions.columns.find { |c| c.name == 'note_id_convert_to_bigint' }.sql_type).to eq('bigint')
+          }
+        end
+      end
+    end
+    # rubocop: enable RSpec/AnyInstanceOf
+  end
+end
diff --git a/spec/models/ci/runner_spec.rb b/spec/models/ci/runner_spec.rb
index fe49b2c2c7f..53a6a0e6a88 100644
--- a/spec/models/ci/runner_spec.rb
+++ b/spec/models/ci/runner_spec.rb
@@ -273,7 +273,7 @@ RSpec.describe Ci::Runner, type: :model, feature_category: :runner do
     end
   end
 
-  shared_examples '.belonging_to_parent_group_of_project' do
+  shared_examples '.belonging_to_parent_groups_of_project' do
     let_it_be(:group1) { create(:group) }
     let_it_be(:project1) { create(:project, group: group1) }
     let_it_be(:runner1) { create(:ci_runner, :group, groups: [group1]) }
@@ -284,7 +284,7 @@ RSpec.describe Ci::Runner, type: :model, feature_category: :runner do
 
     let(:project_id) { project1.id }
 
-    subject(:result) { described_class.belonging_to_parent_group_of_project(project_id) }
+    subject(:result) { described_class.belonging_to_parent_groups_of_project(project_id) }
 
     it 'returns the group runner' do
       expect(result).to contain_exactly(runner1)
@@ -310,7 +310,7 @@ RSpec.describe Ci::Runner, type: :model, feature_category: :runner do
   end
 
   context 'when use_traversal_ids* are enabled' do
-    it_behaves_like '.belonging_to_parent_group_of_project'
+    it_behaves_like '.belonging_to_parent_groups_of_project'
   end
 
   context 'when use_traversal_ids* are disabled' do
@@ -322,7 +322,7 @@ RSpec.describe Ci::Runner, type: :model, feature_category: :runner do
       )
     end
 
-    it_behaves_like '.belonging_to_parent_group_of_project'
+    it_behaves_like '.belonging_to_parent_groups_of_project'
   end
 
   context 'with instance runners sharing enabled' do
diff --git a/spec/policies/ci/build_policy_spec.rb b/spec/policies/ci/build_policy_spec.rb
index fee4d76ca8f..77cfcab5c3e 100644
--- a/spec/policies/ci/build_policy_spec.rb
+++ b/spec/policies/ci/build_policy_spec.rb
@@ -121,8 +121,7 @@ RSpec.describe Ci::BuildPolicy do
 
       context 'when no one can push or merge to the branch' do
         before do
-          create(:protected_branch, :no_one_can_push,
-                 name: build.ref, project: project)
+          create(:protected_branch, :no_one_can_push, name: build.ref, project: project)
         end
 
         it 'does not include ability to update build' do
@@ -132,8 +131,7 @@ RSpec.describe Ci::BuildPolicy do
 
       context 'when developers can push to the branch' do
         before do
-          create(:protected_branch, :developers_can_merge,
-                 name: build.ref, project: project)
+          create(:protected_branch, :developers_can_merge, name: build.ref, project: project)
         end
 
         it 'includes ability to update build' do
@@ -143,8 +141,7 @@ RSpec.describe Ci::BuildPolicy do
 
       context 'when no one can create the tag' do
         before do
-          create(:protected_tag, :no_one_can_create,
-                 name: build.ref, project: project)
+          create(:protected_tag, :no_one_can_create, name: build.ref, project: project)
 
           build.update!(tag: true)
         end
@@ -156,8 +153,7 @@ RSpec.describe Ci::BuildPolicy do
 
       context 'when no one can create the tag but it is not a tag' do
         before do
-          create(:protected_tag, :no_one_can_create,
-                 name: build.ref, project: project)
+          create(:protected_tag, :no_one_can_create, name: build.ref, project: project)
         end
 
         it 'includes ability to update build' do
@@ -181,8 +177,7 @@ RSpec.describe Ci::BuildPolicy do
 
             context 'when the build was created for a protected ref' do
               before do
-                create(:protected_branch, :developers_can_push,
-                       name: build.ref, project: project)
+                create(:protected_branch, :developers_can_push, name: build.ref, project: project)
               end
 
               it { expect(policy).to be_disallowed :erase_build }
@@ -204,8 +199,7 @@ RSpec.describe Ci::BuildPolicy do
           let(:owner) { user }
 
           before do
-            create(:protected_branch, :no_one_can_push, :no_one_can_merge,
-                   name: build.ref, project: project)
+            create(:protected_branch, :no_one_can_push, :no_one_can_merge, name: build.ref, project: project)
           end
 
           it { expect(policy).to be_disallowed :erase_build }
@@ -219,8 +213,7 @@ RSpec.describe Ci::BuildPolicy do
 
         context 'when maintainers can push to the branch' do
           before do
-            create(:protected_branch, :maintainers_can_push,
-                   name: build.ref, project: project)
+            create(:protected_branch, :maintainers_can_push, name: build.ref, project: project)
           end
 
           context 'when the build was created by the maintainer' do
@@ -240,8 +233,7 @@ RSpec.describe Ci::BuildPolicy do
           let(:owner) { user }
 
           before do
-            create(:protected_branch, :no_one_can_push, :no_one_can_merge,
-                   name: build.ref, project: project)
+            create(:protected_branch, :no_one_can_push, :no_one_can_merge, name: build.ref, project: project)
           end
 
           it { expect(policy).to be_disallowed :erase_build }
@@ -257,8 +249,7 @@ RSpec.describe Ci::BuildPolicy do
 
         context 'when the build was created for a protected branch' do
           before do
-            create(:protected_branch, :developers_can_push,
-                   name: build.ref, project: project)
+            create(:protected_branch, :developers_can_push, name: build.ref, project: project)
           end
 
           it { expect(policy).to be_allowed :erase_build }
@@ -266,8 +257,7 @@ RSpec.describe Ci::BuildPolicy do
 
         context 'when the build was created for a protected tag' do
           before do
-            create(:protected_tag, :developers_can_create,
-                   name: build.ref, project: project)
+            create(:protected_tag, :developers_can_create, name: build.ref, project: project)
           end
 
           it { expect(policy).to be_allowed :erase_build }
diff --git a/spec/policies/ci/pipeline_policy_spec.rb b/spec/policies/ci/pipeline_policy_spec.rb
index b68bb966820..8a5b80e3051 100644
--- a/spec/policies/ci/pipeline_policy_spec.rb
+++ b/spec/policies/ci/pipeline_policy_spec.rb
@@ -20,8 +20,7 @@ RSpec.describe Ci::PipelinePolicy, :models do
 
       context 'when no one can push or merge to the branch' do
         before do
-          create(:protected_branch, :no_one_can_push,
-                 name: pipeline.ref, project: project)
+          create(:protected_branch, :no_one_can_push, name: pipeline.ref, project: project)
         end
 
         it 'does not include ability to update pipeline' do
@@ -31,8 +30,7 @@ RSpec.describe Ci::PipelinePolicy, :models do
 
       context 'when developers can push to the branch' do
         before do
-          create(:protected_branch, :developers_can_merge,
-                 name: pipeline.ref, project: project)
+          create(:protected_branch, :developers_can_merge, name: pipeline.ref, project: project)
         end
 
         it 'includes ability to update pipeline' do
@@ -42,8 +40,7 @@ RSpec.describe Ci::PipelinePolicy, :models do
 
       context 'when no one can create the tag' do
         before do
-          create(:protected_tag, :no_one_can_create,
-                 name: pipeline.ref, project: project)
+          create(:protected_tag, :no_one_can_create, name: pipeline.ref, project: project)
 
           pipeline.update!(tag: true)
         end
@@ -55,8 +52,7 @@ RSpec.describe Ci::PipelinePolicy, :models do
 
       context 'when no one can create the tag but it is not a tag' do
         before do
-          create(:protected_tag, :no_one_can_create,
-                 name: pipeline.ref, project: project)
+          create(:protected_tag, :no_one_can_create, name: pipeline.ref, project: project)
         end
 
         it 'includes ability to update pipeline' do
@@ -119,8 +115,7 @@ RSpec.describe Ci::PipelinePolicy, :models do
 
         before do
           project.add_developer(user)
-          create(:protected_branch, :developers_can_merge,
-                 name: pipeline.ref, project: project)
+          create(:protected_branch, :developers_can_merge, name: pipeline.ref, project: project)
         end
 
         it 'is enabled' do
@@ -133,8 +128,7 @@ RSpec.describe Ci::PipelinePolicy, :models do
 
         before do
           project.add_developer(user)
-          create(:protected_branch, :developers_can_merge,
-                 name: pipeline.ref, project: project)
+          create(:protected_branch, :developers_can_merge, name: pipeline.ref, project: project)
         end
 
         it 'is disabled' do
diff --git a/spec/policies/ci/pipeline_schedule_policy_spec.rb b/spec/policies/ci/pipeline_schedule_policy_spec.rb
index 92ad37145c0..7025eda1ba1 100644
--- a/spec/policies/ci/pipeline_schedule_policy_spec.rb
+++ b/spec/policies/ci/pipeline_schedule_policy_spec.rb
@@ -19,8 +19,7 @@ RSpec.describe Ci::PipelineSchedulePolicy, :models, :clean_gitlab_redis_cache do
 
       context 'when no one can push or merge to the branch' do
         before do
-          create(:protected_branch, :no_one_can_push,
-                 name: pipeline_schedule.ref, project: project)
+          create(:protected_branch, :no_one_can_push, name: pipeline_schedule.ref, project: project)
         end
 
         it 'does not include ability to play pipeline schedule' do
@@ -30,8 +29,7 @@ RSpec.describe Ci::PipelineSchedulePolicy, :models, :clean_gitlab_redis_cache do
 
       context 'when developers can push to the branch' do
         before do
-          create(:protected_branch, :developers_can_merge,
-                 name: pipeline_schedule.ref, project: project)
+          create(:protected_branch, :developers_can_merge, name: pipeline_schedule.ref, project: project)
         end
 
         it 'includes ability to update pipeline' do
@@ -45,8 +43,7 @@ RSpec.describe Ci::PipelineSchedulePolicy, :models, :clean_gitlab_redis_cache do
         before do
           pipeline_schedule.update!(ref: tag)
 
-          create(:protected_tag, :no_one_can_create,
-                 name: pipeline_schedule.ref, project: project)
+          create(:protected_tag, :no_one_can_create, name: pipeline_schedule.ref, project: project)
         end
 
         it 'does not include ability to play pipeline schedule' do
@@ -56,8 +53,7 @@ RSpec.describe Ci::PipelineSchedulePolicy, :models, :clean_gitlab_redis_cache do
 
       context 'when no one can create the tag but it is not a tag' do
         before do
-          create(:protected_tag, :no_one_can_create,
-                 name: pipeline_schedule.ref, project: project)
+          create(:protected_tag, :no_one_can_create, name: pipeline_schedule.ref, project: project)
         end
 
         it 'includes ability to play pipeline schedule' do
diff --git a/spec/policies/environment_policy_spec.rb b/spec/policies/environment_policy_spec.rb
index 701fc7ac9ae..f0957ff5cc9 100644
--- a/spec/policies/environment_policy_spec.rb
+++ b/spec/policies/environment_policy_spec.rb
@@ -50,8 +50,7 @@ RSpec.describe EnvironmentPolicy do
           with_them do
             before do
               project.add_member(user, access_level) unless access_level.nil?
-              create(:protected_branch, :no_one_can_push,
-                     name: 'master', project: project)
+              create(:protected_branch, :no_one_can_push, name: 'master', project: project)
             end
 
             it { expect(policy).to be_disallowed :stop_environment }
diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb
index 003ca2512dc..1103ea4eaad 100644
--- a/spec/policies/group_policy_spec.rb
+++ b/spec/policies/group_policy_spec.rb
@@ -735,10 +735,7 @@ RSpec.describe GroupPolicy, feature_category: :system_access do
   it_behaves_like 'clusterable policies' do
     let(:clusterable) { create(:group, :crm_enabled) }
     let(:cluster) do
-      create(:cluster,
-             :provided_by_gcp,
-             :group,
-             groups: [clusterable])
+      create(:cluster, :provided_by_gcp, :group, groups: [clusterable])
     end
   end
 
diff --git a/spec/services/achievements/award_service_spec.rb b/spec/services/achievements/award_service_spec.rb
index fb45a634ddd..c70c1d5c22d 100644
--- a/spec/services/achievements/award_service_spec.rb
+++ b/spec/services/achievements/award_service_spec.rb
@@ -32,8 +32,15 @@ RSpec.describe Achievements::AwardService, feature_category: :user_profile do
 
     context 'when user has permission' do
       let(:current_user) { maintainer }
+      let(:notification_service) { instance_double(NotificationService) }
+      let(:mail_message) { instance_double(ActionMailer::MessageDelivery) }
+
+      it 'creates an achievement and sends an e-mail' do
+        allow(NotificationService).to receive(:new).and_return(notification_service)
+        expect(notification_service).to receive(:new_achievement_email).with(recipient, achievement)
+          .and_return(mail_message)
+        expect(mail_message).to receive(:deliver_later)
 
-      it 'creates an achievement' do
         expect(response).to be_success
       end
 
diff --git a/spec/tasks/gitlab/gitaly_rake_spec.rb b/spec/tasks/gitlab/gitaly_rake_spec.rb
index d2f4fa0b8ef..443e56e9934 100644
--- a/spec/tasks/gitlab/gitaly_rake_spec.rb
+++ b/spec/tasks/gitlab/gitaly_rake_spec.rb
@@ -66,7 +66,7 @@ RSpec.describe 'gitlab:gitaly namespace rake task', :silence_stdout do
             .with(%w[which gmake])
             .and_return(['/usr/bin/gmake', 0])
           expect(Gitlab::Popen).to receive(:popen)
-            .with(%w[gmake clean-build all], nil, { "BUNDLE_GEMFILE" => nil, "RUBYOPT" => nil })
+            .with(%w[gmake clean all], nil, { "BUNDLE_GEMFILE" => nil, "RUBYOPT" => nil })
             .and_return(['ok', 0])
 
           subject
@@ -78,7 +78,7 @@ RSpec.describe 'gitlab:gitaly namespace rake task', :silence_stdout do
               .with(%w[which gmake])
               .and_return(['/usr/bin/gmake', 0])
             expect(Gitlab::Popen).to receive(:popen)
-              .with(%w[gmake clean-build all], nil, { "BUNDLE_GEMFILE" => nil, "RUBYOPT" => nil })
+              .with(%w[gmake clean all], nil, { "BUNDLE_GEMFILE" => nil, "RUBYOPT" => nil })
               .and_return(['output', 1])
 
             expect { subject }.to raise_error /Gitaly failed to compile: output/
@@ -95,14 +95,14 @@ RSpec.describe 'gitlab:gitaly namespace rake task', :silence_stdout do
 
         it 'calls make in the gitaly directory' do
           expect(Gitlab::Popen).to receive(:popen)
-            .with(%w[make clean-build all], nil, { "BUNDLE_GEMFILE" => nil, "RUBYOPT" => nil })
+            .with(%w[make clean all], nil, { "BUNDLE_GEMFILE" => nil, "RUBYOPT" => nil })
             .and_return(['output', 0])
 
           subject
         end
 
         context 'when Rails.env is test' do
-          let(:command) { %w[make clean-build all] }
+          let(:command) { %w[make clean all] }
 
           before do
             stub_rails_env('test')
diff --git a/spec/views/notify/new_achievement_email.html.haml_spec.rb b/spec/views/notify/new_achievement_email.html.haml_spec.rb
new file mode 100644
index 00000000000..9f577e6c043
--- /dev/null
+++ b/spec/views/notify/new_achievement_email.html.haml_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'email_spec'
+
+RSpec.describe 'notify/new_achievement_email.html.haml', feature_category: :user_profile do
+  let(:user) { build(:user) }
+  let(:achievement) { build(:achievement) }
+
+  before do
+    allow(view).to receive(:message) { instance_double(Mail::Message, subject: 'Subject') }
+    assign(:user, user)
+    assign(:achievement, achievement)
+  end
+
+  it 'contains achievement information' do
+    render
+
+    expect(rendered).to have_content(achievement.namespace.full_path)
+    expect(rendered).to have_content(" awarded you the ")
+    expect(rendered).to have_content(achievement.name)
+    expect(rendered).to have_content(" achievement!")
+
+    expect(rendered).to have_content("View your achievements on your profile")
+  end
+end