Add latest changes from gitlab-org/gitlab@master

21 files changed, 93 insertions, 68 deletions

diff --git a/app/assets/javascripts/ci/job_details/components/sidebar/stages_dropdown.vue b/app/assets/javascripts/ci/job_details/components/sidebar/stages_dropdown.vue
index 6c87bff6c5f..7744395734f 100644
--- a/app/assets/javascripts/ci/job_details/components/sidebar/stages_dropdown.vue
+++ b/app/assets/javascripts/ci/job_details/components/sidebar/stages_dropdown.vue
@@ -110,7 +110,7 @@ export default {
         <template #status>
           <ci-badge-link
             :status="pipeline.details.status"
-            badge-size="sm"
+            size="sm"
             data-testid="pipeline-status-link"
           />
         </template>
diff --git a/app/assets/javascripts/ci/reports/components/issue_status_icon.vue b/app/assets/javascripts/ci/reports/components/issue_status_icon.vue
index 56010a5f588..f2346a5512e 100644
--- a/app/assets/javascripts/ci/reports/components/issue_status_icon.vue
+++ b/app/assets/javascripts/ci/reports/components/issue_status_icon.vue
@@ -50,6 +50,6 @@ export default {
     }"
     class="report-block-list-icon"
   >
-    <gl-icon :name="iconName" :size="statusIconSize" :data-qa-selector="`status_${status}_icon`" />
+    <gl-icon :name="iconName" :size="statusIconSize" />
   </div>
 </template>
diff --git a/app/assets/javascripts/repository/components/last_commit.vue b/app/assets/javascripts/repository/components/last_commit.vue
index e03bec1c922..12edeeb0d2f 100644
--- a/app/assets/javascripts/repository/components/last_commit.vue
+++ b/app/assets/javascripts/repository/components/last_commit.vue
@@ -195,7 +195,7 @@ export default {
               :status="commit.pipeline.detailedStatus"
               :details-path="commit.pipeline.detailedStatus.detailsPath"
               :aria-label="statusTitle"
-              badge-size="lg"
+              size="lg"
               :show-text="false"
               class="js-commit-pipeline"
             />
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/extensions/base.vue b/app/assets/javascripts/vue_merge_request_widget/components/extensions/base.vue
index 51f519f6f0c..3e2f3ab4103 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/extensions/base.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/extensions/base.vue
@@ -305,11 +305,7 @@ export default {
 </script>
 
 <template>
-  <section
-    class="media-section"
-    data-testid="widget-extension"
-    data-qa-selector="mr_widget_extension"
-  >
+  <section class="media-section" data-testid="widget-extension">
     <state-container
       :status="statusIconName"
       :is-loading="isLoadingSummary"
@@ -359,7 +355,6 @@ export default {
             :icon="isCollapsed ? 'chevron-lg-down' : 'chevron-lg-up'"
             category="tertiary"
             data-testid="toggle-button"
-            data-qa-selector="toggle_button"
             size="small"
             @click="toggleCollapsed"
           />
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/extensions/child_content.vue b/app/assets/javascripts/vue_merge_request_widget/components/extensions/child_content.vue
index 5cd9179ef72..5f0fd973e84 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/extensions/child_content.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/extensions/child_content.vue
@@ -127,7 +127,6 @@ export default {
             :modal-id="modalId"
             :level="3"
             data-testid="child-content"
-            data-qa-selector="child_content"
             @clickedAction="onClickedAction"
           />
         </li>
diff --git a/app/assets/javascripts/vue_shared/components/ci_badge_link.vue b/app/assets/javascripts/vue_shared/components/ci_badge_link.vue
index d25f40b1af9..1f45b4c5c9d 100644
--- a/app/assets/javascripts/vue_shared/components/ci_badge_link.vue
+++ b/app/assets/javascripts/vue_shared/components/ci_badge_link.vue
@@ -1,6 +1,7 @@
 <script>
 import { GlBadge, GlTooltipDirective } from '@gitlab/ui';
 import CiIcon from './ci_icon.vue';
+
 /**
  * Renders CI Badge link with CI icon and status text based on
  * API response shared between all places where it is used.
@@ -48,7 +49,7 @@ export default {
       required: false,
       default: true,
     },
-    badgeSize: {
+    size: {
       type: String,
       required: false,
       default: badgeSizeOptions.md,
@@ -59,7 +60,7 @@ export default {
   },
   computed: {
     isSmallBadgeSize() {
-      return this.badgeSize === badgeSizeOptions.sm;
+      return this.size === badgeSizeOptions.sm;
     },
     title() {
       return !this.showText ? this.status?.text : '';
@@ -123,7 +124,7 @@ export default {
     :class="{ 'gl-pl-2': isSmallBadgeSize }"
     :title="title"
     :href="detailsPath"
-    :size="badgeSize"
+    :size="size"
     :variant="badgeStyles.variant"
     data-testid="ci-badge-link"
     @click="$emit('ciStatusBadgeClick')"
diff --git a/app/assets/javascripts/work_items/components/work_item_actions.vue b/app/assets/javascripts/work_items/components/work_item_actions.vue
index f4fd69dba1d..18aa4d55086 100644
--- a/app/assets/javascripts/work_items/components/work_item_actions.vue
+++ b/app/assets/javascripts/work_items/components/work_item_actions.vue
@@ -2,7 +2,6 @@
 import {
   GlDisclosureDropdown,
   GlDisclosureDropdownItem,
-  GlDropdownForm,
   GlDropdownDivider,
   GlModal,
   GlModalDirective,
@@ -55,7 +54,6 @@ export default {
   components: {
     GlDisclosureDropdown,
     GlDisclosureDropdownItem,
-    GlDropdownForm,
     GlDropdownDivider,
     GlModal,
     GlToggle,
@@ -180,13 +178,16 @@ export default {
         navigator.clipboard.writeText(text);
       }
       toast(message);
+      this.closeDropdown();
     },
     handleToggleWorkItemConfidentiality() {
       this.track('click_toggle_work_item_confidentiality');
       this.$emit('toggleWorkItemConfidentiality', !this.isConfidential);
+      this.closeDropdown();
     },
     handleDelete() {
       this.$refs.modal.show();
+      this.closeDropdown();
     },
     handleDeleteWorkItem() {
       this.track('click_delete_work_item');
@@ -275,6 +276,9 @@ export default {
     throwConvertError() {
       this.$emit('error', this.i18n.convertError);
     },
+    closeDropdown() {
+      this.$refs.workItemsMoreActions.close();
+    },
     async promoteToObjective() {
       try {
         const {
@@ -300,6 +304,8 @@ export default {
       } catch (error) {
         this.throwConvertError();
         Sentry.captureException(error);
+      } finally {
+        this.closeDropdown();
       }
     },
   },
@@ -309,32 +315,36 @@ export default {
 <template>
   <div>
     <gl-disclosure-dropdown
+      ref="workItemsMoreActions"
       icon="ellipsis_v"
       data-testid="work-item-actions-dropdown"
       text-sr-only
       :text="__('More actions')"
       category="tertiary"
+      :auto-close="false"
       no-caret
       right
     >
       <template v-if="$options.isLoggedIn">
-        <gl-dropdown-form
-          class="work-item-notifications-form"
+        <gl-disclosure-dropdown-item
+          class="gl-display-flex gl-justify-content-end gl-w-full"
           :data-testid="$options.notificationsToggleFormTestId"
         >
-          <div class="gl-px-4 gl-pb-2 gl-pt-2">
+          <template #list-item>
             <gl-toggle
               :value="subscribedToNotifications"
               :label="$options.i18n.notifications"
               :data-testid="$options.notificationsToggleTestId"
+              class="work-item-notification-toggle"
               label-position="left"
               label-id="notifications-toggle"
               @change="toggleNotifications($event)"
             />
-          </div>
-        </gl-dropdown-form>
+          </template>
+        </gl-disclosure-dropdown-item>
         <gl-dropdown-divider />
       </template>
+
       <gl-disclosure-dropdown-item
         v-if="canPromoteToObjective"
         :data-testid="$options.promoteActionTestId"
diff --git a/app/assets/stylesheets/page_bundles/work_items.scss b/app/assets/stylesheets/page_bundles/work_items.scss
index e8fa93e1504..f36cbc129a7 100644
--- a/app/assets/stylesheets/page_bundles/work_items.scss
+++ b/app/assets/stylesheets/page_bundles/work_items.scss
@@ -173,3 +173,13 @@ $work-item-sticky-header-height: 52px;
     min-width: 100%;
   }
 }
+
+.work-item-notification-toggle {
+  .gl-toggle {
+    margin-left: auto;
+  }
+
+  .gl-toggle-label {
+    font-weight: normal;
+  }
+}
diff --git a/doc/administration/audit_event_streaming/audit_event_types.md b/doc/administration/audit_event_streaming/audit_event_types.md
index 01523e17354..86369a6001a 100644
--- a/doc/administration/audit_event_streaming/audit_event_types.md
+++ b/doc/administration/audit_event_streaming/audit_event_types.md
@@ -14,16 +14,19 @@ info: "See the Technical Writers assigned to Development Guidelines: https://abo
   edit `tooling/audit_events/docs/templates/audit_event_types.md.erb`.
 --->
 
-# Audit event types **(ULTIMATE ALL)**
+# Audit event types **(PREMIUM ALL)**
 
 Audit event types are used to [filter streamed audit events](index.md#update-event-filters).
 
-Every audit event is associated with an event type. The association with the event type can mean that an audit event is:
+Every audit event is associated with an event type. Audit event types can allow audit events to be:
 
-- Saved to database. Audit events associated with these types are retrievable by using the audit events dashboard or the [audit events API](../../api/audit_events.md).
-- Streamed. Audit events associated with these types are [streamed to external destinations](../index.md) if a
-  destination is set.
-- Not streamed. Audit events associated with these types are not streamed to external destinations even if a destination is set.
+- Saved to the database. Available in the Premium and Ultimate tier. You can retrieve audit events associated with these
+  types by using the audit events dashboard or the [audit events API](../../api/audit_events.md).
+- Streamed to external destinations. Available in the Ultimate tier. You can stream audit events associated with these
+  types [to external destinations](../index.md) if a destination is set.
+
+Some audit event types don't allow saving audit events to the database. Other audit event types don't allow streaming
+audit events to external destinations.
 
 ## Available audit event types
 
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 17033349edf..0f6916b35ac 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -18262,6 +18262,7 @@ Returns [`VulnerabilitySeveritiesCount`](#vulnerabilityseveritiescount).
 | Name | Type | Description |
 | ---- | ---- | ----------- |
 | <a id="groupvulnerabilityseveritiescountclusteragentid"></a>`clusterAgentId` | [`[ClustersAgentID!]`](#clustersagentid) | Filter vulnerabilities by `cluster_agent_id`. Vulnerabilities with a `reportType` of `cluster_image_scanning` are only included with this filter. |
+| <a id="groupvulnerabilityseveritiescountdismissalreason"></a>`dismissalReason` | [`[VulnerabilityDismissalReason!]`](#vulnerabilitydismissalreason) | Filter by dismissal reason. |
 | <a id="groupvulnerabilityseveritiescounthasissues"></a>`hasIssues` | [`Boolean`](#boolean) | Filter vulnerabilities that do or do not have issues. |
 | <a id="groupvulnerabilityseveritiescounthasresolution"></a>`hasResolution` | [`Boolean`](#boolean) | Filter vulnerabilities that do or do not have a resolution. |
 | <a id="groupvulnerabilityseveritiescountimage"></a>`image` | [`[String!]`](#string) | Filter vulnerabilities by location image. When this filter is present, the response only matches entries for a `reportType` that includes `container_scanning`, `cluster_image_scanning`. |
@@ -18757,6 +18758,7 @@ Returns [`VulnerabilitySeveritiesCount`](#vulnerabilityseveritiescount).
 | Name | Type | Description |
 | ---- | ---- | ----------- |
 | <a id="instancesecuritydashboardvulnerabilityseveritiescountclusteragentid"></a>`clusterAgentId` | [`[ClustersAgentID!]`](#clustersagentid) | Filter vulnerabilities by `cluster_agent_id`. Vulnerabilities with a `reportType` of `cluster_image_scanning` are only included with this filter. |
+| <a id="instancesecuritydashboardvulnerabilityseveritiescountdismissalreason"></a>`dismissalReason` | [`[VulnerabilityDismissalReason!]`](#vulnerabilitydismissalreason) | Filter by dismissal reason. |
 | <a id="instancesecuritydashboardvulnerabilityseveritiescounthasissues"></a>`hasIssues` | [`Boolean`](#boolean) | Filter vulnerabilities that do or do not have issues. |
 | <a id="instancesecuritydashboardvulnerabilityseveritiescounthasresolution"></a>`hasResolution` | [`Boolean`](#boolean) | Filter vulnerabilities that do or do not have a resolution. |
 | <a id="instancesecuritydashboardvulnerabilityseveritiescountimage"></a>`image` | [`[String!]`](#string) | Filter vulnerabilities by location image. When this filter is present, the response only matches entries for a `reportType` that includes `container_scanning`, `cluster_image_scanning`. |
@@ -23202,6 +23204,7 @@ Returns [`VulnerabilitySeveritiesCount`](#vulnerabilityseveritiescount).
 | Name | Type | Description |
 | ---- | ---- | ----------- |
 | <a id="projectvulnerabilityseveritiescountclusteragentid"></a>`clusterAgentId` | [`[ClustersAgentID!]`](#clustersagentid) | Filter vulnerabilities by `cluster_agent_id`. Vulnerabilities with a `reportType` of `cluster_image_scanning` are only included with this filter. |
+| <a id="projectvulnerabilityseveritiescountdismissalreason"></a>`dismissalReason` | [`[VulnerabilityDismissalReason!]`](#vulnerabilitydismissalreason) | Filter by dismissal reason. |
 | <a id="projectvulnerabilityseveritiescounthasissues"></a>`hasIssues` | [`Boolean`](#boolean) | Filter vulnerabilities that do or do not have issues. |
 | <a id="projectvulnerabilityseveritiescounthasresolution"></a>`hasResolution` | [`Boolean`](#boolean) | Filter vulnerabilities that do or do not have a resolution. |
 | <a id="projectvulnerabilityseveritiescountimage"></a>`image` | [`[String!]`](#string) | Filter vulnerabilities by location image. When this filter is present, the response only matches entries for a `reportType` that includes `container_scanning`, `cluster_image_scanning`. |
diff --git a/doc/api/index.md b/doc/api/index.md
index 974aa18a933..8837c8a6016 100644
--- a/doc/api/index.md
+++ b/doc/api/index.md
@@ -6,13 +6,12 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Develop with GitLab **(FREE ALL)**
 
-Automate and interact with GitLab, and integrate with external applications.
+Automate with GitLab and integrate with external applications.
 
 - [Integrations](../integration/index.md)
 - [Webhooks](../user/project/integrations/webhooks.md)
 - [REST API](rest/index.md)
 - [GraphQL API](graphql/index.md)
 - [OAuth 2.0 identity provider API](oauth2.md)
-- [GitLab CLI (glab)](../integration/glab/index.md)
-- [Visual Studio Code extension](../user/project/repository/vscode.md)
+- [Editor and IDE extensions](../editor_extensions/index.md)
 - [Code Suggestions](../user/project/repository/code_suggestions/index.md)
diff --git a/doc/architecture/blueprints/gitlab_steps/index.md b/doc/architecture/blueprints/gitlab_steps/index.md
index c3012bb787b..dae93e3365b 100644
--- a/doc/architecture/blueprints/gitlab_steps/index.md
+++ b/doc/architecture/blueprints/gitlab_steps/index.md
@@ -3,7 +3,7 @@ status: proposed
 creation-date: "2023-08-23"
 authors: [ "@ayufan" ]
 coach: "@grzegorz"
-approvers: [ "@dhershkovitch", "@gabrielengel_gl" ]
+approvers: [ "@dhershkovitch", "@gabrielengel_gl", "@marknuzzo", "@nicolewilliams" ]
 owning-stage: "~devops::verify"
 participating-stages: [ ]
 ---
diff --git a/doc/development/documentation/site_architecture/deployment_process.md b/doc/development/documentation/site_architecture/deployment_process.md
index 2ba69ca0987..767fdf907d6 100644
--- a/doc/development/documentation/site_architecture/deployment_process.md
+++ b/doc/development/documentation/site_architecture/deployment_process.md
@@ -66,12 +66,12 @@ graph TD
   C["14.2 MR merged"]
   D["13.12 MR merged"]
   E["12.10 MR merged"]
-  F{{"Container registry on `gitlab-docs` project"}}
-  A--"`image:docs-single`<br>job runs and pushes<br>`gitlab-docs:14.4` image"-->F
-  B--"`image:docs-single`<br>job runs and pushes<br>`gitlab-docs:14.3` image"-->F
-  C--"`image:docs-single`<br>job runs and pushes<br>`gitlab-docs:14.2` image"-->F
-  D--"`image:docs-single`<br>job runs and pushes<br>`gitlab-docs:13.12` image"-->F
-  E--"`image:docs-single`<br>job runs and pushes<br>`gitlab-docs:12.10` image"-->F
+  F{{"Container registry on gitlab-docs project"}}
+  A--"image:docs-single<br>job runs and pushes<br>gitlab-docs:14.4 image"-->F
+  B--"image:docs-single<br>job runs and pushes<br>gitlab-docs:14.3 image"-->F
+  C--"image:docs-single<br>job runs and pushes<br>gitlab-docs:14.2 image"-->F
+  D--"image:docs-single<br>job runs and pushes<br>gitlab-docs:13.12 image"-->F
+  E--"image:docs-single<br>job runs and pushes<br>gitlab-docs:12.10 image"-->F
 ```
 
 ### Rebuild stable documentation images
@@ -104,23 +104,23 @@ For example, [a pipeline](https://gitlab.com/gitlab-org/gitlab-docs/-/pipelines/
 
 ```mermaid
 graph TD
-  A["Latest `gitlab`, `gitlab-runner`<br>`omnibus-gitlab`, and `charts`"]
-  subgraph "Container registry on `gitlab-docs` project"
-    B["14.4 versioned docs<br>`gitlab-docs:14.4`"]
-    C["14.3 versioned docs<br>`gitlab-docs:14.3`"]
-    D["14.2 versioned docs<br>`gitlab-docs:14.2`"]
-    E["13.12 versioned docs<br>`gitlab-docs:13.12`"]
-    F["12.10 versioned docs<br>`gitlab-docs:12.10`"]
+  A["Latest gitlab, gitlab-runner<br>omnibus-gitlab, and charts"]
+  subgraph "Container registry on gitlab-docs project"
+    B["14.4 versioned docs<br>gitlab-docs:14.4"]
+    C["14.3 versioned docs<br>gitlab-docs:14.3"]
+    D["14.2 versioned docs<br>gitlab-docs:14.2"]
+    E["13.12 versioned docs<br>gitlab-docs:13.12"]
+    F["12.10 versioned docs<br>gitlab-docs:12.10"]
   end
-  G[["Scheduled pipeline<br>`image:docs-latest` job<br>combines all these"]]
+  G[["Scheduled pipeline<br>image:docs-latest job<br>combines all these"]]
   A--"Default branches<br>pulled down"-->G
-  B--"`gitlab-docs:14.4` image<br>pulled down"-->G
-  C--"`gitlab-docs:14.3` image<br>pulled down"-->G
-  D--"`gitlab-docs:14.2` image<br>pulled down"-->G
-  E--"`gitlab-docs:13.12` image<br>pulled down"-->G
-  F--"`gitlab-docs:12.10` image<br>pulled down"-->G
+  B--"gitlab-docs:14.4 image<br>pulled down"-->G
+  C--"gitlab-docs:14.3 image<br>pulled down"-->G
+  D--"gitlab-docs:14.2 image<br>pulled down"-->G
+  E--"gitlab-docs:13.12 image<br>pulled down"-->G
+  F--"gitlab-docs:12.10 image<br>pulled down"-->G
   H{{"Container registry on gitlab-docs project"}}
-  G--"Latest `gitlab-docs:latest` image<br>pushed up"-->H
+  G--"Latest gitlab-docs:latest image<br>pushed up"-->H
 ```
 
 ## Pages deploy job
@@ -144,7 +144,7 @@ graph LR
   A{{"Container registry on gitlab-docs project"}}
   B[["Scheduled pipeline<br>`pages` and<br>`pages:deploy` job"]]
   C([docs.gitlab.com])
-  A--"`gitlab-docs:latest`<br>pulled"-->B
+  A--"gitlab-docs:latest<br>pulled"-->B
   B--"Unpacked documentation uploaded"-->C
 ```
 
diff --git a/doc/editor_extensions/index.md b/doc/editor_extensions/index.md
index 11220bc716c..f6a36f89279 100644
--- a/doc/editor_extensions/index.md
+++ b/doc/editor_extensions/index.md
@@ -4,7 +4,7 @@ group: Code Review
 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
 ---
 
-# Editor and IDE Extensions
+# Editor and IDE extensions
 
 GitLab has plugins and extensions to extend GitLab functionality to the following editors:
 
diff --git a/doc/user/group/settings/group_access_tokens.md b/doc/user/group/settings/group_access_tokens.md
index 220bb6f545e..5860b9b7dcb 100644
--- a/doc/user/group/settings/group_access_tokens.md
+++ b/doc/user/group/settings/group_access_tokens.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, howto
 ---
 
-# Group access tokens
+# Group access tokens **(FREE)**
 
 With group access tokens, you can use a single token to:
 
diff --git a/spec/frontend/ci/job_details/components/sidebar/stages_dropdown_spec.js b/spec/frontend/ci/job_details/components/sidebar/stages_dropdown_spec.js
index 4d00ead31cf..e007896c81e 100644
--- a/spec/frontend/ci/job_details/components/sidebar/stages_dropdown_spec.js
+++ b/spec/frontend/ci/job_details/components/sidebar/stages_dropdown_spec.js
@@ -46,7 +46,8 @@ describe('Stages Dropdown', () => {
     });
 
     it('renders pipeline status', () => {
-      expect(findStatus().exists()).toBe(true);
+      expect(findStatus().props('status')).toBe(mockPipelineWithoutMR.details.status);
+      expect(findStatus().props('size')).toBe('sm');
     });
 
     it('renders dropdown with stages', () => {
diff --git a/spec/frontend/ci/reports/components/__snapshots__/issue_status_icon_spec.js.snap b/spec/frontend/ci/reports/components/__snapshots__/issue_status_icon_spec.js.snap
index b402503bb89..2de634a6209 100644
--- a/spec/frontend/ci/reports/components/__snapshots__/issue_status_icon_spec.js.snap
+++ b/spec/frontend/ci/reports/components/__snapshots__/issue_status_icon_spec.js.snap
@@ -5,7 +5,6 @@ exports[`IssueStatusIcon renders "failed" state correctly 1`] = `
   class="failed report-block-list-icon"
 >
   <gl-icon-stub
-    data-qa-selector="status_failed_icon"
     name="status_failed_borderless"
     size="24"
   />
@@ -17,7 +16,6 @@ exports[`IssueStatusIcon renders "neutral" state correctly 1`] = `
   class="neutral report-block-list-icon"
 >
   <gl-icon-stub
-    data-qa-selector="status_neutral_icon"
     name="dash"
     size="24"
   />
@@ -29,7 +27,6 @@ exports[`IssueStatusIcon renders "success" state correctly 1`] = `
   class="report-block-list-icon success"
 >
   <gl-icon-stub
-    data-qa-selector="status_success_icon"
     name="status_success_borderless"
     size="24"
   />
diff --git a/spec/frontend/repository/components/__snapshots__/last_commit_spec.js.snap b/spec/frontend/repository/components/__snapshots__/last_commit_spec.js.snap
index 22b6595f5c4..3f901dc61b8 100644
--- a/spec/frontend/repository/components/__snapshots__/last_commit_spec.js.snap
+++ b/spec/frontend/repository/components/__snapshots__/last_commit_spec.js.snap
@@ -60,9 +60,9 @@ exports[`Repository last commit component renders commit widget 1`] = `
       >
         <ci-badge-link-stub
           aria-label="Pipeline: failed"
-          badgesize="lg"
           class="js-commit-pipeline"
           details-path="https://test.com/pipeline"
+          size="lg"
           status="[object Object]"
         />
       </div>
diff --git a/spec/frontend/vue_shared/components/ci_badge_link_spec.js b/spec/frontend/vue_shared/components/ci_badge_link_spec.js
index 8c860c9b06f..c74964c13f5 100644
--- a/spec/frontend/vue_shared/components/ci_badge_link_spec.js
+++ b/spec/frontend/vue_shared/components/ci_badge_link_spec.js
@@ -145,7 +145,7 @@ describe('CI Badge Link Component', () => {
   });
 
   it('should render dynamic badge size', () => {
-    createComponent({ status: statuses.success, badgeSize: 'lg' });
+    createComponent({ status: statuses.success, size: 'lg' });
 
     expect(findBadge().props('size')).toBe('lg');
   });
diff --git a/spec/frontend/work_items/components/work_item_actions_spec.js b/spec/frontend/work_items/components/work_item_actions_spec.js
index 9f87df9588b..0098a2e0864 100644
--- a/spec/frontend/work_items/components/work_item_actions_spec.js
+++ b/spec/frontend/work_items/components/work_item_actions_spec.js
@@ -55,7 +55,7 @@ describe('WorkItemActions component', () => {
   const findCopyReferenceButton = () => wrapper.findByTestId(TEST_ID_COPY_REFERENCE_ACTION);
   const findCopyCreateNoteEmailButton = () =>
     wrapper.findByTestId(TEST_ID_COPY_CREATE_NOTE_EMAIL_ACTION);
-  const findDropdownItems = () => wrapper.findAll('[data-testid="disclosure-content"] > *');
+  const findDropdownItems = () => wrapper.findAll('[data-testid="work-item-actions-dropdown"] > *');
   const findDropdownItemsActual = () =>
     findDropdownItems().wrappers.map((x) => {
       if (x.is(GlDropdownDivider)) {
@@ -140,10 +140,14 @@ describe('WorkItemActions component', () => {
       stubs: {
         GlModal: stubComponent(GlModal, {
           methods: {
-            show: modalShowSpy,
+            show: jest.fn(),
+          },
+        }),
+        GlDisclosureDropdown: stubComponent(GlDisclosureDropdown, {
+          methods: {
+            close: modalShowSpy,
           },
         }),
-        GlDisclosureDropdown,
       },
     });
   };
diff --git a/tooling/audit_events/docs/templates/audit_event_types.md.erb b/tooling/audit_events/docs/templates/audit_event_types.md.erb
index c0282e1926c..429d341f9a6 100644
--- a/tooling/audit_events/docs/templates/audit_event_types.md.erb
+++ b/tooling/audit_events/docs/templates/audit_event_types.md.erb
@@ -22,16 +22,19 @@ info: "See the Technical Writers assigned to Development Guidelines: https://abo
   edit `tooling/audit_events/docs/templates/audit_event_types.md.erb`.
 --->
 
-# Audit event types **(ULTIMATE ALL)**
+# Audit event types **(PREMIUM ALL)**
 
 Audit event types are used to [filter streamed audit events](index.md#update-event-filters).
 
-Every audit event is associated with an event type. The association with the event type can mean that an audit event is:
+Every audit event is associated with an event type. Audit event types can allow audit events to be:
 
-- Saved to database. Audit events associated with these types are retrievable by using the audit events dashboard or the [audit events API](../../api/audit_events.md).
-- Streamed. Audit events associated with these types are [streamed to external destinations](../index.md) if a
-  destination is set.
-- Not streamed. Audit events associated with these types are not streamed to external destinations even if a destination is set.
+- Saved to the database. Available in the Premium and Ultimate tier. You can retrieve audit events associated with these
+  types by using the audit events dashboard or the [audit events API](../../api/audit_events.md).
+- Streamed to external destinations. Available in the Ultimate tier. You can stream audit events associated with these
+  types [to external destinations](../index.md) if a destination is set.
+
+Some audit event types don't allow saving audit events to the database. Other audit event types don't allow streaming
+audit events to external destinations.
 
 ## Available audit event types