Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.rubocop_todo/layout/line_length.yml

@@ -564,7 +564,6 @@ Layout/LineLength:
     - 'ee/app/models/concerns/approver_migrate_hook.rb'
     - 'ee/app/models/concerns/ee/issuable_link.rb'
     - 'ee/app/models/concerns/elastic/application_versioned_search.rb'
-    - 'ee/app/models/concerns/elastic/repositories_search.rb'
     - 'ee/app/models/concerns/geo/verification_state.rb'
     - 'ee/app/models/concerns/geo/verification_state_definition.rb'
     - 'ee/app/models/concerns/issue_widgets/acts_like_requirement.rb'
@@ -1422,7 +1421,6 @@ Layout/LineLength:
     - 'ee/spec/models/namespace_setting_spec.rb'
     - 'ee/spec/models/packages/package_file_spec.rb'
     - 'ee/spec/models/project_import_data_spec.rb'
-    - 'ee/spec/models/project_import_state_spec.rb'
     - 'ee/spec/models/protected_environment_spec.rb'
     - 'ee/spec/models/protected_environments/approval_rule_spec.rb'
     - 'ee/spec/models/release_highlight_spec.rb'
@@ -1687,7 +1685,6 @@ Layout/LineLength:
     - 'ee/spec/services/ee/system_notes/issuables_service_spec.rb'
     - 'ee/spec/services/ee/users/destroy_service_spec.rb'
     - 'ee/spec/services/ee/users/update_service_spec.rb'
-    - 'ee/spec/services/elastic/process_initial_bookkeeping_service_spec.rb'
     - 'ee/spec/services/epics/issue_promote_service_spec.rb'
     - 'ee/spec/services/epics/update_service_spec.rb'
     - 'ee/spec/services/external_status_checks/update_service_spec.rb'

.rubocop_todo/lint/symbol_conversion.yml

@@ -53,7 +53,6 @@ Lint/SymbolConversion:
     - 'ee/spec/helpers/push_rules_helper_spec.rb'
     - 'ee/spec/models/concerns/elastic/repository_spec.rb'
     - 'ee/spec/models/plan_spec.rb'
-    - 'ee/spec/models/project_feature_spec.rb'
     - 'ee/spec/requests/api/dependency_proxy/packages/npm_spec.rb'
     - 'ee/spec/services/phone_verification/users/send_verification_code_service_spec.rb'
     - 'ee/spec/support/matchers/ee/epic_aggregate_matchers.rb'

.rubocop_todo/performance/string_identifier_argument.yml

@@ -58,13 +58,10 @@ Performance/StringIdentifierArgument:
     - 'ee/spec/lib/ee/gitlab/hook_data/merge_request_builder_spec.rb'
     - 'ee/spec/lib/ee/sidebars/projects/menus/packages_registries_menu_spec.rb'
     - 'ee/spec/lib/gitlab/insights/reducers/count_per_period_reducer_spec.rb'
-    - 'ee/spec/models/concerns/elastic/projects_search_spec.rb'
-    - 'ee/spec/models/concerns/elastic/repositories_search_spec.rb'
     - 'ee/spec/models/ee/namespace_spec.rb'
     - 'ee/spec/models/ee/project_spec.rb'
     - 'ee/spec/models/gitlab_subscription_spec.rb'
     - 'ee/spec/models/namespace_setting_spec.rb'
-    - 'ee/spec/models/project_feature_spec.rb'
     - 'ee/spec/models/project_import_data_spec.rb'
     - 'ee/spec/policies/audit_events/group/namespace_filter_policy_spec.rb'
     - 'ee/spec/policies/project_policy_spec.rb'
@@ -74,7 +71,6 @@ Performance/StringIdentifierArgument:
     - 'ee/spec/requests/api/issues_spec.rb'
     - 'ee/spec/requests/ee/omniauth_callbacks_controller_spec.rb'
     - 'ee/spec/services/dependency_proxy/packages/settings/update_service_spec.rb'
