Add latest changes from gitlab-org/gitlab@master

10 files changed, 23 insertions, 11 deletions

diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents.vue b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents.vue
index b6ac314522c..53582aacabd 100644
--- a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents.vue
+++ b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents.vue
@@ -224,7 +224,7 @@ export default {
         @toggleDropdownContentsCreateView="toggleDropdownContent"
         @closeDropdown="hideDropdown"
         @input="debouncedSearchKeyUpdate"
-        @searchEnter="selectFirstItem"
+        @searchEnter.prevent="selectFirstItem"
       />
     </template>
     <template #default>
diff --git a/app/assets/javascripts/vue_shared/components/mr_more_dropdown.vue b/app/assets/javascripts/vue_shared/components/mr_more_dropdown.vue
index a2a29241fb1..ba557878246 100644
--- a/app/assets/javascripts/vue_shared/components/mr_more_dropdown.vue
+++ b/app/assets/javascripts/vue_shared/components/mr_more_dropdown.vue
@@ -231,10 +231,12 @@ export default {
       :auto-close="false"
     >
       <template #toggle>
-        <div class="gl-min-h-7 gl-mb-2 gl-md-mb-0!" :aria-label="$options.i18n.mergeRequestActions">
+        <div class="gl-min-h-7 gl-mb-2 gl-md-mb-0!">
           <gl-button
             class="gl-md-display-none! gl-new-dropdown-toggle gl-absolute gl-top-0 gl-left-0 gl-w-full"
             category="secondary"
+            :aria-label="$options.i18n.mergeRequestActions"
+            :title="$options.i18n.mergeRequestActions"
           >
             <span class="">{{ $options.i18n.mergeRequestActions }}</span>
             <gl-icon class="dropdown-chevron" name="chevron-down" />
@@ -243,6 +245,8 @@ export default {
             class="gl-display-none gl-md-display-flex! gl-new-dropdown-toggle gl-new-dropdown-icon-only gl-new-dropdown-toggle-no-caret gl-ml-3"
             category="tertiary"
             icon="ellipsis_v"
+            :aria-label="$options.i18n.mergeRequestActions"
+            :title="$options.i18n.mergeRequestActions"
           />
         </div>
       </template>
diff --git a/doc/administration/monitoring/prometheus/gitlab_metrics.md b/doc/administration/monitoring/prometheus/gitlab_metrics.md
index 061b1921e4f..713a1fb3b5d 100644
--- a/doc/administration/monitoring/prometheus/gitlab_metrics.md
+++ b/doc/administration/monitoring/prometheus/gitlab_metrics.md
@@ -471,7 +471,6 @@ Some basic Ruby runtime metrics are available:
 | `puma_pool_capacity`              | Gauge   | 12.0  | Number of requests the worker is capable of taking right now |
 | `puma_max_threads`                | Gauge   | 12.0  | Maximum number of worker threads |
 | `puma_idle_threads`               | Gauge   | 12.0  | Number of spawned threads which are not processing a request |
-| `puma_killer_terminations_total`  | Gauge   | 12.0  | Number of workers terminated by PumaWorkerKiller |
 
 ## Redis metrics
 
diff --git a/doc/update/plan_your_upgrade.md b/doc/update/plan_your_upgrade.md
index 9c387489370..634c430e251 100644
--- a/doc/update/plan_your_upgrade.md
+++ b/doc/update/plan_your_upgrade.md
@@ -11,7 +11,7 @@ GitLab instance.
 
 General notes:
 
-- If possible, we recommend you test out the upgrade in a test environment before
+- If possible, you should test out the upgrade in a test environment before
   updating your production instance. Ideally, your test environment should mimic
   your production environment as closely as possible.
 - If [working with Support](https://about.gitlab.com/support/scheduling-upgrade-assistance/)
@@ -84,7 +84,7 @@ to roll back GitLab to a working state if there's a problem with the upgrade:
 
 ### Restore GitLab
 
-If you have a test environment that mimics your production one, we recommend testing the restoration to ensure that everything works as you expect.
+If you have a test environment that mimics your production one, you should test the restoration to ensure that everything works as you expect.
 
 To restore your GitLab backup:
 
diff --git a/doc/update/upgrading_from_source.md b/doc/update/upgrading_from_source.md
index ec707b05aee..d9641e18e8e 100644
--- a/doc/update/upgrading_from_source.md
+++ b/doc/update/upgrading_from_source.md
@@ -21,8 +21,7 @@ the [Upgrading from CE to EE](upgrading_from_ce_to_ee.md) documentation.
 
 ## Upgrading to a new major version
 
-Major versions are reserved for backwards incompatible changes. We recommend that
-you first upgrade to the latest available minor version of your current major version.
+Major versions are reserved for backwards incompatible changes. You should first upgrade to the latest available minor version of your current major version.
 Follow the [Upgrade Recommendations](../policy/maintenance.md#upgrade-recommendations)
 to identify the ideal upgrade path.
 
@@ -108,7 +107,7 @@ rm go1.19.10.linux-amd64.tar.gz
 To check you are running the minimum required Git version, see
 [Git versions](../install/installation.md#software-requirements).
 
-From GitLab 13.6, we recommend you use the
+From GitLab 13.6, you should use the
 [Git version provided by Gitaly](https://gitlab.com/gitlab-org/gitaly/-/issues/2729)
 that:
 
diff --git a/doc/user/clusters/environments.md b/doc/user/clusters/environments.md
index c6a61f58974..1e93cc37d87 100644
--- a/doc/user/clusters/environments.md
+++ b/doc/user/clusters/environments.md
@@ -48,7 +48,7 @@ To:
 
 After you have successful deployments to your group-level or instance-level cluster:
 
-1. Navigate to your group's **Kubernetes** page.
+1. Go to your group's **Kubernetes** page.
 1. Select the **Environments** tab.
 
 Only successful deployments to the cluster are included in this page.
diff --git a/doc/user/group/reporting/git_abuse_rate_limit.md b/doc/user/group/reporting/git_abuse_rate_limit.md
index ee8ac50f021..895b3a2c893 100644
--- a/doc/user/group/reporting/git_abuse_rate_limit.md
+++ b/doc/user/group/reporting/git_abuse_rate_limit.md
@@ -13,7 +13,7 @@ On self-managed GitLab, by default this feature is not available. To make it ava
 
 This is the group-level documentation. For self-managed instances, see the [administration documentation](../../admin_area/reporting/git_abuse_rate_limit.md).
 
-Git abuse rate limiting is a feature to automatically ban users who download, clone, or fork more than a specified number of repositories of a group in a given time frame. Banned users cannot access the top-level group or any of its non-public subgroups via HTTP or SSH. The rate limit also applies to users who authenticate with a [personal](../../../user/profile/personal_access_tokens.md) or [group access token](../../../user/group/settings/group_access_tokens.md). Access to unrelated groups is unaffected.
+Git abuse rate limiting is a feature to automatically ban users who download, clone, pull, fetch, or fork more than a specified number of repositories of a group in a given time frame. Banned users cannot access the top-level group or any of its non-public subgroups via HTTP or SSH. The rate limit also applies to users who authenticate with a [personal](../../../user/profile/personal_access_tokens.md) or [group access token](../../../user/group/settings/group_access_tokens.md). Access to unrelated groups is unaffected.
 
 Git abuse rate limiting does not apply to top-level group owners, [deploy tokens](../../../user/project/deploy_tokens/index.md), or [deploy keys](../../../user/project/deploy_keys/index.md).
 
diff --git a/qa/qa/resource/project_imported_from_github.rb b/qa/qa/resource/project_imported_from_github.rb
index ed8074b1440..ff6b3947715 100644
--- a/qa/qa/resource/project_imported_from_github.rb
+++ b/qa/qa/resource/project_imported_from_github.rb
@@ -3,7 +3,11 @@
 module QA
   module Resource
     class ProjectImportedFromGithub < Resource::Project
-      attr_accessor :issue_events_import, :full_notes_import, :attachments_import, :allow_partial_import
+      attr_accessor :issue_events_import,
+        :full_notes_import,
+        :attachments_import,
+        :allow_partial_import,
+        :additional_access_tokens
 
       attribute :github_repo_id do
         github_client.repository(github_repository_path).id
@@ -58,6 +62,7 @@ module QA
           new_name: name,
           target_namespace: @personal_namespace || group.full_path,
           personal_access_token: github_personal_access_token,
+          additional_access_tokens: additional_access_tokens,
           ci_cd_only: false,
           optional_stages: {
             single_endpoint_issue_events_import: issue_events_import,
diff --git a/qa/qa/runtime/env.rb b/qa/qa/runtime/env.rb
index a2ad91d731b..517cb00df41 100644
--- a/qa/qa/runtime/env.rb
+++ b/qa/qa/runtime/env.rb
@@ -456,6 +456,10 @@ module QA
         ENV['QA_GITHUB_ACCESS_TOKEN'].to_s.strip
       end
 
+      def github_additional_access_tokens
+        ENV['QA_ADDITIONAL_GITHUB_ACCESS_TOKENS']
+      end
+
       def require_github_access_token!
         return unless github_access_token.empty?
 
diff --git a/qa/qa/specs/features/api/1_manage/import/import_large_github_repo_spec.rb b/qa/qa/specs/features/api/1_manage/import/import_large_github_repo_spec.rb
index e5ab0de964a..e9a9f838436 100644
--- a/qa/qa/specs/features/api/1_manage/import/import_large_github_repo_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/import/import_large_github_repo_spec.rb
@@ -196,6 +196,7 @@ module QA
           project.add_name_uuid = false
           project.name = 'imported-project'
           project.github_personal_access_token = Runtime::Env.github_access_token
+          project.additional_access_tokens = Runtime::Env.github_additional_access_tokens
           project.github_repository_path = github_repo
           project.personal_namespace = user.username
           project.api_client = Runtime::API::Client.new(user: user)