Add latest changes from gitlab-org/gitlab@master

9 files changed, 15 insertions, 15 deletions

diff --git a/.rubocop_todo/layout/empty_line_after_magic_comment.yml b/.rubocop_todo/layout/empty_line_after_magic_comment.yml
index 409acc4b5c1..ba08bc8ae08 100644
--- a/.rubocop_todo/layout/empty_line_after_magic_comment.yml
+++ b/.rubocop_todo/layout/empty_line_after_magic_comment.yml
@@ -312,9 +312,9 @@ Layout/EmptyLineAfterMagicComment:
     - 'ee/spec/models/ci/minutes/quota_spec.rb'
     - 'ee/spec/models/ci/minutes/usage_spec.rb'
     - 'ee/spec/models/deployments/approval_summary_spec.rb'
-    - 'ee/spec/models/group_member_spec.rb'
+    - 'ee/spec/models/ee/group_member_spec.rb'
     - 'ee/spec/models/packages/package_file_spec.rb'
-    - 'ee/spec/models/project_member_spec.rb'
+    - 'ee/spec/models/ee/project_member_spec.rb'
     - 'ee/spec/models/protected_environment_spec.rb'
     - 'ee/spec/models/protected_environments/approval_rule_spec.rb'
     - 'ee/spec/models/protected_environments/deploy_access_level_spec.rb'
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index 8cab670cc83..b8b267d6d86 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -1794,7 +1794,7 @@ Layout/LineLength:
     - 'ee/spec/models/geo_node_status_spec.rb'
     - 'ee/spec/models/gitlab_subscription_spec.rb'
     - 'ee/spec/models/gitlab_subscriptions/features_spec.rb'
-    - 'ee/spec/models/group_member_spec.rb'
+    - 'ee/spec/models/ee/group_member_spec.rb'
     - 'ee/spec/models/historical_data_spec.rb'
     - 'ee/spec/models/incident_management/escalation_policy_spec.rb'
     - 'ee/spec/models/incident_management/escalation_rule_spec.rb'
@@ -1807,7 +1807,7 @@ Layout/LineLength:
     - 'ee/spec/models/issue_spec.rb'
     - 'ee/spec/models/iteration_spec.rb'
     - 'ee/spec/models/license_spec.rb'
-    - 'ee/spec/models/member_spec.rb'
+    - 'ee/spec/models/ee/member_spec.rb'
     - 'ee/spec/models/merge_request_spec.rb'
     - 'ee/spec/models/merge_requests/compliance_violation_spec.rb'
     - 'ee/spec/models/merge_requests/external_status_check_spec.rb'
@@ -1816,7 +1816,7 @@ Layout/LineLength:
     - '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/project_member_spec.rb'
+    - 'ee/spec/models/ee/project_member_spec.rb'
     - 'ee/spec/models/project_security_setting_spec.rb'
     - 'ee/spec/models/protected_environment_spec.rb'
     - 'ee/spec/models/protected_environments/approval_rule_spec.rb'
diff --git a/.rubocop_todo/layout/space_inside_parens.yml b/.rubocop_todo/layout/space_inside_parens.yml
index 34f13f780fb..d044e48d7aa 100644
--- a/.rubocop_todo/layout/space_inside_parens.yml
+++ b/.rubocop_todo/layout/space_inside_parens.yml
@@ -35,7 +35,7 @@ Layout/SpaceInsideParens:
     - 'ee/spec/models/iteration_spec.rb'
     - 'ee/spec/models/ldap_group_link_spec.rb'
     - 'ee/spec/models/license_spec.rb'
-    - 'ee/spec/models/member_spec.rb'
+    - 'ee/spec/models/ee/member_spec.rb'
     - 'ee/spec/models/release_highlight_spec.rb'
     - 'ee/spec/models/security/orchestration_policy_configuration_spec.rb'
     - 'ee/spec/models/vulnerabilities/feedback_spec.rb'
diff --git a/.rubocop_todo/lint/unused_block_argument.yml b/.rubocop_todo/lint/unused_block_argument.yml
index 1df273d408d..f14c02c4ecd 100644
--- a/.rubocop_todo/lint/unused_block_argument.yml
+++ b/.rubocop_todo/lint/unused_block_argument.yml
@@ -131,7 +131,7 @@ Lint/UnusedBlockArgument:
     - 'ee/spec/lib/gitlab/graphql/aggregations/epics/lazy_epic_aggregate_spec.rb'
     - 'ee/spec/lib/gitlab/insights/project_insights_config_spec.rb'
     - 'ee/spec/lib/gitlab/usage_data_metrics_spec.rb'
-    - 'ee/spec/models/member_spec.rb'
+    - 'ee/spec/models/ee/member_spec.rb'
     - 'ee/spec/requests/api/graphql/project/pipeline/security_report_summary_spec.rb'
     - 'ee/spec/requests/api/graphql/vulnerabilities/sort_spec.rb'
     - 'ee/spec/requests/api/related_epic_links_spec.rb'
diff --git a/.rubocop_todo/performance/map_compact.yml b/.rubocop_todo/performance/map_compact.yml
index 8f831bf8f59..22cefbab067 100644
--- a/.rubocop_todo/performance/map_compact.yml
+++ b/.rubocop_todo/performance/map_compact.yml
@@ -75,7 +75,7 @@ Performance/MapCompact:
     - 'ee/lib/gitlab/ci/reports/metrics/reports_comparer.rb'
     - 'ee/lib/gitlab/search/aggregation_parser.rb'
     - 'ee/spec/models/analytics/issues_analytics_spec.rb'
