Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.rubocop_todo/rake/require.yml

@@ -3,7 +3,6 @@ Rake/Require:
   Details: grace period
   Exclude:
     - 'lib/tasks/gitlab/assets.rake'
-    - 'lib/tasks/gitlab/dependency_proxy/migrate.rake'
     - 'lib/tasks/gitlab/docs/redirect.rake'
     - 'lib/tasks/gitlab/graphql.rake'
     - 'lib/tasks/gitlab/lfs/migrate.rake'

app/assets/javascripts/pipelines/pipeline_tabs.js

@@ -34,6 +34,7 @@ export const createAppOptions = (selector, apolloProvider, router) => {
     totalJobCount,
     licenseManagementApiUrl,
     licenseManagementSettingsPath,
+    licenseScanCount,
     licensesApiPath,
     canManageLicenses,
     summaryEndpoint,
@@ -87,6 +88,7 @@ export const createAppOptions = (selector, apolloProvider, router) => {
       totalJobCount,
       licenseManagementApiUrl,
       licenseManagementSettingsPath,
+      licenseScanCount,
       licensesApiPath,
       canManageLicenses: parseBoolean(canManageLicenses),
       summaryEndpoint,

app/assets/javascripts/related_issues/constants.js

@@ -1,5 +1,5 @@
 import { __, sprintf } from '~/locale';
-import { TYPE_ISSUE } from '~/issues/constants';
+import { TYPE_EPIC, TYPE_ISSUE } from '~/issues/constants';
 
 export const issuableTypesMap = {
   ISSUE: 'issue',
@@ -32,7 +32,7 @@ export const autoCompleteTextMap = {
       { emphasisStart: '<', emphasisEnd: '>' },
       false,
     ),
-    [issuableTypesMap.EPIC]: sprintf(
+    [TYPE_EPIC]: sprintf(
       __(' or %{emphasisStart}&epic id%{emphasisEnd}'),
       { emphasisStart: '<', emphasisEnd: '>' },
       false,
@@ -45,32 +45,32 @@ export const autoCompleteTextMap = {
   },
   false: {
     [TYPE_ISSUE]: '',
-    [issuableTypesMap.EPIC]: '',
+    [TYPE_EPIC]: '',
     [issuableTypesMap.MERGE_REQUEST]: __(' or references'),
   },
 };
 
 export const inputPlaceholderTextMap = {
   [TYPE_ISSUE]: __('Paste issue link'),
   [issuableTypesMap.INCIDENT]: __('Paste link'),
-  [issuableTypesMap.EPIC]: __('Paste epic link'),
+  [TYPE_EPIC]: __('Paste epic link'),
   [issuableTypesMap.MERGE_REQUEST]: __('Enter merge request URLs'),
 };
 
 export const inputPlaceholderConfidentialTextMap = {
   [TYPE_ISSUE]: __('Paste confidential issue link'),
-  [issuableTypesMap.EPIC]: __('Paste confidential epic link'),
+  [TYPE_EPIC]: __('Paste confidential epic link'),
   [issuableTypesMap.MERGE_REQUEST]: __('Enter merge request URLs'),
 };
 
 export const relatedIssuesRemoveErrorMap = {
   [TYPE_ISSUE]: __('An error occurred while removing issues.'),
-  [issuableTypesMap.EPIC]: __('An error occurred while removing epics.'),
+  [TYPE_EPIC]: __('An error occurred while removing epics.'),
 };
 
 export const pathIndeterminateErrorMap = {
   [TYPE_ISSUE]: __('We could not determine the path to remove the issue'),
-  [issuableTypesMap.EPIC]: __('We could not determine the path to remove the epic'),
+  [TYPE_EPIC]: __('We could not determine the path to remove the epic'),
 };
 
 export const itemAddFailureTypesMap = {
@@ -80,7 +80,7 @@ export const itemAddFailureTypesMap = {
 
 export const addRelatedIssueErrorMap = {
   [TYPE_ISSUE]: __('Issue cannot be found.'),
-  [issuableTypesMap.EPIC]: __('Epic cannot be found.'),
+  [TYPE_EPIC]: __('Epic cannot be found.'),
 };
 
 export const addRelatedItemErrorMap = {
@@ -97,7 +97,7 @@ export const addRelatedItemErrorMap = {
 export const issuableIconMap = {
   [TYPE_ISSUE]: 'issues',
   [issuableTypesMap.INCIDENT]: 'issues',
-  [issuableTypesMap.EPIC]: 'epic',
+  [TYPE_EPIC]: 'epic',
 };
 
 export const PathIdSeparator = {
@@ -108,28 +108,28 @@ export const PathIdSeparator = {
 export const issuablesBlockHeaderTextMap = {
   [TYPE_ISSUE]: __('Linked items'),
   [issuableTypesMap.INCIDENT]: __('Linked incidents or issues'),
-  [issuableTypesMap.EPIC]: __('Linked epics'),
+  [TYPE_EPIC]: __('Linked epics'),
 };
 
 export const issuablesBlockHelpTextMap = {
   [TYPE_ISSUE]: __('Learn more about linking issues'),
   [issuableTypesMap.INCIDENT]: __('Learn more about linking issues and incidents'),
-  [issuableTypesMap.EPIC]: __('Learn more about linking epics'),
+  [TYPE_EPIC]: __('Learn more about linking epics'),
 };
 
 export const issuablesBlockAddButtonTextMap = {
   [TYPE_ISSUE]: __('Add a related issue'),
-  [issuableTypesMap.EPIC]: __('Add a related epic'),
+  [TYPE_EPIC]: __('Add a related epic'),
 };
 
 export const issuablesFormCategoryHeaderTextMap = {
   [TYPE_ISSUE]: __('The current issue'),
   [issuableTypesMap.INCIDENT]: __('The current incident'),
-  [issuableTypesMap.EPIC]: __('The current epic'),
+  [TYPE_EPIC]: __('The current epic'),
 };
 
 export const issuablesFormInputTextMap = {
   [TYPE_ISSUE]: __('the following issues'),
   [issuableTypesMap.INCIDENT]: __('the following incidents or issues'),
-  [issuableTypesMap.EPIC]: __('the following epics'),
+  [TYPE_EPIC]: __('the following epics'),
 };

app/assets/javascripts/search/sidebar/components/language_filter.vue

@@ -31,9 +31,6 @@ export default {
   computed: {
     ...mapState(['aggregations', 'sidebarDirty']),
     ...mapGetters(['langugageAggregationBuckets']),
-    ffBasedXPadding() {
-      return this.glFeatures.searchPageVerticalNav ? 'gl-px-5' : 'gl-px-0';
-    },
     hasBuckets() {
       return this.langugageAggregationBuckets.length > 0;
     },
@@ -87,7 +84,7 @@ export default {
       class="gl-overflow-x-hidden gl-overflow-y-auto"
       :class="{ 'language-filter-max-height': showAll }"
     >
-      <checkbox-filter :class="ffBasedXPadding" :filter-data="filtersData" />
+      <checkbox-filter class="gl-px-5" :filter-data="filtersData" />
       <span v-if="showAll && hasOverMax" data-testid="has-over-max-text">{{
         $options.i18n.showingMax
       }}</span>
@@ -109,7 +106,7 @@ export default {
     </div>
     <div v-if="!aggregations.error">
       <hr :class="$options.HR_DEFAULT_CLASSES" />
-      <div class="gl-display-flex gl-align-items-center gl-mt-4 gl-mx-5" :class="ffBasedXPadding">
+      <div class="gl-display-flex gl-align-items-center gl-mt-4 gl-mx-5 gl-px-5">
         <gl-button
           category="primary"
           variant="confirm"

app/controllers/projects_controller.rb

@@ -228,7 +228,16 @@ def housekeeping
              :eager
            end
 
-    ::Repositories::HousekeepingService.new(@project, task).execute
+    ::Repositories::HousekeepingService.new(@project, task).execute do
+      ::Gitlab::Audit::Auditor.audit(
+        name: 'manually_trigger_housekeeping',
+        author: current_user,
+        scope: @project,
+        target: @project,
+        message: "Housekeeping task: #{task}",
+        created_at: DateTime.current
+      )
+    end
 
     redirect_to(
       project_path(@project),

app/finders/fork_targets_finder.rb

@@ -7,8 +7,6 @@ def initialize(project, user)
   end
 
   def execute(options = {})
-    return previous_execute(options) unless Feature.enabled?(:searchable_fork_targets)
-
     items = fork_targets(options)
 
     by_search(items, options)
@@ -31,14 +29,6 @@ def fork_targets(options)
       user.forkable_namespaces.sort_by_type
     end
   end
-
-  # rubocop: disable CodeReuse/ActiveRecord
-  def previous_execute(options = {})
-    return ::Namespace.where(id: user.forkable_namespaces).sort_by_type unless options[:only_groups]
-
-    ::Group.where(id: user.manageable_groups(include_groups_with_developer_maintainer_access: true))
-  end
-  # rubocop: enable CodeReuse/ActiveRecord
 end
 
 ForkTargetsFinder.prepend_mod_with('ForkTargetsFinder')

app/finders/groups_finder.rb

@@ -13,6 +13,7 @@
 #     min_access_level: integer
 #     search: string
 #     exclude_group_ids: array of integers
+#     filter_group_ids: array of integers - only include groups from the specified list of ids
 #     include_parent_descendants: boolean (defaults to false) - includes descendant groups when
 #                                 filtering by parent. The parent param must be present.
 #     include_ancestors: boolean (defaults to true)
@@ -34,6 +35,7 @@ def execute
     items = all_groups.map do |item|
       item = by_parent(item)
       item = by_custom_attributes(item)
+      item = filter_group_ids(item)
       item = exclude_group_ids(item)
       item = by_search(item)
 
@@ -90,6 +92,12 @@ def exclude_group_ids(groups)
     groups.id_not_in(params[:exclude_group_ids])
   end
 
+  def filter_group_ids(groups)
+    return groups unless params[:filter_group_ids]
+
+    groups.id_in(params[:filter_group_ids])
+  end
+
   # rubocop: disable CodeReuse/ActiveRecord
   def by_parent(groups)
     return groups unless params[:parent]

app/graphql/types/packages/package_details_type.rb

@@ -28,6 +28,8 @@ class PackageDetailsType < PackageType
 
       field :last_downloaded_at, Types::TimeType, null: true, description: 'Last time that a file of this package was downloaded.'
 
+      field :public_package, GraphQL::Types::Boolean, null: true, description: 'Indicates if there is public access to the package.'
+
       def versions
         object.versions
       end
@@ -63,6 +65,10 @@ def pypi_setup_url
       def pypi_url
         pypi_registry_url(object.project.id)
       end
+
+      def public_package
+        object.project.public? || object.project.project_feature.package_registry_access_level == ProjectFeature::PUBLIC
+      end
     end
   end
 end

app/models/merge_request.rb

@@ -2080,7 +2080,11 @@ def expire_etag_cache
   end
 
   def report_type_enabled?(report_type)
-    !!actual_head_pipeline&.batch_lookup_report_artifact_for_file_type(report_type)
+    if report_type == :license_scanning
+      ::Gitlab::LicenseScanning.scanner_for_pipeline(project, actual_head_pipeline).has_data?
+    else
+      !!actual_head_pipeline&.batch_lookup_report_artifact_for_file_type(report_type)
+    end
   end
 end
 

app/views/groups/edit.html.haml

@@ -28,6 +28,7 @@
   .settings-content
     = render 'groups/settings/permissions'
 
+= render_if_exists 'groups/merge_requests', expanded: expanded, group: @group
 = render_if_exists 'groups/merge_request_approval_settings', expanded: expanded, group: @group, user: current_user
 = render_if_exists 'groups/insights', expanded: expanded
 = render_if_exists 'groups/analytics_dashboards', expanded: expanded

app/views/projects/_merge_request_pipelines_and_threads_options.html.haml

@@ -1,13 +1,13 @@
 - form = local_assigns.fetch(:form)
 
 = form.gitlab_ui_checkbox_component :only_allow_merge_if_pipeline_succeeds,
-  s_('ProjectSettings|Pipelines must succeed'),
-  help_text: s_("ProjectSettings|Merge requests can't be merged if the latest pipeline did not succeed or is still running.")
+  s_('MergeChecks|Pipelines must succeed'),
+  help_text: s_("MergeChecks|Merge requests can't be merged if the latest pipeline did not succeed or is still running.")
 .gl-pl-6
   = form.gitlab_ui_checkbox_component :allow_merge_on_skipped_pipeline,
-    s_('ProjectSettings|Skipped pipelines are considered successful'),
-    help_text: s_('ProjectSettings|Introduces the risk of merging changes that do not pass the pipeline.'),
+    s_('MergeChecks|Skipped pipelines are considered successful'),
+    help_text: s_('MergeChecks|Introduces the risk of merging changes that do not pass the pipeline.'),
     checkbox_options: { class: 'gl-pl-6' }
 = form.gitlab_ui_checkbox_component :only_allow_merge_if_all_discussions_are_resolved,
-  s_('ProjectSettings|All threads must be resolved'),
-  checkbox_options: { data: { qa_selector: 'allow_merge_if_all_discussions_are_resolved_checkbox' } }
+  s_('MergeChecks|All threads must be resolved'),
+  checkbox_options: { data: { qa_selector: 'only_allow_merge_if_all_discussions_are_resolved_checkbox' } }

config/audit_events/types/manually_trigger_housekeeping.yml

@@ -0,0 +1,9 @@
+---
+name: manually_trigger_housekeeping
+description: Triggered when manually triggering housekeeping via api or admin UI
+introduced_by_issue: https://gitlab.com/gitlab-org/gitlab/-/issues/390761
+introduced_by_mr: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112095
+feature_category: source_code_management
+milestone: '15.9'
+saved_to_database: true
+streamed: true

config/feature_flags/development/searchable_fork_targets.yml

@@ -1,3 +1,5 @@
 # frozen_string_literal: true
 
+require_relative '../../lib/gitlab/i18n'
+
 Gitlab::I18n.setup(domain: 'gitlab', default_locale: :en)

config/initializers_before_autoloader/001_fast_gettext.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class PrepareAsyncForeignKeyValidationForCiBuildReportResults < Gitlab::Database::Migration[2.1]
+  TABLE_NAME = :ci_build_report_results
+  COLUMN_NAMES = [:partition_id, :build_id]
+  FOREIGN_KEY_NAME = :fk_rails_16cb1ff064_p
+
+  def up
+    prepare_async_foreign_key_validation(TABLE_NAME, COLUMN_NAMES, name: FOREIGN_KEY_NAME)
+  end
+
+  def down
+    unprepare_async_foreign_key_validation(TABLE_NAME, COLUMN_NAMES, name: FOREIGN_KEY_NAME)
+  end
+end

db/post_migrate/20230216052103_prepare_async_foreign_key_validation_for_ci_build_report_results.rb

@@ -0,0 +1 @@
+f6520e0b7cda276b7cf198bcbb0be4425c844a88d38118740675b639dbc73694

db/schema_migrations/20230216052103

@@ -1025,7 +1025,7 @@ Particular attention should be shown to:
 
    WARNING:
    If you have existing data stored on the default Gitaly storage,
-   you should [migrate the data your Gitaly Cluster storage](index.md#migrate-to-gitaly-cluster)
+   you should [migrate the data to your Gitaly Cluster storage](index.md#migrate-to-gitaly-cluster)
    first.
 
    ```ruby

doc/administration/gitaly/praefect.md

@@ -4,7 +4,7 @@ group: Project Management
 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
 ---
 
-# Kroki diagrams **(FREE SELF)**
+# Kroki **(FREE SELF)**
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/241744) in GitLab 13.7.
 > - Support for reStructuredText and Textile documents [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/324766) in GitLab 13.12.

doc/administration/integration/kroki.md

@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference, howto
 ---
 
-# Mailgun and GitLab **(FREE SELF)**
+# Mailgun **(FREE SELF)**
 
 When you use Mailgun to send emails for your GitLab instance and [Mailgun](https://www.mailgun.com/)
 integration is enabled and configured in GitLab, you can receive their webhook for

doc/administration/integration/mailgun.md

@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
 type: reference, howto
 ---
 
-# PlantUML and GitLab **(FREE)**
+# PlantUML **(FREE)**
 
 When the [PlantUML](https://plantuml.com) integration is enabled and configured in
 GitLab, you can create diagrams in snippets, wikis, and repositories. This integration

doc/administration/integration/plantuml.md

@@ -184,8 +184,8 @@ Updates to example must be made at:
    ## Set number of Sidekiq queue processes to the same number as available CPUs
    sidekiq['queue_groups'] = ['*'] * 4
 
-   ## Set number of Sidekiq threads per queue process to the recommend number of 10
-   sidekiq['max_concurrency'] = 10
+   ## Set number of Sidekiq threads per queue process to the recommend number of 20
+   sidekiq['max_concurrency'] = 20
    ```
 
 1. Copy the `/etc/gitlab/gitlab-secrets.json` file from the GitLab instance and replace the file in the Sidekiq instance.