-    - 'ee/spec/services/elastic/process_initial_bookkeeping_service_spec.rb'
     - 'ee/spec/services/vulnerabilities/manually_create_service_spec.rb'
     - 'ee/spec/support/helpers/search_results_helpers.rb'
     - 'ee/spec/support/shared_examples/features/protected_branches_access_control_shared_examples.rb'

.rubocop_todo/rspec/be_eq.yml

@@ -269,7 +269,6 @@ RSpec/BeEq:
     - 'ee/spec/models/onboarding/progress_spec.rb'
     - 'ee/spec/models/onboarding_spec.rb'
     - 'ee/spec/models/product_analytics/funnel_spec.rb'
-    - 'ee/spec/models/project_feature_spec.rb'
     - 'ee/spec/models/projects/all_protected_branches_rule_spec.rb'
     - 'ee/spec/models/push_rule_spec.rb'
     - 'ee/spec/models/requirements_management/requirement_spec.rb'

.rubocop_todo/rspec/context_wording.yml

@@ -441,7 +441,6 @@ RSpec/ContextWording:
     - 'ee/spec/models/packages/package_file_spec.rb'
     - 'ee/spec/models/path_lock_spec.rb'
     - 'ee/spec/models/project_import_data_spec.rb'
-    - 'ee/spec/models/project_import_state_spec.rb'
     - 'ee/spec/models/protected_environment_spec.rb'
     - 'ee/spec/models/push_rule_spec.rb'
     - 'ee/spec/models/release_highlight_spec.rb'
@@ -619,7 +618,6 @@ RSpec/ContextWording:
     - 'ee/spec/services/ee/boards/lists/create_service_spec.rb'
     - 'ee/spec/services/ee/ci/create_pipeline_service_spec.rb'
     - 'ee/spec/services/ee/ci/job_artifacts/destroy_batch_service_spec.rb'
-    - 'ee/spec/services/ee/git/branch_push_service_spec.rb'
     - 'ee/spec/services/ee/groups/autocomplete_service_spec.rb'
     - 'ee/spec/services/ee/integrations/test/project_service_spec.rb'
     - 'ee/spec/services/ee/ip_restrictions/update_service_spec.rb'

.rubocop_todo/rspec/dialect.yml

@@ -12,7 +12,6 @@ RSpec/Dialect:
     - 'ee/spec/models/gitlab_subscriptions/features_spec.rb'
     - 'ee/spec/models/license_spec.rb'
     - 'ee/spec/models/merge_request_spec.rb'
-    - 'ee/spec/models/project_feature_spec.rb'
     - 'ee/spec/models/work_items/type_spec.rb'
     - 'ee/spec/policies/project_policy_spec.rb'
     - 'ee/spec/requests/api/epic_boards_spec.rb'

.rubocop_todo/rspec/example_without_description.yml

@@ -174,7 +174,6 @@ RSpec/ExampleWithoutDescription:
     - 'ee/spec/services/ci/pipeline_creation/drop_secrets_provider_not_found_builds_service_spec.rb'
     - 'ee/spec/services/ci/register_job_service_spec.rb'
     - 'ee/spec/services/compliance_management/standards/soc2/at_least_one_non_author_approval_service_spec.rb'
-    - 'ee/spec/services/ee/git/branch_push_service_spec.rb'
     - 'ee/spec/services/ee/issues/update_service_spec.rb'
     - 'ee/spec/services/ee/members/create_service_spec.rb'
     - 'ee/spec/services/ee/merge_requests/post_merge_service_spec.rb'
@@ -215,7 +214,6 @@ RSpec/ExampleWithoutDescription:
     - 'ee/spec/views/trial_registrations/new.html.haml_spec.rb'
     - 'ee/spec/workers/active_user_count_threshold_worker_spec.rb'
     - 'ee/spec/workers/compliance_management/update_default_framework_worker_spec.rb'
-    - 'ee/spec/workers/concurrency_limit/resume_worker_spec.rb'
     - 'ee/spec/workers/ee/ci/build_finished_worker_spec.rb'
     - 'ee/spec/workers/gitlab_subscriptions/member_management/apply_pending_member_approvals_worker_spec.rb'
     - 'ee/spec/workers/gitlab_subscriptions/members/record_last_activity_worker_spec.rb'

