Add latest changes from gitlab-org/gitlab@master

7 files changed, 37 insertions, 10 deletions

diff --git a/app/assets/javascripts/issues/show/components/header_actions.vue b/app/assets/javascripts/issues/show/components/header_actions.vue
index dcdfd06fbf1..fb7058d95dc 100644
--- a/app/assets/javascripts/issues/show/components/header_actions.vue
+++ b/app/assets/javascripts/issues/show/components/header_actions.vue
@@ -14,6 +14,7 @@ import { mapActions, mapGetters, mapState } from 'vuex';
 import * as Sentry from '~/sentry/sentry_browser_wrapper';
 import { createAlert, VARIANT_SUCCESS } from '~/alert';
 import { EVENT_ISSUABLE_VUE_APP_CHANGE } from '~/issuable/constants';
+import { ISSUABLE_EDIT_DESCRIPTION } from '~/behaviors/shortcuts/keybindings';
 import { STATUS_CLOSED, TYPE_ISSUE, issuableTypeText } from '~/issues/constants';
 import { ISSUE_STATE_EVENT_CLOSE, ISSUE_STATE_EVENT_REOPEN } from '~/issues/show/constants';
 import { capitalizeFirstCharacter } from '~/lib/utils/text_utility';
@@ -196,6 +197,12 @@ export default {
         href: this.submitAsSpamPath,
       };
     },
