From a03d45be0074198f05eee941087e13cf18ea7cbd Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 20 May 2024 18:17:26 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .rubocop_todo/layout/argument_alignment.yml   | 26 --------
 .../layout/space_in_lambda_literal.yml        | 15 -----
 .../components/toolbar_table_button.vue       |  9 ++-
 .../wikis/components/delete_wiki_modal.vue    | 31 ++++++++-
 .../shared/wikis/components/wiki_form.vue     |  5 +-
 .../wikis/components/wiki_more_dropdown.vue   | 63 ++++++++++---------
 .../javascripts/pages/shared/wikis/show.js    | 16 +++--
 app/assets/stylesheets/framework/filters.scss |  5 ++
 .../work_items/parent_links/create_service.rb |  7 +++
 .../parent_links/destroy_service.rb           |  9 +++
 app/views/shared/wikis/show.html.haml         |  8 ++-
 doc/ci/runners/new_creation_workflow.md       |  2 +
 doc/development/documentation/versions.md     | 11 +++-
 doc/development/documentation/workflow.md     |  4 +-
 lib/api/entities/user_basic.rb                |  2 +-
 lib/api/environments.rb                       |  8 +--
 lib/api/error_tracking/client_keys.rb         |  2 +-
 lib/api/error_tracking/project_settings.rb    |  2 +-
 lib/api/events.rb                             |  4 +-
 lib/api/feature_flags.rb                      |  6 +-
 lib/api/files.rb                              | 46 +++++++-------
 lib/api/go_proxy.rb                           |  2 +-
 lib/api/group_container_repositories.rb       |  2 +-
 lib/api/group_labels.rb                       | 46 +++++++-------
 lib/api/group_packages.rb                     | 42 ++++++-------
 lib/api/groups.rb                             | 24 +++----
 lib/api/helm_packages.rb                      |  4 +-
 .../14_analytics/performance_bar_spec.rb      |  4 ++
 .../components/toolbar_table_button_spec.js   | 47 +++++++++++---
 .../shared/wikis/components/wiki_form_spec.js |  3 +-
 .../components/wiki_more_dropdown_spec.js     | 25 ++++++++
 .../parent_links/create_service_spec.rb       | 10 +++
 .../parent_links/destroy_service_spec.rb      |  4 ++
 .../work_items/update_service_spec.rb         |  2 +
 .../user_creates_wiki_page_shared_examples.rb |  9 ++-
 .../user_updates_wiki_page_shared_examples.rb |  9 ++-
 .../user_views_wiki_empty_shared_examples.rb  |  2 +-
 .../update_service_shared_examples.rb         |  8 ++-
 38 files changed, 331 insertions(+), 193 deletions(-)

diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml
index 9bc9095a6c7..ac2dcf75942 100644
--- a/.rubocop_todo/layout/argument_alignment.yml
+++ b/.rubocop_todo/layout/argument_alignment.yml
@@ -115,19 +115,6 @@ Layout/ArgumentAlignment:
     - 'ee/app/graphql/types/work_items/widgets/iteration_input_type.rb'
     - 'ee/app/graphql/types/work_items/widgets/iteration_type.rb'
     - 'ee/app/graphql/types/work_items/widgets/progress_input_type.rb'
-    - 'ee/app/graphql/types/work_items/widgets/requirement_legacy_filter_input_type.rb'
-    - 'ee/app/graphql/types/work_items/widgets/requirement_legacy_type.rb'
-    - 'ee/app/graphql/types/work_items/widgets/status_filter_input_type.rb'
-    - 'ee/app/graphql/types/work_items/widgets/status_input_type.rb'
-    - 'ee/app/graphql/types/work_items/widgets/weight_input_type.rb'
-    - 'ee/app/services/analytics/devops_adoption/enabled_namespaces/bulk_find_or_create_service.rb'
-    - 'ee/app/services/audit_events/streaming/event_type_filters/destroy_service.rb'
-    - 'ee/app/services/auto_merge/merge_train_service.rb'
-    - 'ee/app/services/dashboard/projects/create_service.rb'
-    - 'ee/app/services/dora/aggregate_metrics_service.rb'
-    - 'ee/app/services/ee/applications/create_service.rb'
-    - 'ee/app/services/ee/boards/issues/list_service.rb'
-    - 'ee/app/services/ee/issues/base_service.rb'
     - 'ee/app/services/ee/issues/clone_service.rb'
     - 'ee/app/services/ee/issues/move_service.rb'
     - 'ee/app/services/ee/keys/create_service.rb'
@@ -336,19 +323,6 @@ Layout/ArgumentAlignment:
     - 'lib/api/entities/pull_mirror.rb'
     - 'lib/api/entities/release.rb'
     - 'lib/api/entities/resource_access_token.rb'
-    - 'lib/api/entities/user_basic.rb'
-    - 'lib/api/environments.rb'
-    - 'lib/api/error_tracking/client_keys.rb'
-    - 'lib/api/error_tracking/project_settings.rb'
-    - 'lib/api/events.rb'
-    - 'lib/api/feature_flags.rb'
-    - 'lib/api/files.rb'
-    - 'lib/api/go_proxy.rb'
-    - 'lib/api/group_container_repositories.rb'
-    - 'lib/api/group_labels.rb'
-    - 'lib/api/group_packages.rb'
-    - 'lib/api/groups.rb'
-    - 'lib/api/helm_packages.rb'
     - 'lib/api/helpers.rb'
     - 'lib/api/helpers/custom_attributes.rb'
     - 'lib/api/helpers/events_helpers.rb'
diff --git a/.rubocop_todo/layout/space_in_lambda_literal.yml b/.rubocop_todo/layout/space_in_lambda_literal.yml
index 85534c6eacd..0384b81adfb 100644
--- a/.rubocop_todo/layout/space_in_lambda_literal.yml
+++ b/.rubocop_todo/layout/space_in_lambda_literal.yml
@@ -143,21 +143,6 @@ Layout/SpaceInLambdaLiteral:
     - 'ee/app/serializers/vulnerabilities/feedback_entity.rb'
     - 'ee/app/serializers/vulnerabilities/finding_entity.rb'
     - 'ee/app/serializers/vulnerability_note_entity.rb'
-    - 'ee/lib/ee/api/entities/ci/job_request/response.rb'
-    - 'ee/lib/ee/api/entities/epic.rb'
-    - 'ee/lib/ee/api/entities/issue.rb'
-    - 'ee/lib/ee/api/entities/list.rb'
-    - 'ee/lib/ee/api/entities/member.rb'
-    - 'ee/lib/ee/api/entities/project_approval_rule.rb'
-    - 'ee/lib/ee/api/entities/vulnerability_issue_link.rb'
-    - 'ee/lib/ee/gitlab/background_migration/backfill_epic_cache_counts.rb'
-    - 'ee/lib/ee/gitlab/background_migration/delete_approval_rules_with_vulnerability.rb'
-    - 'ee/lib/ee/gitlab/background_migration/migrate_shared_vulnerability_scanners.rb'
-    - 'ee/lib/ee/gitlab/background_migration/populate_approval_merge_request_rules_with_security_orchestration.rb'
-    - 'ee/lib/ee/gitlab/background_migration/populate_approval_project_rules_with_security_orchestration.rb'
-    - 'ee/lib/ee/gitlab/background_migration/populate_resolved_on_default_branch_column.rb'
-    - 'ee/lib/ee/gitlab/ci/config/entry/need.rb'
-    - 'ee/lib/ee/gitlab/event_store.rb'
     - 'lib/atlassian/jira_connect/serializers/author_entity.rb'
     - 'lib/bulk_imports/groups/transformers/group_attributes_transformer.rb'
     - 'lib/container_registry/base_client.rb'