.rubocop_todo/rspec/expect_change.yml

@@ -30,7 +30,6 @@ RSpec/ExpectChange:
     - 'ee/spec/models/gitlab_subscription_spec.rb'
     - 'ee/spec/models/group_wiki_spec.rb'
     - 'ee/spec/models/incident_management/issuable_escalation_status_spec.rb'
-    - 'ee/spec/models/project_import_state_spec.rb'
     - 'ee/spec/models/push_rule_spec.rb'
     - 'ee/spec/models/security/orchestration_policy_configuration_spec.rb'
     - 'ee/spec/models/upload_spec.rb'

.rubocop_todo/rspec/expect_in_hook.yml

@@ -40,7 +40,6 @@ RSpec/ExpectInHook:
     - 'ee/spec/models/ee/project_spec.rb'
     - 'ee/spec/models/gitlab_subscription_spec.rb'
     - 'ee/spec/models/license_spec.rb'
-    - 'ee/spec/models/project_import_state_spec.rb'
     - 'ee/spec/presenters/group_member_presenter_spec.rb'
     - 'ee/spec/requests/api/geo_spec.rb'
     - 'ee/spec/requests/api/internal/base_spec.rb'

.rubocop_todo/rspec/named_subject.yml

@@ -486,7 +486,6 @@ RSpec/NamedSubject:
     - 'ee/spec/models/compliance_management/framework_spec.rb'
     - 'ee/spec/models/concerns/approval_rule_like_spec.rb'
     - 'ee/spec/models/concerns/ee/packages/downloadable_spec.rb'
-    - 'ee/spec/models/concerns/elastic/projects_search_spec.rb'
     - 'ee/spec/models/concerns/geo/has_replicator_spec.rb'
     - 'ee/spec/models/concerns/geo/replicable_model_spec.rb'
     - 'ee/spec/models/concerns/geo/verifiable_model_spec.rb'
@@ -585,7 +584,6 @@ RSpec/NamedSubject:
     - 'ee/spec/models/packages/package_file_spec.rb'
     - 'ee/spec/models/product_analytics/dashboard_spec.rb'
     - 'ee/spec/models/product_analytics/visualization_spec.rb'
-    - 'ee/spec/models/project_feature_spec.rb'
     - 'ee/spec/models/projects/all_protected_branches_rule_spec.rb'
     - 'ee/spec/models/projects/target_branch_rule_spec.rb'
     - 'ee/spec/models/protected_environment_spec.rb'
@@ -857,7 +855,6 @@ RSpec/NamedSubject:
     - 'ee/spec/services/ee/ci/job_artifacts/destroy_all_expired_service_spec.rb'
     - 'ee/spec/services/ee/ci/job_artifacts/destroy_batch_service_spec.rb'
     - 'ee/spec/services/ee/deployments/update_environment_service_spec.rb'
-    - 'ee/spec/services/ee/git/branch_push_service_spec.rb'
     - 'ee/spec/services/ee/gpg_keys/create_service_spec.rb'
     - 'ee/spec/services/ee/gpg_keys/destroy_service_spec.rb'
     - 'ee/spec/services/ee/groups/autocomplete_service_spec.rb'

.rubocop_todo/rspec/receive_messages.yml

@@ -98,7 +98,6 @@ RSpec/ReceiveMessages:
     - 'ee/spec/models/merge_request_spec.rb'
     - 'ee/spec/models/merge_trains/train_spec.rb'
     - 'ee/spec/models/namespace_setting_spec.rb'
-    - 'ee/spec/models/project_feature_spec.rb'
     - 'ee/spec/models/security/scan_result_policy_read_spec.rb'
     - 'ee/spec/policies/issue_policy_spec.rb'
     - 'ee/spec/presenters/ci/minutes/usage_presenter_spec.rb'

.rubocop_todo/style/redundant_self.yml

@@ -167,7 +167,6 @@ Style/RedundantSelf:
     - 'ee/app/models/ee/issue.rb'
     - 'ee/app/models/ee/member.rb'
     - 'ee/app/models/ee/project.rb'