+    editShortcutKey() {
+      return ISSUABLE_EDIT_DESCRIPTION.defaultKeys[0];
+    },
+    editTooltip() {
+      return `${this.$options.i18n.editTitleAndDescription} <kbd class="glat gl-ml-1" aria-hidden=true>${this.editShortcutKey}</kbd>`;
+    },
   },
   created() {
     eventHub.$on('toggle.issuable.state', this.toggleIssueState);
@@ -395,9 +402,10 @@ export default {
 
     <gl-button
       v-if="canUpdateIssue"
-      v-gl-tooltip.bottom
-      :title="$options.i18n.editTitleAndDescription"
+      v-gl-tooltip.viewport.html
+      :title="editTooltip"
       :aria-label="$options.i18n.editTitleAndDescription"
+      :aria-keyshortcuts="editShortcutKey"
       class="js-issuable-edit gl-display-none! gl-md-display-block!"
       data-testid="edit-button"
       @click="edit"
diff --git a/app/views/projects/merge_requests/_mr_title.html.haml b/app/views/projects/merge_requests/_mr_title.html.haml
index 1b0aba8d496..03c850b7fbb 100644
--- a/app/views/projects/merge_requests/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/_mr_title.html.haml
@@ -24,7 +24,10 @@
 
     .detail-page-header-actions.gl-align-self-start.is-merge-request.js-issuable-actions.gl-display-flex
       - if can_update_merge_request
-        = render Pajamas::ButtonComponent.new(href: edit_project_merge_request_path(@project, @merge_request), button_options: {class: "gl-display-none gl-md-display-block js-issuable-edit", data: { testid: "edit-title-button" }}) do
+        - edit_action_description = _('Edit merge request')
+        - edit_action_shortcut = 'e'
+        - edit_button_title = "#{edit_action_description} <kbd class='flat ml-1' aria-hidden=true>#{edit_action_shortcut}</kbd>"
+        = render Pajamas::ButtonComponent.new(href: edit_project_merge_request_path(@project, @merge_request), button_options: { aria: {label: edit_action_description, keyshortcuts: edit_action_shortcut}, class: "gl-display-none gl-md-display-block has-tooltip js-issuable-edit", data: { html: "true", testid: "edit-title-button" }, title: edit_button_title }) do
           = _('Edit')
 
       - if @merge_request.source_project
diff --git a/app/views/shared/wikis/show.html.haml b/app/views/shared/wikis/show.html.haml
index 7bb99d7a877..e33828b95ab 100644
--- a/app/views/shared/wikis/show.html.haml
+++ b/app/views/shared/wikis/show.html.haml
@@ -13,7 +13,10 @@
 
   .nav-controls.pb-md-3.pb-lg-0
     - if can?(current_user, :create_wiki, @wiki.container) && @page.latest? && @valid_encoding
-      = render Pajamas::ButtonComponent.new(href: wiki_page_path(@wiki, @page, action: :edit), button_options: { class: 'js-wiki-edit', data: { testid: 'wiki-edit-button' }}) do
+      - edit_action_description = _('Edit page')
+      - edit_action_shortcut = 'e'
+      - edit_button_title = "#{edit_action_description} <kbd class='flat ml-1' aria-hidden=true>#{edit_action_shortcut}</kbd>"
+      = render Pajamas::ButtonComponent.new(href: wiki_page_path(@wiki, @page, action: :edit), button_options: { aria: {label: edit_action_description, keyshortcuts: edit_action_shortcut}, class: 'has-tooltip js-wiki-edit', data: { html: 'true', testid: 'wiki-edit-button' }, title: edit_button_title }) do
         = _('Edit')
     = render 'shared/wikis/main_links'
 
diff --git a/config/feature_flags/development/compliance_framework_report_ui.yml b/config/feature_flags/development/compliance_framework_report_ui.yml
index a70869bfeed..257c5808797 100644
--- a/config/feature_flags/development/compliance_framework_report_ui.yml
+++ b/config/feature_flags/development/compliance_framework_report_ui.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/425242
 milestone: '16.5'
 type: development
 group: group::compliance
-default_enabled: false
+default_enabled: true
diff --git a/db/post_migrate/20240107154805_sent_notifications_self_install_id_swap.rb b/db/post_migrate/20240107154805_sent_notifications_self_install_id_swap.rb
index 41e330ba7a0..c6e31ca568e 100644
--- a/db/post_migrate/20240107154805_sent_notifications_self_install_id_swap.rb
+++ b/db/post_migrate/20240107154805_sent_notifications_self_install_id_swap.rb
@@ -13,16 +13,16 @@ class SentNotificationsSelfInstallIdSwap < Gitlab::Database::Migration[2.2]
 
   def up
     return if com_or_dev_or_test_but_not_jh?
-    return if columns_swapped?(TABLE_NAME, :id)
     return if temp_column_removed?(TABLE_NAME, :id)
+    return if columns_swapped?(TABLE_NAME, :id)
 
     swap
   end
 
   def down
     return if com_or_dev_or_test_but_not_jh?
-    return unless columns_swapped?(TABLE_NAME, :id)
     return if temp_column_removed?(TABLE_NAME, :id)
+    return unless columns_swapped?(TABLE_NAME, :id)
 
     swap
   end
diff --git a/doc/user/compliance/compliance_center/index.md b/doc/user/compliance/compliance_center/index.md
index c61706a0da4..da65cc9ef6e 100644
--- a/doc/user/compliance/compliance_center/index.md
+++ b/doc/user/compliance/compliance_center/index.md
@@ -414,10 +414,11 @@ Repeat this process to filter by multiple attributes.
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/422973) in GitLab 16.5 [with a flag](../../../administration/feature_flags.md) named `compliance_framework_report_ui`. Disabled by default.
 > - In GitLab 16.4 and earlier, **Compliance frameworks report** referred to what is now called **Compliance projects report**. The formally-named **Compliance frameworks report** was [renamed to **Compliance projects report**](https://gitlab.com/gitlab-org/gitlab/-/issues/422963) in GitLab 16.5.
+> - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140825) in GitLab 16.8.
 
 FLAG:
-On self-managed GitLab, by default this feature is not available. To make it available, ask an administrator to [enable the feature flag](../../../administration/feature_flags.md) named
-`compliance_framework_report_ui`. On GitLab.com, this feature is not available. The feature is not ready for production use.
+On self-managed GitLab, by default this feature is available. To hide the feature an administrator to [disable the feature flag](../../../administration/feature_flags.md) named
+`compliance_framework_report_ui`. On GitLab.com, this feature is available.
 
 With compliance frameworks report, you can see all the compliance frameworks in a group. Each row of the report shows:
 
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 8b4d0514e18..0666d84dbe3 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -18445,6 +18445,12 @@ msgstr ""
 msgid "Edit link"
 msgstr ""
 
+msgid "Edit merge request"
+msgstr ""
+
+msgid "Edit page"
+msgstr ""
+
 msgid "Edit project: %{project_name}"
 msgstr ""
 
@@ -29987,10 +29993,16 @@ msgstr ""
 msgid "MemberRole|Failed to create role."
 msgstr ""
 
+msgid "MemberRole|Failed to create role: %{message}"
+msgstr ""
+
 msgid "MemberRole|Failed to delete the role."
 msgstr ""
 
-msgid "MemberRole|Failed to fetch roles."
+msgid "MemberRole|Failed to delete the role: %{message}"
+msgstr ""
+
+msgid "MemberRole|Failed to fetch roles: %{message}"
 msgstr ""
 
 msgid "MemberRole|ID"