diff --git a/app/assets/javascripts/content_editor/components/toolbar_table_button.vue b/app/assets/javascripts/content_editor/components/toolbar_table_button.vue
index a5ac560ad42..73c1e569b48 100644
--- a/app/assets/javascripts/content_editor/components/toolbar_table_button.vue
+++ b/app/assets/javascripts/content_editor/components/toolbar_table_button.vue
@@ -34,12 +34,14 @@ export default {
     setRowsAndCols(rows, cols) {
       this.rows = rows;
       this.cols = cols;
-      this.maxRows = clamp(rows + 1, MIN_ROWS, MAX_ROWS);
-      this.maxCols = clamp(cols + 1, MIN_COLS, MAX_COLS);
+      this.maxRows = clamp(rows + 1, this.maxRows, MAX_ROWS);
+      this.maxCols = clamp(cols + 1, this.maxCols, MAX_COLS);
     },
     resetState() {
       this.rows = 1;
       this.cols = 1;
+      this.maxRows = MIN_ROWS;
+      this.maxCols = MIN_COLS;
     },
     insertTable() {
       this.tiptapEditor
@@ -74,6 +76,8 @@ export default {
       this.setRowsAndCols(rows, cols);
     },
     setFocus(row, col) {
+      this.resetState();
+
       this.$refs[`table-${row}-${col}`][0].$el.focus();
     },
   },
@@ -97,6 +101,7 @@ export default {
       text-sr-only
       :fluid-width="true"
       @shown="setFocus(1, 1)"
+      @hidden="resetState"
     >
       <div
         class="gl-p-3 gl-pt-2"
diff --git a/app/assets/javascripts/pages/shared/wikis/components/delete_wiki_modal.vue b/app/assets/javascripts/pages/shared/wikis/components/delete_wiki_modal.vue
index e24b9b767ec..05fe31bb4d6 100644
--- a/app/assets/javascripts/pages/shared/wikis/components/delete_wiki_modal.vue
+++ b/app/assets/javascripts/pages/shared/wikis/components/delete_wiki_modal.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlButton, GlModal, GlModalDirective } from '@gitlab/ui';
+import { GlButton, GlDisclosureDropdownItem, GlModal, GlModalDirective } from '@gitlab/ui';
 import { escape } from 'lodash';
 import { s__, __, sprintf } from '~/locale';
 import { isTemplate } from '../utils';
@@ -8,11 +8,19 @@ export default {
   components: {
     GlModal,
     GlButton,
+    GlDisclosureDropdownItem,
   },
   directives: {
     'gl-modal': GlModalDirective,
   },
   inject: ['deleteWikiUrl', 'pageTitle', 'csrfToken', 'pagePersisted'],
+  props: {
+    showAsDropdownItem: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+  },
   computed: {
     isTemplate,
     title() {
@@ -48,6 +56,19 @@ export default {
     cancelProps() {
       return {
         text: this.$options.i18n.cancelButtonText,
+        href: this.deleteWikiUrl,
+        extraAttrs: {
+          class: 'gl-text-red-500!',
+        },
+      };
+    },
+    listItem() {
+      return {
+        text: this.deleteTemplateText,
+        extraAttrs: {
+          class: 'gl-text-red-500!',
+          'data-testid': 'page-delete-button',
+        },
       };
     },
   },
@@ -73,8 +94,14 @@ export default {
 </script>
 
 <template>
-  <div v-if="pagePersisted" class="gl-inline-block">
+  <div v-if="pagePersisted">
+    <gl-disclosure-dropdown-item
+      v-if="showAsDropdownItem"
+      v-gl-modal="$options.modal.modalId"
+      :item="listItem"
+    />
     <gl-button
+      v-else
       v-gl-modal="$options.modal.modalId"
       category="secondary"
       variant="danger"
diff --git a/app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue b/app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue
index bf322f876a5..33010a0a4cd 100644
--- a/app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue
+++ b/app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue
@@ -149,9 +149,6 @@ export default {
     autocompleteDataSources() {
       return gl.GfmAutoComplete?.dataSources;
     },
-    noContent() {
-      return !this.content.trim();
-    },
     csrfToken() {
       return csrf.token;
     },
@@ -202,7 +199,7 @@ export default {
       return !this.isContentEditorActive;
     },
     disableSubmitButton() {
-      return this.noContent || !this.title;
+      return !this.title;
     },
     drawioEnabled() {
       return typeof this.drawioUrl === 'string' && this.drawioUrl.length > 0;
diff --git a/app/assets/javascripts/pages/shared/wikis/components/wiki_more_dropdown.vue b/app/assets/javascripts/pages/shared/wikis/components/wiki_more_dropdown.vue
index 0448cfdea9b..bbecc480b4e 100644
--- a/app/assets/javascripts/pages/shared/wikis/components/wiki_more_dropdown.vue
+++ b/app/assets/javascripts/pages/shared/wikis/components/wiki_more_dropdown.vue
@@ -1,17 +1,26 @@
 <script>
-import { GlDisclosureDropdown, GlTooltipDirective } from '@gitlab/ui';
+import {
+  GlDisclosureDropdown,
+  GlDisclosureDropdownGroup,
+  GlDisclosureDropdownItem,
+  GlTooltipDirective,
+} from '@gitlab/ui';
 import { s__, __ } from '~/locale';
 import printMarkdownDom from '~/lib/print_markdown_dom';
 import { isTemplate } from '../utils';
+import DeleteWikiModal from './delete_wiki_modal.vue';
 
 export default {
   components: {
     GlDisclosureDropdown,
+    GlDisclosureDropdownGroup,
+    GlDisclosureDropdownItem,
+    DeleteWikiModal,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
   },
-  inject: ['print', 'history'],
+  inject: ['print', 'history', 'pagePersisted'],
   i18n: {
     wikiActions: s__('Wiki|Wiki actions'),
   },
@@ -22,30 +31,23 @@ export default {
   },
   computed: {
     isTemplate,
-    dropdownItems() {
-      const items = [];
-
-      if (this.history) {
-        items.push({
-          text: this.isTemplate ? s__('Wiki|Template history') : s__('Wiki|Page history'),
-          href: this.history,
-          extraAttrs: {
-            'data-testid': 'page-history-button',
-          },
-        });
-      }
-
-      if (this.print && !this.isTemplate) {
-        items.push({
-          text: __('Print as PDF'),
-          action: this.printPage,
-          extraAttrs: {
-            'data-testid': 'page-print-button',
-          },
-        });
-      }
-
-      return items;
+    historyItem() {
+      return {
+        text: this.isTemplate ? s__('Wiki|Template history') : s__('Wiki|Page history'),
+        href: this.history,
+        extraAttrs: {
+          'data-testid': 'page-history-button',
+        },
+      };
+    },
+    printItem() {
+      return {
+        text: __('Print as PDF'),
+        action: this.printPage,
+        extraAttrs: {
+          'data-testid': 'page-print-button',
+        },
+      };
     },
     showDropdownTooltip() {
       return !this.isDropdownVisible ? this.$options.i18n.wikiActions : '';
@@ -71,7 +73,6 @@ export default {
 <template>
   <gl-disclosure-dropdown
     v-gl-tooltip="showDropdownTooltip"
-    :items="dropdownItems"
     icon="ellipsis_v"
     category="tertiary"
     placement="right"
@@ -79,5 +80,11 @@ export default {
     data-testid="wiki-more-dropdown"
     @shown="showDropdown"
     @hidden="hideDropdown"
-  />
+  >
+    <gl-disclosure-dropdown-item v-if="history" :item="historyItem" />
+    <gl-disclosure-dropdown-item v-if="print && !isTemplate" :item="printItem" />
+    <gl-disclosure-dropdown-group v-if="pagePersisted" bordered>
+      <delete-wiki-modal show-as-dropdown-item />
+    </gl-disclosure-dropdown-group>
+  </gl-disclosure-dropdown>
 </template>
diff --git a/app/assets/javascripts/pages/shared/wikis/show.js b/app/assets/javascripts/pages/shared/wikis/show.js
index 89ed395f742..0311548e91b 100644
--- a/app/assets/javascripts/pages/shared/wikis/show.js
+++ b/app/assets/javascripts/pages/shared/wikis/show.js
@@ -1,4 +1,6 @@
 import Vue from 'vue';
+import { parseBoolean } from '~/lib/utils/common_utils';
+import csrf from '~/lib/utils/csrf';
 import Wikis from './wikis';
 import WikiContent from './components/wiki_content.vue';
 import WikiMoreDropdown from './components/wiki_more_dropdown.vue';
@@ -21,17 +23,21 @@ const mountWikiContentApp = () => {
   }
 };
 
-const mountWikiExportApp = () => {
-  const el = document.querySelector('#js-export-actions');
+const mountWikiMoreDropdownApp = () => {
+  const el = document.querySelector('#js-wiki-more-actions');
 
   if (!el) return false;
-  const { history, print } = JSON.parse(el.dataset.options);
+  const { history, print, deleteWikiUrl, pageTitle, pagePersisted } = el.dataset;
 
   return new Vue({
     el,
     provide: {
       history,
-      print,
+      print: JSON.parse(print),
+      pageTitle,
+      deleteWikiUrl,
+      csrfToken: csrf.token,
+      pagePersisted: parseBoolean(pagePersisted),
     },
     render(createElement) {
       return createElement(WikiMoreDropdown);
@@ -43,5 +49,5 @@ export const mountApplications = () => {
   // eslint-disable-next-line no-new
   new Wikis();
   mountWikiContentApp();
-  mountWikiExportApp();
+  mountWikiMoreDropdownApp();
 };
diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss
index 4eadceee3f7..d2f08be71c7 100644
--- a/app/assets/stylesheets/framework/filters.scss
+++ b/app/assets/stylesheets/framework/filters.scss
@@ -100,6 +100,11 @@
     display: inline-block;
     padding: 2px 7px;
     @include gl-font-sm;
+  }
+  
+  .name,
+  .operator,
+  .value-container {
     color: $gl-text-color;
   }
 
diff --git a/app/services/work_items/parent_links/create_service.rb b/app/services/work_items/parent_links/create_service.rb
index 2403f072a19..f48c3f8c0f1 100644
--- a/app/services/work_items/parent_links/create_service.rb
+++ b/app/services/work_items/parent_links/create_service.rb
@@ -31,6 +31,13 @@ module WorkItems
           system_note_metadata_id: relate_child_note&.system_note_metadata&.id
         )
       end
+
+      override :after_create_for
+      def after_create_for(link)
+        super
+
+        GraphqlTriggers.work_item_updated(link.work_item_parent)
+      end
     end
   end
 end
diff --git a/app/services/work_items/parent_links/destroy_service.rb b/app/services/work_items/parent_links/destroy_service.rb
index 3059450d671..b3d49e2ab14 100644
--- a/app/services/work_items/parent_links/destroy_service.rb
+++ b/app/services/work_items/parent_links/destroy_service.rb
@@ -3,6 +3,8 @@
 module WorkItems
   module ParentLinks
     class DestroyService < IssuableLinks::DestroyService
+      extend ::Gitlab::Utils::Override
+
       attr_reader :link, :current_user, :parent, :child
 
       def initialize(link, user, params = {})
@@ -34,6 +36,13 @@ module WorkItems
       def permission_to_remove_relation?
         can?(current_user, :admin_parent_link, child) && can?(current_user, :admin_parent_link, parent)
       end
+
+      override :after_destroy
+      def after_destroy
+        super
+
+        GraphqlTriggers.work_item_updated(@link.work_item_parent)
+      end
     end
   end
 end
diff --git a/app/views/shared/wikis/show.html.haml b/app/views/shared/wikis/show.html.haml
index c445ee4e7c8..6a90a3be1d7 100644
--- a/app/views/shared/wikis/show.html.haml
+++ b/app/views/shared/wikis/show.html.haml
@@ -20,7 +20,13 @@
         = _('Edit')
     = render 'shared/wikis/main_links'
 
-    #js-export-actions{ data: { options: { is_template: @page.template?, history: page_history, print: { target: '.js-wiki-page-content', title: @page.human_title, stylesheet: [universal_path_to_stylesheet('application')] } }.to_json } }
+    #js-wiki-more-actions{ data: {
+      delete_wiki_url: wiki_page_path(@wiki, @page),
+      page_title: @page.human_title,
+      page_persisted: (@page.persisted? && can?(current_user, :create_wiki, @wiki.container)).to_s,
+      history: page_history,
+      print: { target: '.js-wiki-page-content', title: @page.human_title, stylesheet: [universal_path_to_stylesheet('application')] }.to_json,
+    } }
 
 - if @page.historical?
   = render Pajamas::AlertComponent.new(variant: :warning,
diff --git a/doc/ci/runners/new_creation_workflow.md b/doc/ci/runners/new_creation_workflow.md
index e8a34772a55..01c5053a6fb 100644
--- a/doc/ci/runners/new_creation_workflow.md
+++ b/doc/ci/runners/new_creation_workflow.md
@@ -175,6 +175,8 @@ runUntagged: true
 protected: true
 ```
 
+The replacement field for the invalid `runnerRegistrationToken` field is the `runnerToken` field. In the context of the GitLab Runner on Kubernetes, Helm deploy passes the runner `authentication token` to the runner worker pod and the runner configuration is created. If you continue to use the `runnerRegistrationToken` token field on Kubernetes hosted runners attached to GitLab.com, then the runner worker pod tries, on creation, to use the Registration API method that is no longer supported as of GitLab 17.0.
+
 If you store the runner authentication token in `secrets`, you must also modify them.
 
 In the legacy runner registration workflow, fields were specified with:
diff --git a/doc/development/documentation/versions.md b/doc/development/documentation/versions.md
index 1f139e0817e..256d79ca7e6 100644
--- a/doc/development/documentation/versions.md
+++ b/doc/development/documentation/versions.md
@@ -44,7 +44,7 @@ This feature does something.
 
 The item text must include these words in order. Capitalization doesn't matter.
 
-- `introduced`, `enabled`, `deprecated`, `changed`, `moved`, `recommended`, `removed`, or `renamed`
+- `introduced`, `added`, `enabled`, `deprecated`, `changed`, `moved`, `recommended`, `removed`, or `renamed`
 - `in` or `to`
 - `GitLab` (or, for external projects, the name of the project)
 
@@ -78,6 +78,15 @@ Or on email notifications page:
 > - Notifications for expiring tokens [introduced](<link-to-issue>) in GitLab 14.3.
 ```
 
+#### Making features available as part of a program
+
+When a feature is made available to users as a part of a program, add a new list item.
+
+```markdown
+> - [Introduced](<link-to-issue>) in GitLab 15.1.
+> - Merged results pipelines [added](<link-to-issue>) to the [Registration Features Program](<link-to-page>) in GitLab 16.7.
+```
+
 #### Moving subscription tiers
 
 If a feature is moved to another subscription tier, use `moved`:
diff --git a/doc/development/documentation/workflow.md b/doc/development/documentation/workflow.md
index 321530ae231..325ea3db48c 100644
--- a/doc/development/documentation/workflow.md
+++ b/doc/development/documentation/workflow.md
@@ -79,7 +79,9 @@ and merged by the Solutions Architect team.
 
 ## AI-generated content
 
-You can make AI-generated contributions to GitLab documentation, provided you follow the guidelines in our [DCO or our CLA terms](https://about.gitlab.com/community/contribute/dco-cla/).
+Community members can make AI-generated contributions to GitLab documentation, provided they follow the guidelines in our [DCO or our CLA terms](https://about.gitlab.com/community/contribute/dco-cla/).
+
+GitLab team members must follow the guidelines documented in the [internal handbook](https://internal.gitlab.com/handbook/product/ai-strategy/ai-integration-effort/legal_restrictions/). 
 
 ## Related topics
 
diff --git a/lib/api/entities/user_basic.rb b/lib/api/entities/user_basic.rb
index 9b1814251fe..5a49678bb1b 100644
--- a/lib/api/entities/user_basic.rb
+++ b/lib/api/entities/user_basic.rb
@@ -20,7 +20,7 @@ module API
       )
 
       expose :custom_attributes, using: 'API::Entities::CustomAttribute', if: :with_custom_attributes,
-                                 documentation: { is_array: true }
+        documentation: { is_array: true }
 
       expose :web_url, documentation: { type: 'string', example: 'https://gitlab.example.com/root' } do |user, options|
         Gitlab::Routing.url_helpers.user_url(user)
diff --git a/lib/api/environments.rb b/lib/api/environments.rb
index b94391359ed..9b9d35e3cc9 100644
--- a/lib/api/environments.rb
+++ b/lib/api/environments.rb
@@ -205,8 +205,8 @@ module API
       end
       params do
         requires :before,
-                 type: DateTime,
-                 desc: 'Stop all environments that were last modified or deployed to before this date.'
+          type: DateTime,
+          desc: 'Stop all environments that were last modified or deployed to before this date.'
       end
       route_setting :authentication, job_token_allowed: true
       post ':id/environments/stop_stale' do
@@ -242,8 +242,8 @@ module API
 
         environment = user_project.environments.find(params[:environment_id])
         present environment, with: Entities::Environment, current_user: current_user,
-                             except: [:project, { last_deployment: [:environment] }],
-                             last_deployment: true
+          except: [:project, { last_deployment: [:environment] }],
+          last_deployment: true
       end
     end
   end
diff --git a/lib/api/error_tracking/client_keys.rb b/lib/api/error_tracking/client_keys.rb
index 8a0a5e2a9b7..2e938cc91b3 100644
--- a/lib/api/error_tracking/client_keys.rb
+++ b/lib/api/error_tracking/client_keys.rb
@@ -11,7 +11,7 @@ module API
 
     params do
       requires :id, types: [String, Integer],
-                    desc: 'The ID or URL-encoded path of the project owned by the authenticated user'
+        desc: 'The ID or URL-encoded path of the project owned by the authenticated user'
     end
 
     resource :projects, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do
diff --git a/lib/api/error_tracking/project_settings.rb b/lib/api/error_tracking/project_settings.rb
index 99af8494723..16321484eca 100644
--- a/lib/api/error_tracking/project_settings.rb
+++ b/lib/api/error_tracking/project_settings.rb
@@ -17,7 +17,7 @@ module API
 
     params do
       requires :id, types: [String, Integer],
-                    desc: 'The ID or URL-encoded path of the project owned by the authenticated user'
+        desc: 'The ID or URL-encoded path of the project owned by the authenticated user'
     end
 
     resource :projects, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do
diff --git a/lib/api/events.rb b/lib/api/events.rb
index b47985126e9..8b8b27d85af 100644
--- a/lib/api/events.rb
+++ b/lib/api/events.rb
@@ -22,8 +22,8 @@ module API
       end
       params do
         optional :scope, type: String,
-                         desc: 'Include all events across a user’s projects',
-                         documentation: { example: 'all' }
+          desc: 'Include all events across a user’s projects',
+          documentation: { example: 'all' }
         use :pagination
         use :event_filter_params
         use :sort_params
diff --git a/lib/api/feature_flags.rb b/lib/api/feature_flags.rb
index 4ed288ee997..b632da51c9c 100644
--- a/lib/api/feature_flags.rb
+++ b/lib/api/feature_flags.rb
@@ -33,9 +33,9 @@ module API
         end
         params do
           optional :scope,
-                   type: String,
-                   desc: 'The scope of feature flags, one of: `enabled`, `disabled`',
-                   values: %w[enabled disabled]
+            type: String,
+            desc: 'The scope of feature flags, one of: `enabled`, `disabled`',
+            values: %w[enabled disabled]
           use :pagination
         end
         get do
diff --git a/lib/api/files.rb b/lib/api/files.rb
index 9f7d8a60a8d..53c60c5b748 100644
--- a/lib/api/files.rb
+++ b/lib/api/files.rb
@@ -96,18 +96,18 @@ module API
 
       params :simple_file_params do
         requires :file_path, type: String, file_path: true,
-                             desc: 'The url encoded path to the file.', documentation: { example: 'lib%2Fclass%2Erb' }
+          desc: 'The url encoded path to the file.', documentation: { example: 'lib%2Fclass%2Erb' }
         requires :branch, type: String,
-                          desc: 'Name of the branch to commit into. To create a new branch, also provide `start_branch`.', allow_blank: false,
-                          documentation: { example: 'main' }
+          desc: 'Name of the branch to commit into. To create a new branch, also provide `start_branch`.', allow_blank: false,
+          documentation: { example: 'main' }
         requires :commit_message, type: String,
-                                  allow_blank: false, desc: 'Commit message', documentation: { example: 'Initial commit' }
+          allow_blank: false, desc: 'Commit message', documentation: { example: 'Initial commit' }
         optional :start_branch, type: String,
-                                desc: 'Name of the branch to start the new commit from', documentation: { example: 'main' }
+          desc: 'Name of the branch to start the new commit from', documentation: { example: 'main' }
         optional :author_email, type: String,
-                                desc: 'The email of the author', documentation: { example: 'johndoe@example.com' }
+          desc: 'The email of the author', documentation: { example: 'johndoe@example.com' }
         optional :author_name, type: String,
-                               desc: 'The name of the author', documentation: { example: 'John Doe' }
+          desc: 'The name of the author', documentation: { example: 'John Doe' }
       end
 
       params :extended_file_params do
@@ -115,8 +115,8 @@ module API
         requires :content, type: String, desc: 'File content', documentation: { example: 'file content' }
         optional :encoding, type: String, values: %w[base64 text], default: 'text', desc: 'File encoding'
         optional :last_commit_id, type: String,
-                                  desc: 'Last known commit id for this file',
-                                  documentation: { example: '2695effb5807a22ff3d138d593fd856244e155e7' }
+          desc: 'Last known commit id for this file',
+          documentation: { example: '2695effb5807a22ff3d138d593fd856244e155e7' }
         optional :execute_filemode, type: Boolean, desc: 'Enable / Disable the executable flag on the file path'
       end
     end
@@ -130,9 +130,9 @@ module API
       desc 'Get blame file metadata from repository'
       params do
         requires :file_path, type: String, file_path: true,
-                             desc: 'The url encoded path to the file.', documentation: { example: 'lib%2Fclass%2Erb' }
+          desc: 'The url encoded path to the file.', documentation: { example: 'lib%2Fclass%2Erb' }
         requires :ref, type: String,
-                       desc: 'The name of branch, tag or commit', allow_blank: false, documentation: { example: 'main' }
+          desc: 'The name of branch, tag or commit', allow_blank: false, documentation: { example: 'main' }
       end
       head ":id/repository/files/:file_path/blame", requirements: FILE_ENDPOINT_REQUIREMENTS do
         assign_file_vars!
@@ -143,14 +143,14 @@ module API
       desc 'Get blame file from the repository'
       params do
         requires :file_path, type: String, file_path: true,
-                             desc: 'The url encoded path to the file.', documentation: { example: 'lib%2Fclass%2Erb' }
+          desc: 'The url encoded path to the file.', documentation: { example: 'lib%2Fclass%2Erb' }
         requires :ref, type: String,
-                       desc: 'The name of branch, tag or commit', allow_blank: false, documentation: { example: 'main' }
+          desc: 'The name of branch, tag or commit', allow_blank: false, documentation: { example: 'main' }
         optional :range, type: Hash do
           requires :start, type: Integer,
-                           desc: 'The first line of the range to blame', allow_blank: false, values: ->(v) { v > 0 }
+            desc: 'The first line of the range to blame', allow_blank: false, values: ->(v) { v > 0 }
           requires :end, type: Integer,
-                         desc: 'The last line of the range to blame', allow_blank: false, values: ->(v) { v > 0 }
+            desc: 'The last line of the range to blame', allow_blank: false, values: ->(v) { v > 0 }
         end
       end
       get ":id/repository/files/:file_path/blame", requirements: FILE_ENDPOINT_REQUIREMENTS do
@@ -169,12 +169,12 @@ module API
       end
       params do
         requires :file_path, type: String, file_path: true,
-                             desc: 'The url encoded path to the file.', documentation: { example: 'lib%2Fclass%2Erb' }
+          desc: 'The url encoded path to the file.', documentation: { example: 'lib%2Fclass%2Erb' }
         optional :ref, type: String,
-                       desc: 'The name of branch, tag or commit', allow_blank: false, documentation: { example: 'main' }
+          desc: 'The name of branch, tag or commit', allow_blank: false, documentation: { example: 'main' }
         optional :lfs, type: Boolean,
-                       desc: 'Retrieve binary data for a file that is an lfs pointer',
-                       default: false
+          desc: 'Retrieve binary data for a file that is an lfs pointer',
+          default: false
       end
       get ":id/repository/files/:file_path/raw", requirements: FILE_ENDPOINT_REQUIREMENTS, urgency: :low do
         assign_file_vars!
@@ -195,9 +195,9 @@ module API
       desc 'Get file metadata from repository'
       params do
         requires :file_path, type: String, file_path: true,
-                             desc: 'The url encoded path to the file.', documentation: { example: 'lib%2Fclass%2Erb' }
+          desc: 'The url encoded path to the file.', documentation: { example: 'lib%2Fclass%2Erb' }
         requires :ref, type: String,
-                       desc: 'The name of branch, tag or commit', allow_blank: false, documentation: { example: 'main' }
+          desc: 'The name of branch, tag or commit', allow_blank: false, documentation: { example: 'main' }
       end
       head ":id/repository/files/:file_path", requirements: FILE_ENDPOINT_REQUIREMENTS, urgency: :low do
         assign_file_vars!
@@ -208,9 +208,9 @@ module API
       desc 'Get a file from the repository'
       params do
         requires :file_path, type: String, file_path: true,
-                             desc: 'The url encoded path to the file.', documentation: { example: 'lib%2Fclass%2Erb' }
+          desc: 'The url encoded path to the file.', documentation: { example: 'lib%2Fclass%2Erb' }
         requires :ref, type: String,
-                       desc: 'The name of branch, tag or commit', allow_blank: false, documentation: { example: 'main' }
+          desc: 'The name of branch, tag or commit', allow_blank: false, documentation: { example: 'main' }
       end
       get ":id/repository/files/:file_path", requirements: FILE_ENDPOINT_REQUIREMENTS do
         assign_file_vars!
diff --git a/lib/api/go_proxy.rb b/lib/api/go_proxy.rb
index 3933e07d150..fb3d6d005a6 100755
--- a/lib/api/go_proxy.rb
+++ b/lib/api/go_proxy.rb
@@ -68,7 +68,7 @@ module API
       requires :module_name, type: String, desc: 'The name of the Go module', coerce_with: ->(val) { CGI.unescape(val) }
     end
     route_setting :authentication, job_token_allowed: true, basic_auth_personal_access_token: true,
-                                   authenticate_non_public: true
+      authenticate_non_public: true
     resource :projects, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do
       before do
         authorize_read_package!(project)
diff --git a/lib/api/group_container_repositories.rb b/lib/api/group_container_repositories.rb
index 5173a55308d..1b50aff98b7 100644
--- a/lib/api/group_container_repositories.rb
+++ b/lib/api/group_container_repositories.rb
@@ -17,7 +17,7 @@ module API
 
     params do
       requires :id, types: [String, Integer],
-                    desc: 'The ID or URL-encoded path of the group accessible by the authenticated user'
+        desc: 'The ID or URL-encoded path of the group accessible by the authenticated user'
     end
     resource :groups, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do
       desc 'List registry repositories within a group' do
diff --git a/lib/api/group_labels.rb b/lib/api/group_labels.rb
index a8c48a6f4fe..0d45e5a943f 100644
--- a/lib/api/group_labels.rb
+++ b/lib/api/group_labels.rb
@@ -20,24 +20,24 @@ module API
       end
       params do
         optional :with_counts,
-                 type: Boolean,
-                 default: false,
-                 desc: 'Include issue and merge request counts'
+          type: Boolean,
+          default: false,
+          desc: 'Include issue and merge request counts'
         optional :include_ancestor_groups,
-                 type: Boolean,
-                 default: true,
-                 desc: 'Include ancestor groups'
+          type: Boolean,
+          default: true,
+          desc: 'Include ancestor groups'
         optional :include_descendant_groups,
-                 type: Boolean,
-                 default: false,
-                 desc: 'Include descendant groups. This feature was added in GitLab 13.6'
+          type: Boolean,
+          default: false,
+          desc: 'Include descendant groups. This feature was added in GitLab 13.6'
         optional :only_group_labels,
-                 type: Boolean,
-                 default: true,
-                 desc: 'Toggle to include only group labels or also project labels. This feature was added in GitLab 13.6'
+          type: Boolean,
+          default: true,
+          desc: 'Toggle to include only group labels or also project labels. This feature was added in GitLab 13.6'
         optional :search,
-                 type: String,
-                 desc: 'Keyword to filter labels by. This feature was added in GitLab 13.6'
+          type: String,
+          desc: 'Keyword to filter labels by. This feature was added in GitLab 13.6'
         use :pagination
       end
       get ':id/labels' do
@@ -50,17 +50,17 @@ module API
       end
       params do
         optional :include_ancestor_groups,
-                 type: Boolean,
-                 default: true,
-                 desc: 'Include ancestor groups'
+          type: Boolean,
+          default: true,
+          desc: 'Include ancestor groups'
         optional :include_descendant_groups,
-                 type: Boolean,
-                 default: false,
-                 desc: 'Include descendant groups. This feature was added in GitLab 13.6'
+          type: Boolean,
+          default: false,
+          desc: 'Include descendant groups. This feature was added in GitLab 13.6'
         optional :only_group_labels,
-                 type: Boolean,
-                 default: true,
-                 desc: 'Toggle to include only group labels or also project labels. This feature was added in GitLab 13.6'
+          type: Boolean,
+          default: true,
+          desc: 'Toggle to include only group labels or also project labels. This feature was added in GitLab 13.6'
       end
       get ':id/labels/:name' do
         get_label(user_group, Entities::GroupLabel, declared_params)
diff --git a/lib/api/group_packages.rb b/lib/api/group_packages.rb
index b363f59b7ad..93096b08f8e 100644
--- a/lib/api/group_packages.rb
+++ b/lib/api/group_packages.rb
@@ -31,32 +31,32 @@ module API
       params do
         use :pagination
         optional :order_by,
-                 type: String,
-                 values: %w[created_at name version type project_path],
-                 default: 'created_at',
-                 desc: 'Return packages ordered by `created_at`, `name`, `version` or `type` fields.'
+          type: String,
+          values: %w[created_at name version type project_path],
+          default: 'created_at',
+          desc: 'Return packages ordered by `created_at`, `name`, `version` or `type` fields.'
         optional :sort,
-                 type: String,
-                 values: %w[asc desc],
-                 default: 'asc',
-                 desc: 'Return packages sorted in `asc` or `desc` order.'
+          type: String,
+          values: %w[asc desc],
+          default: 'asc',
+          desc: 'Return packages sorted in `asc` or `desc` order.'
         optional :package_type,
-                 type: String,
-                 values: Packages::Package.package_types.keys,
-                 desc: 'Return packages of a certain type'
+          type: String,
+          values: Packages::Package.package_types.keys,
+          desc: 'Return packages of a certain type'
         optional :package_name,
-                 type: String,
-                 desc: 'Return packages with this name'
+          type: String,
+          desc: 'Return packages with this name'
         optional :package_version,
-                type: String,
-                desc: 'Return packages with this version'
+          type: String,
+          desc: 'Return packages with this version'
         optional :include_versionless,
-                 type: Boolean,
-                 desc: 'Returns packages without a version'
+          type: Boolean,
+          desc: 'Returns packages without a version'
         optional :status,
-                 type: String,
-                 values: Packages::Package.statuses.keys,
-                 desc: 'Return packages with specified status'
+          type: String,
+          values: Packages::Package.statuses.keys,
+          desc: 'Return packages with specified status'
       end
       get ':id/packages' do
         packages = Packages::GroupPackagesFinder.new(
@@ -69,7 +69,7 @@ module API
         ).execute
 
         present paginate(packages), with: ::API::Entities::Package, user: current_user, group: true,
-                                    namespace: user_group
+          namespace: user_group
       end
     end
   end
diff --git a/lib/api/groups.rb b/lib/api/groups.rb
index ef97e29a1cc..163a04b7044 100644
--- a/lib/api/groups.rb
+++ b/lib/api/groups.rb
@@ -21,7 +21,7 @@ module API
         optional :skip_groups, type: Array[Integer], coerce_with: ::API::Validations::Types::CommaSeparatedToIntegerArray.coerce, desc: 'Array of group ids to exclude from list'
         optional :all_available, type: Boolean, desc: 'Show all group that you have access to'
         optional :visibility, type: String, values: Gitlab::VisibilityLevel.string_values,
-                              desc: 'Limit by visibility'
+          desc: 'Limit by visibility'
         optional :search, type: String, desc: 'Search for a specific group'
         optional :owned, type: Boolean, default: false, desc: 'Limit by owned by authenticated user'
         optional :order_by, type: String, values: %w[name path id similarity], default: 'name', desc: 'Order by name, path, id or similarity if searching'
@@ -333,14 +333,14 @@ module API
       params do
         optional :archived, type: Boolean, desc: 'Limit by archived status'
         optional :visibility, type: String, values: Gitlab::VisibilityLevel.string_values,
-                              desc: 'Limit by visibility'
+          desc: 'Limit by visibility'
         optional :search, type: String, desc: 'Return list of authorized projects matching the search criteria'
         optional :order_by, type: String, values: %w[id name path created_at updated_at last_activity_at similarity star_count],
-                            default: 'created_at', desc: 'Return projects ordered by field'
+          default: 'created_at', desc: 'Return projects ordered by field'
         optional :sort, type: String, values: %w[asc desc], default: 'desc',
-                        desc: 'Return projects sorted in ascending and descending order'
+          desc: 'Return projects sorted in ascending and descending order'
         optional :simple, type: Boolean, default: false,
-                          desc: 'Return only the ID, URL, name, and path of each project'
+          desc: 'Return only the ID, URL, name, and path of each project'
         optional :owned, type: Boolean, default: false, desc: 'Limit by owned by authenticated user'
         optional :starred, type: Boolean, default: false, desc: 'Limit by starred status'
         optional :with_issues_enabled, type: Boolean, default: false, desc: 'Limit by enabled issues feature'
@@ -375,14 +375,14 @@ module API
       params do
         optional :archived, type: Boolean, desc: 'Limit by archived status'
         optional :visibility, type: String, values: Gitlab::VisibilityLevel.string_values,
-                              desc: 'Limit by visibility'
+          desc: 'Limit by visibility'
         optional :search, type: String, desc: 'Return list of authorized projects matching the search criteria'
         optional :order_by, type: String, values: %w[id name path created_at updated_at last_activity_at star_count],
-                            default: 'created_at', desc: 'Return projects ordered by field'
+          default: 'created_at', desc: 'Return projects ordered by field'
         optional :sort, type: String, values: %w[asc desc], default: 'desc',
-                        desc: 'Return projects sorted in ascending and descending order'
+          desc: 'Return projects sorted in ascending and descending order'
         optional :simple, type: Boolean, default: false,
-                          desc: 'Return only the ID, URL, name, and path of each project'
+          desc: 'Return only the ID, URL, name, and path of each project'
         optional :starred, type: Boolean, default: false, desc: 'Limit by starred status'
         optional :with_issues_enabled, type: Boolean, default: false, desc: 'Limit by enabled issues feature'
         optional :with_merge_requests_enabled, type: Boolean, default: false, desc: 'Limit by enabled merge requests feature'
@@ -471,9 +471,9 @@ module API
       end
       params do
         optional :group_id,
-                 type: Integer,
-                 desc: 'The ID of the target group to which the group needs to be transferred to.'\
-                       'If not provided, the source group will be promoted to a root group.'
+          type: Integer,
+          desc: 'The ID of the target group to which the group needs to be transferred to.'\
+                'If not provided, the source group will be promoted to a root group.'
       end
       post ':id/transfer', feature_category: :groups_and_projects do
         group = find_group!(params[:id])
diff --git a/lib/api/helm_packages.rb b/lib/api/helm_packages.rb
index b6bd3eb314e..932f3affa79 100644
--- a/lib/api/helm_packages.rb
+++ b/lib/api/helm_packages.rb
@@ -57,7 +57,7 @@ module API
 
           env['api.format'] = :yaml
           present ::Packages::Helm::IndexPresenter.new(params[:id], params[:channel], packages),
-                      with: ::API::Entities::Helm::Index
+            with: ::API::Entities::Helm::Index
         end
 
         desc 'Download a chart' do
@@ -140,7 +140,7 @@ module API
           ).execute
 
           track_package_event('push_package', :helm, project: authorized_user_project, namespace: authorized_user_project.namespace,
-                                                     property: 'i_package_helm_user')
+            property: 'i_package_helm_user')
 
           ::Packages::Helm::ExtractionWorker.perform_async(params[:channel], chart_package_file.id) # rubocop:disable CodeReuse/Worker
 
diff --git a/qa/qa/specs/features/browser_ui/14_analytics/performance_bar_spec.rb b/qa/qa/specs/features/browser_ui/14_analytics/performance_bar_spec.rb
index 7f430a9ab71..6989b54edcf 100644
--- a/qa/qa/specs/features/browser_ui/14_analytics/performance_bar_spec.rb
+++ b/qa/qa/specs/features/browser_ui/14_analytics/performance_bar_spec.rb
@@ -22,6 +22,10 @@ module QA
 
         it(
           'shows results for the original request and AJAX requests', :blocking,
+          quarantine: {
+            issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/460351',
+            type: :investigating
+          },
           testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348030'
         ) do
           # Issue pages always make AJAX requests
diff --git a/spec/frontend/content_editor/components/toolbar_table_button_spec.js b/spec/frontend/content_editor/components/toolbar_table_button_spec.js
index be6e47e067f..fdf46c1dff9 100644
--- a/spec/frontend/content_editor/components/toolbar_table_button_spec.js
+++ b/spec/frontend/content_editor/components/toolbar_table_button_spec.js
@@ -22,6 +22,7 @@ describe('content_editor/components/toolbar_table_button', () => {
   const findDropdown = () => wrapper.findComponent(GlDisclosureDropdown);
   const findButton = (row, col) => wrapper.findComponent({ ref: `table-${row}-${col}` });
   const getNumButtons = () => findDropdown().findAllComponents(GlButton).length;
+  const triggerMouseover = (row, rol) => findButton(row, rol).trigger('mouseover');
 
   beforeEach(() => {
     editor = createTestEditor();
@@ -57,16 +58,14 @@ describe('content_editor/components/toolbar_table_button', () => {
       ${'focus'}     | ${(button) => button.element.dispatchEvent(new FocusEvent('focus'))}
     `('on $event', ({ triggerEvent }) => {
       beforeEach(async () => {
-        const button = wrapper.findComponent({ ref: `table-${row}-${col}` });
+        const button = findButton(row, col);
         await triggerEvent(button);
       });
 
       it('marks all rows and cols before it as active', () => {
         const prevRow = Math.max(1, row - 1);
         const prevCol = Math.max(1, col - 1);
-        expect(wrapper.findComponent({ ref: `table-${prevRow}-${prevCol}` }).element).toHaveClass(
-          'active',
-        );
+        expect(findButton(prevRow, prevCol).element).toHaveClass('active');
       });
 
       it('shows a help text indicating the size of the table being inserted', () => {
@@ -84,7 +83,7 @@ describe('content_editor/components/toolbar_table_button', () => {
       beforeEach(async () => {
         commands = mockChainedCommands(editor, ['focus', 'insertTable', 'run']);
 
-        const button = wrapper.findComponent({ ref: `table-${row}-${col}` });
+        const button = findButton(row, col);
         await button.trigger('mouseover');
         await button.trigger('click');
       });
@@ -103,6 +102,40 @@ describe('content_editor/components/toolbar_table_button', () => {
     });
   });
 
+  it('does not reduce the size of the grid when focusing on a smaller table', async () => {
+    await triggerMouseover(5, 5);
+    expect(getNumButtons()).toBe(6 * 6);
+
+    await triggerMouseover(6, 6);
+    expect(getNumButtons()).toBe(7 * 7);
+
+    await triggerMouseover(7, 7);
+    expect(getNumButtons()).toBe(8 * 8);
+
+    await triggerMouseover(8, 8);
+    expect(getNumButtons()).toBe(9 * 9);
+
+    await triggerMouseover(9, 9);
+    expect(getNumButtons()).toBe(10 * 10);
+
+    await triggerMouseover(5, 5);
+    expect(getNumButtons()).toBe(10 * 10);
+
+    await triggerMouseover(4, 4);
+    expect(getNumButtons()).toBe(10 * 10);
+  });
+
+  it('resets the grid when closing the dropdown', async () => {
+    await triggerMouseover(5, 5);
+    await triggerMouseover(6, 6);
+    await triggerMouseover(7, 7);
+    await triggerMouseover(8, 8);
+    expect(getNumButtons()).toBe(9 * 9);
+
+    await findDropdown().vm.$emit('hidden');
+    expect(getNumButtons()).toBe(5 * 5);
+  });
+
   it('does not create more buttons than a 10x10 grid', async () => {
     for (let i = 5; i < 10; i += 1) {
       expect(getNumButtons()).toBe(i * i);
@@ -112,7 +145,7 @@ describe('content_editor/components/toolbar_table_button', () => {
       expect(findDropdown().element).toHaveText(`Insert a ${i}×${i} table`);
     }
 
-    expect(getNumButtons()).toBe(100); // 10x10 (and not 11x11)
+    expect(getNumButtons()).toBe(10 * 10); // 10x10 (and not 11x11)
   });
 
   describe('a11y tests', () => {
@@ -125,7 +158,7 @@ describe('content_editor/components/toolbar_table_button', () => {
     });
 
     it('renders a role=grid of 5x5 gridcells to create a table', () => {
-      expect(getNumButtons()).toBe(25); // 5x5
+      expect(getNumButtons()).toBe(5 * 5);
       expect(wrapper.find('[role="grid"]').exists()).toBe(true);
       wrapper.findAll('[role="row"]').wrappers.forEach((row) => {
         expect(row.findAll('[role="gridcell"]')).toHaveLength(5);
diff --git a/spec/frontend/pages/shared/wikis/components/wiki_form_spec.js b/spec/frontend/pages/shared/wikis/components/wiki_form_spec.js
index 4c73eeebb94..d824dfab1ba 100644
--- a/spec/frontend/pages/shared/wikis/components/wiki_form_spec.js
+++ b/spec/frontend/pages/shared/wikis/components/wiki_form_spec.js
@@ -369,9 +369,8 @@ describe('WikiForm', () => {
       title          | content        | buttonState   | disabledAttr
       ${'something'} | ${'something'} | ${'enabled'}  | ${false}
       ${''}          | ${'something'} | ${'disabled'} | ${true}
-      ${'something'} | ${''}          | ${'disabled'} | ${true}
+      ${'something'} | ${''}          | ${'disabled'} | ${false}
       ${''}          | ${''}          | ${'disabled'} | ${true}
-      ${'   '}       | ${'   '}       | ${'disabled'} | ${true}
     `(
       "when title='$title', content='$content', then the button is $buttonState'",
       async ({ title, content, disabledAttr }) => {
diff --git a/spec/frontend/pages/shared/wikis/components/wiki_more_dropdown_spec.js b/spec/frontend/pages/shared/wikis/components/wiki_more_dropdown_spec.js
index 0b580c2a927..3246cb4e661 100644
--- a/spec/frontend/pages/shared/wikis/components/wiki_more_dropdown_spec.js
+++ b/spec/frontend/pages/shared/wikis/components/wiki_more_dropdown_spec.js
@@ -2,6 +2,7 @@ import { GlDisclosureDropdown, GlDisclosureDropdownItem } from '@gitlab/ui';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
 import WikiMoreDropdown from '~/pages/shared/wikis/components/wiki_more_dropdown.vue';
+import DeleteWikiModal from '~/pages/shared/wikis/components/delete_wiki_modal.vue';
 import printMarkdownDom from '~/lib/print_markdown_dom';
 import { mockLocation, restoreLocation } from '../test_utils';
 
@@ -22,11 +23,16 @@ describe('pages/shared/wikis/components/wiki_more_dropdown', () => {
           title: 'test title',
           stylesheet: [],
         },
+        pagePersisted: true,
+        pageTitle: 'Wiki title',
+        csrfToken: '',
+        deleteWikiUrl: 'https://delete.url/path',
         ...provide,
       },
       stubs: {
         GlDisclosureDropdown,
         GlDisclosureDropdownItem,
+        DeleteWikiModal,
       },
     });
   };
@@ -35,6 +41,7 @@ describe('pages/shared/wikis/components/wiki_more_dropdown', () => {
   const findMoreDropdownTooltip = () => getBinding(findMoreDropdown().element, 'gl-tooltip');
   const findHistoryItem = () => wrapper.findByTestId('page-history-button');
   const findPrintItem = () => wrapper.findByTestId('page-print-button');
+  const findDeleteItem = () => wrapper.findByTestId('page-delete-button');
 
   describe('history', () => {
     it('shows label "Page history"', () => {
@@ -104,6 +111,24 @@ describe('pages/shared/wikis/components/wiki_more_dropdown', () => {
     });
   });
 
+  describe('delete', () => {
+    it('shows label "Delete page"', () => {
+      createComponent();
+
+      expect(findDeleteItem().text()).toBe('Delete page');
+    });
+
+    it('renders only if `pagePersisted` is set', () => {
+      createComponent({ pagePersisted: false });
+
+      expect(findDeleteItem().exists()).toBe(false);
+
+      createComponent();
+
+      expect(findDeleteItem().exists()).toBe(true);
+    });
+  });
+
   describe('More actions menu', () => {
     createComponent();
 
diff --git a/spec/services/work_items/parent_links/create_service_spec.rb b/spec/services/work_items/parent_links/create_service_spec.rb
index 1ff48f4e269..4a88a17b276 100644
--- a/spec/services/work_items/parent_links/create_service_spec.rb
+++ b/spec/services/work_items/parent_links/create_service_spec.rb
@@ -105,6 +105,12 @@ RSpec.describe WorkItems::ParentLinks::CreateService, feature_category: :portfol
     context 'when there are tasks to relate' do
       let(:params) { { issuable_references: [task1, task2] } }
 
+      it_behaves_like 'update service that triggers GraphQL work_item_updated subscription' do
+        let(:trigger_call_counter) { 2 }
+
+        subject(:execute_service) { described_class.new(work_item, user, params).execute }
+      end
+
       it 'creates relationships', :aggregate_failures do
         expect { subject }.to change(parent_link_class, :count).by(2)
 
@@ -170,6 +176,10 @@ RSpec.describe WorkItems::ParentLinks::CreateService, feature_category: :portfol
       context 'when task is already assigned' do
         let(:params) { { issuable_references: [task, task2] } }
 
+        it_behaves_like 'update service that triggers GraphQL work_item_updated subscription' do
+          subject(:execute_service) { described_class.new(work_item, user, params).execute }
+        end
+
         it 'creates links only for non related tasks', :aggregate_failures do
           expect { subject }
             .to change(parent_link_class, :count).by(1)
diff --git a/spec/services/work_items/parent_links/destroy_service_spec.rb b/spec/services/work_items/parent_links/destroy_service_spec.rb
index 7e2e3949b73..ca48c29524b 100644
--- a/spec/services/work_items/parent_links/destroy_service_spec.rb
+++ b/spec/services/work_items/parent_links/destroy_service_spec.rb
@@ -23,6 +23,10 @@ RSpec.describe WorkItems::ParentLinks::DestroyService, feature_category: :team_p
     context 'when user has permissions to update work items' do
       let(:user) { reporter }
 
+      it_behaves_like 'update service that triggers GraphQL work_item_updated subscription' do
+        subject(:execute_service) { described_class.new(parent_link, user).execute }
+      end
+
       it 'removes relation and creates notes', :aggregate_failures do
         expect { subject }
           .to change(parent_link_class, :count).by(-1)
diff --git a/spec/services/work_items/update_service_spec.rb b/spec/services/work_items/update_service_spec.rb
index 6e3970076db..b2e115fb66e 100644
--- a/spec/services/work_items/update_service_spec.rb
+++ b/spec/services/work_items/update_service_spec.rb
@@ -428,6 +428,8 @@ RSpec.describe WorkItems::UpdateService, feature_category: :team_planning do
         end
 
         it_behaves_like 'update service that triggers GraphQL work_item_updated subscription' do
+          let(:trigger_call_counter) { 2 }
+
           subject(:execute_service) { update_work_item }
         end
 
diff --git a/spec/support/shared_examples/features/wiki/user_creates_wiki_page_shared_examples.rb b/spec/support/shared_examples/features/wiki/user_creates_wiki_page_shared_examples.rb
index 38fb9a0b62e..9324be031f1 100644
--- a/spec/support/shared_examples/features/wiki/user_creates_wiki_page_shared_examples.rb
+++ b/spec/support/shared_examples/features/wiki/user_creates_wiki_page_shared_examples.rb
@@ -24,9 +24,16 @@ RSpec.shared_examples 'User creates wiki page' do
       end
     end
 
-    it "disables the submit button", :js do
+    it "does not disable the submit button", :js do
       page.within(".wiki-form") do
         fill_in(:wiki_content, with: "")
+        expect(page).to have_button('Create page', disabled: false)
+      end
+    end
+
+    it "disables the submit button", :js do
+      page.within(".wiki-form") do
+        fill_in(:wiki_title, with: "")
         expect(page).to have_button('Create page', disabled: true)
       end
     end
diff --git a/spec/support/shared_examples/features/wiki/user_updates_wiki_page_shared_examples.rb b/spec/support/shared_examples/features/wiki/user_updates_wiki_page_shared_examples.rb
index c8d5d548db8..7fff7e836da 100644
--- a/spec/support/shared_examples/features/wiki/user_updates_wiki_page_shared_examples.rb
+++ b/spec/support/shared_examples/features/wiki/user_updates_wiki_page_shared_examples.rb
@@ -144,9 +144,16 @@ RSpec.shared_examples 'User updates wiki page' do
       expect(page).to have_field('wiki[message]', with: 'Update Wiki title')
     end
 
-    it "disables the submit button", :js do
+    it "does not disable the submit button", :js do
       page.within(".wiki-form") do
         fill_in(:wiki_content, with: "")
+        expect(page).to have_button('Save changes', disabled: false)
+      end
+    end
+
+    it "disables the submit button", :js do
+      page.within(".wiki-form") do
+        fill_in(:wiki_title, with: "")
         expect(page).to have_button('Save changes', disabled: true)
       end
     end
diff --git a/spec/support/shared_examples/features/wiki/user_views_wiki_empty_shared_examples.rb b/spec/support/shared_examples/features/wiki/user_views_wiki_empty_shared_examples.rb
index b6c0a43dcf6..f3fb1b9229d 100644
--- a/spec/support/shared_examples/features/wiki/user_views_wiki_empty_shared_examples.rb
+++ b/spec/support/shared_examples/features/wiki/user_views_wiki_empty_shared_examples.rb
@@ -53,7 +53,7 @@ RSpec.shared_examples 'User views empty wiki' do
       if writable
         element.click_link 'Create your first page'
 
-        expect(page).to have_button('Create page', disabled: true)
+        expect(page).to have_button('Create page')
       else
         expect(element).not_to have_link('Create your first page')
       end
diff --git a/spec/support/shared_examples/work_items/update_service_shared_examples.rb b/spec/support/shared_examples/work_items/update_service_shared_examples.rb
index 2d220c0ef58..62dbce22975 100644
--- a/spec/support/shared_examples/work_items/update_service_shared_examples.rb
+++ b/spec/support/shared_examples/work_items/update_service_shared_examples.rb
@@ -9,8 +9,14 @@ RSpec.shared_examples 'update service that triggers GraphQL work_item_updated su
     end
   end
 
+  let(:trigger_call_counter) { 1 }
+
   it 'triggers graphql subscription workItemUpdated' do
-    expect(GraphqlTriggers).to receive(:work_item_updated).with(update_subject).and_call_original
+    expect(GraphqlTriggers)
+      .to receive(:work_item_updated)
+      .with(update_subject)
+      .exactly(trigger_call_counter).times
+      .and_call_original
 
     execute_service
   end