-    - 'ee/spec/models/member_spec.rb'
+    - 'ee/spec/models/ee/member_spec.rb'
     - 'ee/spec/requests/api/audit_events_spec.rb'
     - 'ee/spec/requests/api/search_spec.rb'
     - 'haml_lint/linter/no_plain_nodes.rb'
diff --git a/.rubocop_todo/rspec/before_all_role_assignment.yml b/.rubocop_todo/rspec/before_all_role_assignment.yml
index fcdaf78ffe8..3436cffc2ff 100644
--- a/.rubocop_todo/rspec/before_all_role_assignment.yml
+++ b/.rubocop_todo/rspec/before_all_role_assignment.yml
@@ -321,7 +321,7 @@ RSpec/BeforeAllRoleAssignment:
     - 'ee/spec/models/ee/vulnerability_spec.rb'
     - 'ee/spec/models/epic_issue_spec.rb'
     - 'ee/spec/models/epic_spec.rb'
-    - 'ee/spec/models/group_member_spec.rb'
+    - 'ee/spec/models/ee/group_member_spec.rb'
     - 'ee/spec/models/instance_security_dashboard_spec.rb'
     - 'ee/spec/models/issue_spec.rb'
     - 'ee/spec/models/merge_request_spec.rb'
diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml
index 6375841e697..0a50fc4485d 100644
--- a/.rubocop_todo/rspec/context_wording.yml
+++ b/.rubocop_todo/rspec/context_wording.yml
@@ -453,7 +453,7 @@ RSpec/ContextWording:
     - 'ee/spec/models/geo_node_spec.rb'
     - 'ee/spec/models/geo_node_status_spec.rb'
     - 'ee/spec/models/gitlab_subscription_spec.rb'
-    - 'ee/spec/models/group_member_spec.rb'
+    - 'ee/spec/models/ee/group_member_spec.rb'
     - 'ee/spec/models/group_wiki_repository_spec.rb'
     - 'ee/spec/models/incident_management/escalation_rule_spec.rb'
     - 'ee/spec/models/incident_management/oncall_rotation_spec.rb'
@@ -467,7 +467,7 @@ RSpec/ContextWording:
     - 'ee/spec/models/issue_spec.rb'
     - 'ee/spec/models/iteration_spec.rb'
     - 'ee/spec/models/license_spec.rb'
-    - 'ee/spec/models/member_spec.rb'
+    - 'ee/spec/models/ee/member_spec.rb'
     - 'ee/spec/models/merge_request/blocking_spec.rb'
     - 'ee/spec/models/merge_request_spec.rb'
     - 'ee/spec/models/namespace_setting_spec.rb'
@@ -476,7 +476,7 @@ RSpec/ContextWording:
     - '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/project_member_spec.rb'
+    - 'ee/spec/models/ee/project_member_spec.rb'
     - 'ee/spec/models/protected_environment_spec.rb'
     - 'ee/spec/models/push_rule_spec.rb'
     - 'ee/spec/models/release_highlight_spec.rb'
diff --git a/.rubocop_todo/rspec/expect_change.yml b/.rubocop_todo/rspec/expect_change.yml
index f358600f4fe..c5e3556defd 100644
--- a/.rubocop_todo/rspec/expect_change.yml
+++ b/.rubocop_todo/rspec/expect_change.yml
@@ -36,7 +36,7 @@ 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/member_spec.rb'
+    - 'ee/spec/models/ee/member_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'
diff --git a/.rubocop_todo/rspec/feature_category.yml b/.rubocop_todo/rspec/feature_category.yml
index ab4170d5a2f..163eeb207ad 100644
--- a/.rubocop_todo/rspec/feature_category.yml
+++ b/.rubocop_todo/rspec/feature_category.yml
@@ -1063,7 +1063,7 @@ RSpec/FeatureCategory:
     - 'ee/spec/models/gitlab_subscriptions/features_spec.rb'
     - 'ee/spec/models/gitlab_subscriptions/upcoming_reconciliation_spec.rb'
     - 'ee/spec/models/group_deletion_schedule_spec.rb'
-    - 'ee/spec/models/group_member_spec.rb'
+    - 'ee/spec/models/ee/group_member_spec.rb'
     - 'ee/spec/models/group_merge_request_approval_setting_spec.rb'
     - 'ee/spec/models/group_wiki_repository_spec.rb'
     - 'ee/spec/models/historical_data_spec.rb'
@@ -1108,7 +1108,7 @@ RSpec/FeatureCategory:
     - 'ee/spec/models/project_ci_cd_setting_spec.rb'
     - 'ee/spec/models/project_feature_spec.rb'
     - 'ee/spec/models/project_import_data_spec.rb'
-    - 'ee/spec/models/project_member_spec.rb'
+    - 'ee/spec/models/ee/project_member_spec.rb'
     - 'ee/spec/models/project_repository_state_spec.rb'
     - 'ee/spec/models/project_security_setting_spec.rb'
     - 'ee/spec/models/protected_branch/required_code_owners_section_spec.rb'