Add latest changes from gitlab-org/gitlab@master

5 files changed, 6 insertions, 6 deletions

diff --git a/.rubocop_todo/style/guard_clause.yml b/.rubocop_todo/style/guard_clause.yml
index 91c1999836e..3c123b25953 100644
--- a/.rubocop_todo/style/guard_clause.yml
+++ b/.rubocop_todo/style/guard_clause.yml
@@ -312,7 +312,6 @@ Style/GuardClause:
     - 'ee/app/models/ee/incident_management/issuable_escalation_status.rb'
     - 'ee/app/models/ee/issue.rb'
     - 'ee/app/models/ee/issue_assignee.rb'
-    - 'ee/app/models/ee/iteration.rb'
     - 'ee/app/models/ee/member.rb'
     - 'ee/app/models/ee/merge_request.rb'
     - 'ee/app/models/ee/namespace.rb'
@@ -328,6 +327,7 @@ Style/GuardClause:
     - 'ee/app/models/incident_management/escalation_rule.rb'
     - 'ee/app/models/incident_management/oncall_rotation.rb'
     - 'ee/app/models/ip_restriction.rb'
+    - 'ee/app/models/iteration.rb'
     - 'ee/app/models/namespace_limit.rb'
     - 'ee/app/models/preloaders/environments/protected_environment_preloader.rb'
     - 'ee/app/models/protected_environment.rb'
diff --git a/.rubocop_todo/style/if_unless_modifier.yml b/.rubocop_todo/style/if_unless_modifier.yml
index 19016646725..208729cbce8 100644
--- a/.rubocop_todo/style/if_unless_modifier.yml
+++ b/.rubocop_todo/style/if_unless_modifier.yml
@@ -454,7 +454,6 @@ Style/IfUnlessModifier:
     - 'ee/app/models/ee/group.rb'
     - 'ee/app/models/ee/group_member.rb'
     - 'ee/app/models/ee/issue.rb'
-    - 'ee/app/models/ee/iteration.rb'
     - 'ee/app/models/ee/key.rb'
     - 'ee/app/models/ee/list.rb'
     - 'ee/app/models/ee/milestone_release.rb'
@@ -467,6 +466,7 @@ Style/IfUnlessModifier:
     - 'ee/app/models/geo/tracking_base.rb'
     - 'ee/app/models/incident_management/escalation_rule.rb'
     - 'ee/app/models/ip_restriction.rb'
+    - 'ee/app/models/iteration.rb'
     - 'ee/app/models/merge_requests/external_status_check.rb'
     - 'ee/app/models/requirements_management/requirement.rb'
     - 'ee/app/models/requirements_management/test_report.rb'
@@ -586,6 +586,7 @@ Style/IfUnlessModifier:
     - 'ee/lib/api/merge_request_approval_rules.rb'
     - 'ee/lib/api/protected_environments.rb'
     - 'ee/lib/audit/details.rb'
+    - 'ee/lib/banzai/filter/references/iteration_reference_filter.rb'
     - 'ee/lib/ee/api/entities/epic.rb'
     - 'ee/lib/ee/api/entities/experiment.rb'
     - 'ee/lib/ee/api/geo.rb'
@@ -595,7 +596,6 @@ Style/IfUnlessModifier:
     - 'ee/lib/ee/api/internal/base.rb'
     - 'ee/lib/ee/api/merge_request_approvals.rb'
     - 'ee/lib/ee/api/settings.rb'
-    - 'ee/lib/ee/banzai/filter/references/iteration_reference_filter.rb'
     - 'ee/lib/ee/container_registry/client.rb'
     - 'ee/lib/ee/gitlab/auth/ldap/access.rb'
     - 'ee/lib/ee/gitlab/auth/ldap/group.rb'
diff --git a/.rubocop_todo/style/redundant_freeze.yml b/.rubocop_todo/style/redundant_freeze.yml
index cda2972c60c..e9ec1e101d7 100644
--- a/.rubocop_todo/style/redundant_freeze.yml
+++ b/.rubocop_todo/style/redundant_freeze.yml
@@ -66,10 +66,10 @@ Style/RedundantFreeze:
     - 'ee/app/graphql/types/incident_management/oncall_rotation_date_input_type.rb'
     - 'ee/app/models/allowed_email_domain.rb'
     - 'ee/app/models/ee/issue.rb'
-    - 'ee/app/models/ee/iteration.rb'
     - 'ee/app/models/ee/label.rb'
     - 'ee/app/models/ee/project_import_state.rb'
     - 'ee/app/models/ee/vulnerability.rb'
+    - 'ee/app/models/iteration.rb'
     - 'ee/app/models/status_page/project_setting.rb'
     - 'ee/app/serializers/analytics/cycle_analytics/value_stream_errors_serializer.rb'
     - 'ee/app/services/elastic/data_migration_service.rb'
diff --git a/.rubocop_todo/style/redundant_regexp_escape.yml b/.rubocop_todo/style/redundant_regexp_escape.yml
index 61592f8f4cd..b1ab72bac61 100644
--- a/.rubocop_todo/style/redundant_regexp_escape.yml
+++ b/.rubocop_todo/style/redundant_regexp_escape.yml
@@ -28,8 +28,8 @@ Style/RedundantRegexpEscape:
     - 'config/routes/snippets.rb'
     - 'config/routes/uploads.rb'
     - 'ee/app/models/ee/epic.rb'
-    - 'ee/app/models/ee/iteration.rb'
     - 'ee/app/models/ee/vulnerability.rb'
+    - 'ee/app/models/iteration.rb'
     - 'ee/config/routes/admin.rb'
     - 'ee/lib/ee/gitlab/path_regex.rb'
     - 'ee/lib/elastic/latest/merge_request_class_proxy.rb'
diff --git a/.rubocop_todo/style/redundant_self.yml b/.rubocop_todo/style/redundant_self.yml
index 9441150d6d3..5335915271d 100644
--- a/.rubocop_todo/style/redundant_self.yml
+++ b/.rubocop_todo/style/redundant_self.yml
@@ -198,7 +198,6 @@ Style/RedundantSelf:
     - 'ee/app/models/ee/group.rb'
     - 'ee/app/models/ee/group_member.rb'
     - 'ee/app/models/ee/issue.rb'
-    - 'ee/app/models/ee/iteration.rb'
     - 'ee/app/models/ee/member.rb'
     - 'ee/app/models/ee/namespace.rb'
     - 'ee/app/models/ee/packages/package_file.rb'
@@ -217,6 +216,7 @@ Style/RedundantSelf:
     - 'ee/app/models/gitlab_subscription.rb'
     - 'ee/app/models/gitlab_subscriptions/upcoming_reconciliation.rb'
     - 'ee/app/models/group_wiki_repository.rb'
+    - 'ee/app/models/iteration.rb'
     - 'ee/app/models/iterations/cadence.rb'
     - 'ee/app/models/license.rb'
     - 'ee/app/models/merge_requests/external_status_check.rb'