Add latest changes from gitlab-org/gitlab@master

5 files changed, 0 insertions, 10 deletions

diff --git a/.rubocop_todo/layout/empty_line_after_magic_comment.yml b/.rubocop_todo/layout/empty_line_after_magic_comment.yml
index ba08bc8ae08..3d6266a7438 100644
--- a/.rubocop_todo/layout/empty_line_after_magic_comment.yml
+++ b/.rubocop_todo/layout/empty_line_after_magic_comment.yml
@@ -203,8 +203,6 @@ Layout/EmptyLineAfterMagicComment:
     - 'ee/app/services/ee/system_notes/issuables_service.rb'
     - 'ee/app/services/gitlab_subscriptions/fetch_subscription_plans_service.rb'
     - 'ee/app/services/gitlab_subscriptions/reconciliations/calculate_seat_count_data_service.rb'
-    - 'ee/app/services/group_saml/group_managed_accounts/clean_up_members_service.rb'
-    - 'ee/app/services/group_saml/sign_up_service.rb'
     - 'ee/app/services/merge_trains/create_pipeline_service.rb'
     - 'ee/app/services/merge_trains/refresh_merge_request_service.rb'
     - 'ee/app/services/merge_trains/refresh_service.rb'
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index 060b55f00d0..684681750b4 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -1012,9 +1012,7 @@ Layout/LineLength:
     - 'ee/app/services/geo/request_service.rb'
     - 'ee/app/services/geo/verification_state_backfill_service.rb'
     - 'ee/app/services/gitlab_subscriptions/plan_upgrade_service.rb'
-    - 'ee/app/services/group_saml/group_managed_accounts/transfer_membership_service.rb'
     - 'ee/app/services/group_saml/saml_provider/base_service.rb'
-    - 'ee/app/services/group_saml/sign_up_service.rb'
     - 'ee/app/services/groups/memberships/export_service.rb'
     - 'ee/app/services/groups/sync_service.rb'
     - 'ee/app/services/incident_management/create_incident_sla_exceeded_label_service.rb'
@@ -1350,7 +1348,6 @@ Layout/LineLength:
     - 'ee/spec/features/groups/saml_providers_spec.rb'
     - 'ee/spec/features/groups/scim_token_spec.rb'
     - 'ee/spec/features/groups/security/compliance_dashboards_spec.rb'
-    - 'ee/spec/features/groups/sso_spec.rb'
     - 'ee/spec/features/integrations/jira/jira_issues_list_spec.rb'
     - 'ee/spec/features/issues/filtered_search/filter_issues_weight_spec.rb'
     - 'ee/spec/features/issues/form_spec.rb'
diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml
index d8303d8beb2..7859119eb60 100644
--- a/.rubocop_todo/rspec/context_wording.yml
+++ b/.rubocop_todo/rspec/context_wording.yml
@@ -109,7 +109,6 @@ RSpec/ContextWording:
     - 'ee/spec/features/groups/saml_enforcement_spec.rb'
     - 'ee/spec/features/groups/saml_providers_spec.rb'
     - 'ee/spec/features/groups/security/compliance_dashboards_spec.rb'
-    - 'ee/spec/features/groups/sso_spec.rb'
     - 'ee/spec/features/groups_spec.rb'
     - 'ee/spec/features/ide/user_opens_ide_spec.rb'
     - 'ee/spec/features/issues/epic_in_issue_sidebar_spec.rb'
@@ -714,7 +713,6 @@ RSpec/ContextWording:
     - 'ee/spec/services/geo/prune_event_log_service_spec.rb'
     - 'ee/spec/services/gitlab_subscriptions/create_service_spec.rb'
     - 'ee/spec/services/gitlab_subscriptions/preview_billable_user_change_service_spec.rb'
-    - 'ee/spec/services/group_saml/group_managed_accounts/transfer_membership_service_spec.rb'
     - 'ee/spec/services/groups/destroy_service_spec.rb'
     - 'ee/spec/services/groups/mark_for_deletion_service_spec.rb'
     - 'ee/spec/services/groups/memberships/export_service_spec.rb'
diff --git a/.rubocop_todo/rspec/verified_doubles.yml b/.rubocop_todo/rspec/verified_doubles.yml
index 4824f2007d3..8178d11a710 100644
--- a/.rubocop_todo/rspec/verified_doubles.yml
+++ b/.rubocop_todo/rspec/verified_doubles.yml
@@ -147,8 +147,6 @@ RSpec/VerifiedDoubles:
     - 'ee/spec/services/geo/node_status_request_service_spec.rb'
     - 'ee/spec/services/geo/replication_toggle_request_service_spec.rb'
     - 'ee/spec/services/gitlab_subscriptions/fetch_subscription_plans_service_spec.rb'
-    - 'ee/spec/services/group_saml/group_managed_accounts/clean_up_members_service_spec.rb'
-    - 'ee/spec/services/group_saml/sign_up_service_spec.rb'
     - 'ee/spec/services/groups/update_repository_storage_service_spec.rb'
     - 'ee/spec/services/ide/schemas_config_service_spec.rb'
     - 'ee/spec/services/incident_management/oncall_schedules/update_service_spec.rb'
diff --git a/.rubocop_todo/style/guard_clause.yml b/.rubocop_todo/style/guard_clause.yml
index 429eeff3787..65847c093d5 100644
--- a/.rubocop_todo/style/guard_clause.yml
+++ b/.rubocop_todo/style/guard_clause.yml
@@ -347,7 +347,6 @@ Style/GuardClause:
     - 'ee/app/services/epics/tree_reorder_service.rb'
     - 'ee/app/services/epics/update_service.rb'
     - 'ee/app/services/geo/metrics_update_service.rb'
-    - 'ee/app/services/group_saml/group_managed_accounts/transfer_membership_service.rb'
     - 'ee/app/services/groups/update_repository_storage_service.rb'
     - 'ee/app/services/incident_management/oncall_rotations/remove_participant_service.rb'
     - 'ee/app/services/iterations/delete_service.rb'