-    - 'ee/app/models/ee/project_import_state.rb'
     - 'ee/app/models/ee/snippet_repository.rb'
     - 'ee/app/models/ee/user.rb'
     - 'ee/app/models/geo/base_registry.rb'

app/finders/autocomplete/group_users_finder.rb

@@ -12,8 +12,11 @@ module Autocomplete
   class GroupUsersFinder
     include Gitlab::Utils::StrongMemoize
 
-    def initialize(group:)
+    attr_reader :group, :current_user
+
+    def initialize(group:, current_user:)
       @group = group
+      @current_user = current_user
     end
 
     def execute
@@ -67,7 +70,7 @@ def members_from_descendant_project_shares
     end
 
     def group_hierarchy_cte
-      Gitlab::SQL::CTE.new(:group_hierarchy, @group.self_and_hierarchy.select(:id))
+      Gitlab::SQL::CTE.new(:group_hierarchy, group.self_and_hierarchy.select(:id))
     end
     strong_memoize_attr :group_hierarchy_cte
 
@@ -76,7 +79,7 @@ def group_hierarchy_ids
     end
 
     def descendant_projects_cte
-      Gitlab::SQL::CTE.new(:descendant_projects, @group.all_projects.select(:id))
+      Gitlab::SQL::CTE.new(:descendant_projects, group.all_projects.select(:id))
     end
     strong_memoize_attr :descendant_projects_cte
 
@@ -85,3 +88,5 @@ def descendant_project_ids
     end
   end
 end
+
+Autocomplete::GroupUsersFinder.prepend_mod_with('Autocomplete::GroupUsersFinder')

app/finders/autocomplete/users_finder.rb

@@ -91,7 +91,7 @@ def find_users
       if project
         project_users
       elsif group
-        ::Autocomplete::GroupUsersFinder.new(group: group).execute # rubocop: disable CodeReuse/Finder
+        ::Autocomplete::GroupUsersFinder.new(group: group, current_user: current_user).execute # rubocop: disable CodeReuse/Finder
       elsif current_user
         User.all
       else

app/finders/users_finder.rb

@@ -67,7 +67,7 @@ def base_scope
     if group
       raise Gitlab::Access::AccessDeniedError unless user_can_read_group?(group)
 
-      scope = ::Autocomplete::GroupUsersFinder.new(group: group).execute # rubocop: disable CodeReuse/Finder -- For SQL optimization sake we need to scope out group members first see: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137647#note_1664081899
+      scope = ::Autocomplete::GroupUsersFinder.new(group: group, current_user: current_user).execute # rubocop: disable CodeReuse/Finder -- For SQL optimization sake we need to scope out group members first see: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137647#note_1664081899
     else
       scope = current_user&.can_admin_all_resources? ? User.all : User.without_forbidden_states
     end

app/services/groups/participants_service.rb

@@ -30,7 +30,7 @@ def all_members
     def group_hierarchy_users
       return [] unless group
 
-      relation = Autocomplete::GroupUsersFinder.new(group: group).execute
+      relation = Autocomplete::GroupUsersFinder.new(group: group, current_user: current_user).execute
 
       filter_and_sort_users(relation)
     end

bin/rspec-stackprof

@@ -16,12 +16,12 @@ defaults = {
 }
 
 options = {
-  mode: ENV.fetch('MODE', defaults[:mode]) || defaults[:mode],
-  interval: ENV['INTERVAL'],
-  limit: ENV.fetch('LIMIT', nil) || defaults[:limit],
-  raw: ENV.fetch('RAW', false) === 'true' || defaults[:raw],
-  output: ENV.fetch('OUTPUT', nil),
-  speedscope: ENV.fetch('SPEEDSCOPE', false) === 'true' || defaults[:speedscope]
+  mode: defaults[:mode],
+  interval: nil,
+  limit: defaults[:limit],
+  raw: defaults[:raw],
+  output: nil,
+  speedscope: defaults[:speedscope]
 }
 
 OptionParser.new do |opt|

doc/.vale/gitlab_base/Uppercase.yml

@@ -173,6 +173,7 @@ exceptions:
   - PHP
   - PID
   - PKCS
+  - PMD
   - PNG
   - POSIX
   - POST