Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.rubocop_todo/lint/redundant_cop_disable_directive.yml

@@ -150,13 +150,6 @@ Lint/RedundantCopDisableDirective:
     - 'qa/qa/resource/user_runners.rb'
     - 'qa/qa/service/docker_run/gitlab_runner.rb'
     - 'qa/qa/vendor/one_password/cli.rb'
-    - 'scripts/failed_tests.rb'
-    - 'scripts/feature_flags/used-feature-flags'
-    - 'scripts/generate_rspec_pipeline.rb'
-    - 'scripts/merge-auto-explain-logs'
-    - 'scripts/security-harness'
-    - 'scripts/setup/generate-as-if-foss-env.rb'
-    - 'scripts/verify-tff-mapping'
     - 'spec/components/previews/pajamas/banner_component_preview.rb'
     - 'spec/features/groups/participants_autocomplete_spec.rb'
     - 'spec/features/merge_request/user_edits_mr_spec.rb'
@@ -195,11 +188,3 @@ Lint/RedundantCopDisableDirective:
     - 'spec/support/helpers/wait_for_requests.rb'
     - 'spec/support/shared_examples/features/milestone_editing_shared_examples.rb'
     - 'spec/support/shared_examples/models/concerns/protected_ref_access_shared_examples.rb'
-    - 'tooling/danger/ignored_model_columns.rb'
-    - 'tooling/danger/sidekiq_queues.rb'
-    - 'tooling/danger/stable_branch.rb'
-    - 'tooling/danger/suggestor.rb'
-    - 'tooling/lib/tooling/check_ruby_syntax.rb'
-    - 'tooling/lib/tooling/helm3_client.rb'
-    - 'tooling/lib/tooling/test_map_generator.rb'
-    - 'tooling/quality/test_level.rb'

app/assets/javascripts/ci/job_details/components/environments_block.vue

@@ -177,13 +177,13 @@ export default {
 };
 </script>
 <template>
-  <div class="gl-mb-3 gl-mt-3" data-testid="jobs-environment-container">
+  <div class="gl-my-4" data-testid="jobs-environment-container">
     <div
-      class="gl-border gl-rounded-base gl-px-5 gl-pb-4 gl-pt-3"
+      class="gl-border gl-flex gl-gap-3 gl-rounded-base gl-bg-subtle gl-p-4"
       data-testid="jobs-environment-info"
     >
       <ci-icon :status="iconStatus" />
-      <p class="gl-mb-0 gl-inline-block">
+      <p class="gl-mb-0 gl-inline-block gl-self-center">
         <gl-sprintf :message="environment">
           <template #environmentLink>
             <gl-link

app/assets/javascripts/ci/runner/group_new_runner/group_new_runner_app.vue

@@ -4,6 +4,7 @@ import { visitUrl } from '~/lib/utils/url_utility';
 import { s__ } from '~/locale';
 import { InternalEvents } from '~/tracking';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
+import PageHeading from '~/vue_shared/components/page_heading.vue';
 import RunnerCreateForm from '~/ci/runner/components/runner_create_form.vue';
 import { DEFAULT_PLATFORM, GROUP_TYPE } from '../constants';
 import { saveAlertToLocalStorage } from '../local_storage_alert/save_alert_to_local_storage';
@@ -12,6 +13,7 @@ export default {
   name: 'GroupNewRunnerApp',
   components: {
     RunnerCreateForm,
+    PageHeading,
   },
   mixins: [glFeatureFlagsMixin(), InternalEvents.mixin()],
   props: {
@@ -44,18 +46,16 @@ export default {
 </script>
 
 <template>
-  <div class="gl-mt-5">
-    <h1 class="gl-heading-1">{{ s__('Runners|New group runner') }}</h1>
-
-    <p>
-      {{
-        s__(
-          'Runners|Create a group runner to generate a command that registers the runner with all its configurations.',
-        )
-      }}
-    </p>
-
-    <hr aria-hidden="true" />
+  <div>
+    <page-heading :heading="s__('Runners|New group runner')">
+      <template #description>
+        {{
+          s__(
+            'Runners|Create a group runner to generate a command that registers the runner with all its configurations.',
+          )
+        }}
+      </template>
+    </page-heading>
 
     <runner-create-form
       :runner-type="$options.GROUP_TYPE"

app/assets/javascripts/ci/runner/project_new_runner/project_new_runner_app.vue

@@ -4,6 +4,7 @@ import { visitUrl } from '~/lib/utils/url_utility';
 import { s__ } from '~/locale';
 import { InternalEvents } from '~/tracking';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
+import PageHeading from '~/vue_shared/components/page_heading.vue';
 import RunnerCreateForm from '~/ci/runner/components/runner_create_form.vue';
 import { DEFAULT_PLATFORM, GOOGLE_CLOUD_PLATFORM, PROJECT_TYPE } from '../constants';
 import { saveAlertToLocalStorage } from '../local_storage_alert/save_alert_to_local_storage';
@@ -12,6 +13,7 @@ export default {
   name: 'ProjectNewRunnerApp',
   components: {
     RunnerCreateForm,
+    PageHeading,
   },
   mixins: [glFeatureFlagsMixin(), InternalEvents.mixin()],
   props: {
@@ -45,18 +47,16 @@ export default {
 </script>
 
 <template>
-  <div class="gl-mt-5">
-    <h1 class="gl-heading-1">{{ s__('Runners|New project runner') }}</h1>
-
-    <p>
-      {{
-        s__(
-          'Runners|Create a project runner to generate a command that registers the runner with all its configurations.',
-        )
-      }}
-    </p>
-
-    <hr aria-hidden="true" />
+  <div>
+    <page-heading :heading="s__('Runners|New project runner')">
+      <template #description>
+        {{
+          s__(
+            'Runners|Create a project runner to generate a command that registers the runner with all its configurations.',
+          )
+        }}
+      </template>
+    </page-heading>
 
     <runner-create-form
       :runner-type="$options.PROJECT_TYPE"

app/controllers/repositories/lfs_api_controller.rb

@@ -78,25 +78,6 @@ def download_objects!
       objects
     end
 
-    def legacy_download_objects!
-      existing_oids = project.lfs_objects_oids(oids: objects_oids)
-
-      objects.each do |object|
-        if existing_oids.include?(object[:oid])
-          object[:actions] = proxy_download_actions(object)
-
-          object[:authenticated] = true if ::Users::Anonymous.can?(:download_code, project)
-        else
-          object[:error] = {
-            code: 404,
-            message: _("Object does not exist on the server or you don't have permissions to access it")
-          }
-        end
-      end
-
-      objects
-    end
-
     def upload_objects!
       existing_oids = project.lfs_objects_oids(oids: objects_oids)
 

danger/tailwindcss/Dangerfile

@@ -34,7 +34,7 @@ You can only restore a backup to **exactly the same version and type (CE or EE)*
 of GitLab on which it was created. For example, CE 15.1.4.
 
 If your backup is a different version than the current installation, you must
-[downgrade](../../update/package/downgrade.md) or [upgrade](../../update/package/index.md#upgrade-to-a-specific-version-using-the-official-repositories) your GitLab installation
+[downgrade](../../update/package/downgrade.md) or [upgrade](../../update/package/index.md#upgrade-to-a-specific-version) your GitLab installation
 before restoring the backup.
 
 ### GitLab secrets must be restored