Add latest changes from gitlab-org/gitlab@master

24 files changed, 98 insertions, 52 deletions

diff --git a/.gitlab/issue_templates/Deprecations.md b/.gitlab/issue_templates/Deprecations.md
new file mode 100644
index 00000000000..ff51699c6be
--- /dev/null
+++ b/.gitlab/issue_templates/Deprecations.md
@@ -0,0 +1,50 @@
+<!-- Use this template as a starting point for deprecations. -->
+
+### Deprecation Summary
+
+<!--
+This should contain a brief description of the feature or functionality that is deprecated. The description should clearly state the potential impact of the deprecation to end users.
+
+It is recommended that you link to the documentation.
+
+The description of the deprecation should state what actions the user should take to rectify the behavior. If the deprecation is scheduled for an upcoming release, the content should remain in the deprecations documentation page until it has been completed. For example, if a deprecation is announced in 14.9 and scheduled to be completed in 15.0, the same content would be included in the documentation for 14.9, 14.10, and 15.0.
+-->
+
+### Breaking Change
+
+<!-- Is this a breaking change or not? If so, please add instructions for how users can update their workflow. -->
+### Affected Topology
+
+<!--
+Who is affected by this deprecation, Self-managed users, SaaS users, or both? This is especially important when nearing the annual major release where breaking changes and removals are typically introduced. These changes might be seen on GitLab.com before the official release date.
+-->
+
+### Affected Tier
+
+<!--
+Which tier is this feature available in?
+
+* Free
+* Premium
+* Ultimate
+-->
+
+### Checklist
+
+- [ ] @mention your stage's stable counterparts on this issue. For example, Customer Support, Customer Success (Technical Account Manager), Product Marketing Manager.
+  - To see who the stable counterparts are for a product team visit [product categories](https://about.gitlab.com/handbook/product/categories/)
+       - If there is no stable counterpart listed for Sales/CS please mention `@timtams`
+       - If there is no stable counterpart listed for Support please @mention `@gitlab-com/support/managers`
+       - If there is no stable counterpart listed for Marketing please mention `@williamchia`
+
+- [ ] @mention your GPM so that they are aware of planned deprecations. The goal is to have reviews happen at least two releases before the final removal of the feature or introduction of a breaking change.
+
+### Deprecation Milestone
+
+<!-- In which milestone will this deprecation happen? -->
+
+### Links
+
+<!--
+Add links to any relevant documentation or code that will provide additional details or clarity regarding the planned change. Also, include a link to the removal issue if relevant.
+-->
diff --git a/app/assets/javascripts/runner/components/cells/runner_type_cell.vue b/app/assets/javascripts/runner/components/cells/runner_type_cell.vue
index b3ebdfd82e3..f186a8daf72 100644
--- a/app/assets/javascripts/runner/components/cells/runner_type_cell.vue
+++ b/app/assets/javascripts/runner/components/cells/runner_type_cell.vue
@@ -32,11 +32,11 @@ export default {
     <runner-type-badge :type="runnerType" size="sm" />
 
     <gl-badge v-if="locked" variant="warning" size="sm">
-      {{ __('locked') }}
+      {{ s__('Runners|locked') }}
     </gl-badge>
 
     <gl-badge v-if="paused" variant="danger" size="sm">
-      {{ __('paused') }}
+      {{ s__('Runners|paused') }}
     </gl-badge>
   </div>
 </template>
diff --git a/app/assets/javascripts/runner/components/runner_type_help.vue b/app/assets/javascripts/runner/components/runner_type_help.vue
index 927deb290a4..70456b3ab65 100644
--- a/app/assets/javascripts/runner/components/runner_type_help.vue
+++ b/app/assets/javascripts/runner/components/runner_type_help.vue
@@ -44,13 +44,13 @@ export default {
         </li>
         <li>
           <gl-badge variant="warning" size="sm">
-            {{ __('locked') }}
+            {{ s__('Runners|locked') }}
           </gl-badge>
           - {{ __('Cannot be assigned to other projects.') }}
         </li>
         <li>
           <gl-badge variant="danger" size="sm">
-            {{ __('paused') }}
+            {{ s__('Runners|paused') }}
           </gl-badge>
           - {{ __('Not available to run jobs.') }}
         </li>
diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml
index da2fcd5a4a6..ce143a6b155 100644
--- a/app/views/admin/runners/_runner.html.haml
+++ b/app/views/admin/runners/_runner.html.haml
@@ -6,15 +6,15 @@
     .table-mobile-header{ role: 'rowheader' }= _('Type')
     .table-mobile-content
       - if runner.instance_type?
-        %span.badge.badge-pill.gl-badge.sm.badge-success= _("shared")
+        %span.badge.badge-pill.gl-badge.sm.badge-success= s_('Runners|shared')
       - elsif runner.group_type?
-        %span.badge.badge-pill.gl-badge.sm.badge-success= _("group")
+        %span.badge.badge-pill.gl-badge.sm.badge-success= s_('Runners|group')
       - else
-        %span.badge.badge-pill.gl-badge.sm.badge-info= _("specific")
+        %span.badge.badge-pill.gl-badge.sm.badge-info= s_('Runners|specific')
       - if runner.locked?
-        %span.badge.badge-pill.gl-badge.sm.badge-warning= _("locked")
+        %span.badge.badge-pill.gl-badge.sm.badge-warning= s_('Runners|locked')
       - unless runner.active?
-        %span.badge.badge-pill.gl-badge.sm.badge-danger= _("paused")
+        %span.badge.badge-pill.gl-badge.sm.badge-danger= s_('Runners|paused')
 
   .table-section.section-30
     .table-mobile-header{ role: 'rowheader' }= s_('Runners|Runner')
diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml
index 07fbc3e5398..f9c52d9316b 100644
--- a/app/views/admin/runners/index.html.haml
+++ b/app/views/admin/runners/index.html.haml
@@ -17,23 +17,23 @@
           %span= _('Runners can be:')
           %ul
             %li
-              %span.badge.badge-pill.gl-badge.sm.badge-success shared
+              %span.badge.badge-pill.gl-badge.sm.badge-success= s_('Runners|shared')
               \-
               = _('Runs jobs from all unassigned projects.')
             %li
-              %span.badge.badge-pill.gl-badge.sm.badge-success group
+              %span.badge.badge-pill.gl-badge.sm.badge-success= s_('Runners|group')
               \-
               = _('Runs jobs from all unassigned projects in its group.')
             %li
-              %span.badge.badge-pill.gl-badge.sm.badge-info specific
+              %span.badge.badge-pill.gl-badge.sm.badge-info= s_('Runners|specific')
               \-
               = _('Runs jobs from assigned projects.')
             %li
-              %span.badge.badge-pill.gl-badge.sm.badge-warning locked
+              %span.badge.badge-pill.gl-badge.sm.badge-warning= s_('Runners|locked')
               \-
               = _('Cannot be assigned to other projects.')
             %li
-              %span.badge.badge-pill.gl-badge.sm.badge-danger paused
+              %span.badge.badge-pill.gl-badge.sm.badge-danger= s_('Runners|paused')
               \-
               = _('Not available to run jobs.')
 
@@ -41,7 +41,7 @@
       .bs-callout
         = render partial: 'ci/runner/how_to_setup_runner',
                   locals: { registration_token: Gitlab::CurrentSettings.runners_registration_token,
-                            type: 'shared',
+                            type: s_('Runners|shared'),
                             reset_token_url: reset_registration_token_admin_application_settings_path,
                             project_path: '',
                             group_path: '' }
diff --git a/app/views/groups/runners/_runner.html.haml b/app/views/groups/runners/_runner.html.haml
index 89e32c0999c..13da2292985 100644
--- a/app/views/groups/runners/_runner.html.haml
+++ b/app/views/groups/runners/_runner.html.haml
@@ -7,16 +7,16 @@
     .table-mobile-content
       - if runner.group_type?
         %span.badge.badge-pill.gl-badge.sm.badge-success
-          = _('group')
+          = s_('Runners|group')
       - else
         %span.badge.badge-pill.gl-badge.sm.badge-info
-          = _('specific')
+          = s_('Runners|specific')
       - if runner.locked?
         %span.badge.badge-pill.gl-badge.sm.badge-warning
-          = _('locked')
+          = s_('Runners|locked')
       - unless runner.active?
         %span.badge.badge-pill.gl-badge.sm.badge-danger
-          = _('paused')
+          = s_('Runners|paused')
 
   .table-section.section-30
     .table-mobile-header{ role: 'rowheader' }= s_('Runners|Runner')
diff --git a/app/views/groups/runners/_index.html.haml b/app/views/groups/runners/_settings.html.haml
index 187588f5f11..187588f5f11 100644
--- a/app/views/groups/runners/_index.html.haml
+++ b/app/views/groups/runners/_settings.html.haml
diff --git a/app/views/groups/settings/ci_cd/show.html.haml b/app/views/groups/settings/ci_cd/show.html.haml
index fc5b269a7ef..018dd4c424d 100644
--- a/app/views/groups/settings/ci_cd/show.html.haml
+++ b/app/views/groups/settings/ci_cd/show.html.haml
@@ -34,7 +34,7 @@
       = _("Runners are processes that pick up and execute CI/CD jobs for GitLab.")
       = link_to s_('How do I configure runners?'), help_page_path('ci/runners/index'), target: '_blank', rel: 'noopener noreferrer'
   .settings-content
-    = render 'groups/runners/index'
+    = render 'groups/runners/settings'
 
 %section.settings#auto-devops-settings.no-animate{ class: ('expanded' if expanded) }
   .settings-header
diff --git a/app/views/projects/runners/_index.html.haml b/app/views/projects/runners/_settings.html.haml
index a02bdac442b..a02bdac442b 100644
--- a/app/views/projects/runners/_index.html.haml
+++ b/app/views/projects/runners/_settings.html.haml
diff --git a/app/views/projects/runners/_specific_runners.html.haml b/app/views/projects/runners/_specific_runners.html.haml
index 13089d40e8a..eb376ff7960 100644
--- a/app/views/projects/runners/_specific_runners.html.haml
+++ b/app/views/projects/runners/_specific_runners.html.haml
@@ -6,7 +6,7 @@
     = _('These runners are specific to this project.')
     %hr
     = render partial: 'ci/runner/how_to_setup_runner_automatically',
-             locals: { type: 'specific',
+             locals: { type: s_('Runners|specific'),
                        clusters_path: project_clusters_path(@project) }
     - if params[:ci_runner_templates]
       %hr
@@ -15,7 +15,7 @@
     %hr
     = render partial: 'ci/runner/how_to_setup_runner',
             locals: { registration_token: @project.runners_token,
-                      type: 'specific',
+                      type: s_('Runners|specific'),
                       reset_token_url: reset_registration_token_namespace_project_settings_ci_cd_path,
                       project_path: @project.path_with_namespace,
                       group_path: '' }
diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml
index fc6ee2f1760..70626636ac0 100644
--- a/app/views/projects/settings/ci_cd/show.html.haml
+++ b/app/views/projects/settings/ci_cd/show.html.haml
@@ -43,7 +43,7 @@
       = _("Runners are processes that pick up and execute CI/CD jobs for GitLab.")
       = link_to s_('How do I configure runners?'), help_page_path('ci/runners/index'), target: '_blank', rel: 'noopener noreferrer'
   .settings-content
-    = render 'projects/runners/index'
+    = render 'projects/runners/settings'
 
 - if Gitlab::CurrentSettings.current_application_settings.keep_latest_artifact?
   %section.settings.no-animate#js-artifacts-settings{ class: ('expanded' if expanded) }
diff --git a/doc/development/permissions.md b/doc/development/permissions.md
index 8c3600a30ba..177fedcf454 100644
--- a/doc/development/permissions.md
+++ b/doc/development/permissions.md
@@ -57,9 +57,12 @@ can be accessed only by project members by default.
 ### Members
 
 Users can be members of multiple groups and projects. The following access
-levels are available (defined in the `Gitlab::Access` module):
+levels are available (defined in the
+[`Gitlab::Access`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/access.rb)
+module):
 
 - No access (`0`)
+- [Minimal access](../user/permissions.md#users-with-minimal-access) (`5`)
 - Guest (`10`)
 - Reporter (`20`)
 - Developer (`30`)
diff --git a/doc/development/usage_ping/dictionary.md b/doc/development/usage_ping/dictionary.md
index d24c1cfec13..934bdf9c808 100644
--- a/doc/development/usage_ping/dictionary.md
+++ b/doc/development/usage_ping/dictionary.md
@@ -22368,7 +22368,7 @@ Data Category: `Optional`
 
 Status: `data_available`
 
-Tiers:
+Tiers: `premium`, `ultimate`
 
 ### `usage_activity_by_stage_monthly.monitor.clusters`
 
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 5a8c95a0ebf..8e1502bce6f 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -28369,6 +28369,12 @@ msgstr ""
 msgid "Runners|instance"
 msgstr ""
 
+msgid "Runners|locked"
+msgstr ""
+
+msgid "Runners|paused"
+msgstr ""
+
 msgid "Runners|project"
 msgstr ""
 
@@ -38959,9 +38965,6 @@ msgstr ""
 msgid "loading"
 msgstr ""
 
-msgid "locked"
-msgstr ""
-
 msgid "locked by %{path_lock_user_name} %{created_at}"
 msgstr ""
 
@@ -39412,9 +39415,6 @@ msgstr[1] ""
 msgid "password"
 msgstr ""
 
-msgid "paused"
-msgstr ""
-
 msgid "pending comment"
 msgstr ""
 
@@ -39586,9 +39586,6 @@ msgstr ""
 msgid "severity|Unknown"
 msgstr ""
 
-msgid "shared"
-msgstr ""
-
 msgid "should be an array of %{object_name} objects"
 msgstr ""
 
@@ -39619,9 +39616,6 @@ msgstr ""
 msgid "source diff"
 msgstr ""
 
-msgid "specific"
-msgstr ""
-
 msgid "specified top is not part of the tree"
 msgstr ""
 
diff --git a/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb
index 5759d207335..6c2ff005f49 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb
@@ -76,12 +76,7 @@ module QA
       # https://gitlab.com/gitlab-org/gitlab/-/issues/333678 <- can cause 500 when creating user and group back to back
       it(
         'imports group with subgroups and labels',
-        testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1785',
-        quarantine: {
-          only: { job: 'relative_url' },
-          issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/330344',
-          type: :bug
-        }
+        testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1785'
       ) do
         Resource::GroupLabel.fabricate_via_api! do |label|
           label.api_client = api_client
diff --git a/qa/qa/specs/features/browser_ui/5_package/composer_registry_spec.rb b/qa/qa/specs/features/browser_ui/5_package/composer_registry_spec.rb
index 65ad5353597..61c71b062ae 100644
--- a/qa/qa/specs/features/browser_ui/5_package/composer_registry_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/composer_registry_spec.rb
@@ -3,7 +3,7 @@
 require 'securerandom'
 
 module QA
-  RSpec.describe 'Package', :orchestrated, :packages do
+  RSpec.describe 'Package', :orchestrated, :packages, :object_storage do
     describe 'Composer Repository' do
       include Runtime::Fixtures
 
diff --git a/qa/qa/specs/features/browser_ui/5_package/conan_repository_spec.rb b/qa/qa/specs/features/browser_ui/5_package/conan_repository_spec.rb
index 090834f253d..668a1524b1c 100644
--- a/qa/qa/specs/features/browser_ui/5_package/conan_repository_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/conan_repository_spec.rb
@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Package', :orchestrated, :packages do
+  RSpec.describe 'Package', :orchestrated, :packages, :object_storage, quarantine: {
+    only: { job: 'object_storage' },
+    issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/335981',
+    type: :bug
+  } do
     describe 'Conan Repository' do
       include Runtime::Fixtures
 
diff --git a/qa/qa/specs/features/browser_ui/5_package/generic_repository_spec.rb b/qa/qa/specs/features/browser_ui/5_package/generic_repository_spec.rb
index 5935a316b19..ef5965b29e5 100644
--- a/qa/qa/specs/features/browser_ui/5_package/generic_repository_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/generic_repository_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Package', :orchestrated, :packages do
+  RSpec.describe 'Package', :orchestrated, :packages, :object_storage do
     describe 'Generic Repository' do
       let(:project) do
         Resource::Project.fabricate_via_api! do |project|
diff --git a/qa/qa/specs/features/browser_ui/5_package/maven_gradle_repository_spec.rb b/qa/qa/specs/features/browser_ui/5_package/maven_gradle_repository_spec.rb
index 22d2fb2d8de..32a0670e342 100644
--- a/qa/qa/specs/features/browser_ui/5_package/maven_gradle_repository_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/maven_gradle_repository_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Package', :orchestrated, :packages do
+  RSpec.describe 'Package', :orchestrated, :packages, :object_storage do
     describe 'Maven Repository with Gradle' do
       using RSpec::Parameterized::TableSyntax
       include Runtime::Fixtures
diff --git a/qa/qa/specs/features/browser_ui/5_package/maven_repository_spec.rb b/qa/qa/specs/features/browser_ui/5_package/maven_repository_spec.rb
index 3f409258b3e..fb92616ffc5 100644
--- a/qa/qa/specs/features/browser_ui/5_package/maven_repository_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/maven_repository_spec.rb
@@ -3,7 +3,7 @@
 require 'securerandom'
 
 module QA
-  RSpec.describe 'Package', :orchestrated, :packages, :reliable do
+  RSpec.describe 'Package', :orchestrated, :packages, :reliable, :object_storage do
     describe 'Maven Repository' do
       include Runtime::Fixtures
 
diff --git a/qa/qa/specs/features/browser_ui/5_package/npm_registry_spec.rb b/qa/qa/specs/features/browser_ui/5_package/npm_registry_spec.rb
index e9ed9237f3e..2322d18a9ba 100644
--- a/qa/qa/specs/features/browser_ui/5_package/npm_registry_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/npm_registry_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Package', :orchestrated, :packages, :reliable do
+  RSpec.describe 'Package', :orchestrated, :packages, :reliable, :object_storage do
     describe 'npm registry' do
       include Runtime::Fixtures
 
diff --git a/qa/qa/specs/features/browser_ui/5_package/nuget_repository_spec.rb b/qa/qa/specs/features/browser_ui/5_package/nuget_repository_spec.rb
index 3b10071aeff..1f62b285798 100644
--- a/qa/qa/specs/features/browser_ui/5_package/nuget_repository_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/nuget_repository_spec.rb
@@ -3,7 +3,7 @@
 require 'securerandom'
 
 module QA
-  RSpec.describe 'Package', :orchestrated, :packages do
+  RSpec.describe 'Package', :orchestrated, :packages, :object_storage do
     describe 'NuGet Repository' do
       include Runtime::Fixtures
       let(:project) do
diff --git a/qa/qa/specs/features/browser_ui/5_package/pypi_repository_spec.rb b/qa/qa/specs/features/browser_ui/5_package/pypi_repository_spec.rb
index f043ec3f078..a9034174cab 100644
--- a/qa/qa/specs/features/browser_ui/5_package/pypi_repository_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/pypi_repository_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Package', :orchestrated, :packages do
+  RSpec.describe 'Package', :orchestrated, :packages, :object_storage do
     describe 'PyPI Repository' do
       include Runtime::Fixtures
       let(:project) do
diff --git a/qa/qa/specs/features/browser_ui/5_package/rubygems_registry_spec.rb b/qa/qa/specs/features/browser_ui/5_package/rubygems_registry_spec.rb
index c06894147ab..530a3243766 100644
--- a/qa/qa/specs/features/browser_ui/5_package/rubygems_registry_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/rubygems_registry_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Package', :orchestrated, :requires_admin, :packages do
+  RSpec.describe 'Package', :orchestrated, :requires_admin, :packages, :object_storage do
     describe 'RubyGems Repository' do
       include Runtime::Fixtures