Add latest changes from gitlab-org/gitlab@master

7 files changed, 0 insertions, 8 deletions

diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index d3a8e5f70f6..b67d586ce64 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -3681,7 +3681,6 @@ Layout/LineLength:
     - 'lib/gitlab/slash_commands/issue_new.rb'
     - 'lib/gitlab/sql/pattern.rb'
     - 'lib/gitlab/ssh_public_key.rb'
-    - 'lib/gitlab/static_site_editor/config/generated_config.rb'
     - 'lib/gitlab/subscription_portal.rb'
     - 'lib/gitlab/tracking.rb'
     - 'lib/gitlab/tracking/destinations/snowplow.rb'
diff --git a/.rubocop_todo/layout/space_inside_block_braces.yml b/.rubocop_todo/layout/space_inside_block_braces.yml
index b3830147692..961b27f26e7 100644
--- a/.rubocop_todo/layout/space_inside_block_braces.yml
+++ b/.rubocop_todo/layout/space_inside_block_braces.yml
@@ -407,7 +407,6 @@ Layout/SpaceInsideBlockBraces:
     - 'spec/initializers/trusted_proxies_spec.rb'
     - 'spec/lib/api/entities/ci/job_request/image_spec.rb'
     - 'spec/lib/api/entities/ci/job_request/port_spec.rb'
-    - 'spec/lib/api/helpers/sse_helpers_spec.rb'
     - 'spec/lib/api/helpers_spec.rb'
     - 'spec/lib/banzai/cross_project_reference_spec.rb'
     - 'spec/lib/banzai/filter/broadcast_message_placeholders_filter_spec.rb'
diff --git a/.rubocop_todo/naming/heredoc_delimiter_naming.yml b/.rubocop_todo/naming/heredoc_delimiter_naming.yml
index 86d9ae2f24d..c1d058240a4 100644
--- a/.rubocop_todo/naming/heredoc_delimiter_naming.yml
+++ b/.rubocop_todo/naming/heredoc_delimiter_naming.yml
@@ -105,7 +105,6 @@ Naming/HeredocDelimiterNaming:
     - 'spec/lib/gitlab/patch/database_config_spec.rb'
     - 'spec/lib/gitlab/prometheus/additional_metrics_parser_spec.rb'
     - 'spec/lib/gitlab/quick_actions/substitution_definition_spec.rb'
-    - 'spec/lib/gitlab/static_site_editor/config/file_config_spec.rb'
     - 'spec/lib/gitlab/web_ide/config_spec.rb'
     - 'spec/lib/gitlab/webpack/file_loader_spec.rb'
     - 'spec/lib/gitlab/webpack/graphql_known_operations_spec.rb'
diff --git a/.rubocop_todo/rspec/verified_doubles.yml b/.rubocop_todo/rspec/verified_doubles.yml
index 26b82a3f473..0d660b9b826 100644
--- a/.rubocop_todo/rspec/verified_doubles.yml
+++ b/.rubocop_todo/rspec/verified_doubles.yml
@@ -382,7 +382,6 @@ RSpec/VerifiedDoubles:
     - spec/lib/api/helpers/graphql_helpers_spec.rb
     - spec/lib/api/helpers/pagination_spec.rb
     - spec/lib/api/helpers/pagination_strategies_spec.rb
-    - spec/lib/api/helpers/sse_helpers_spec.rb
     - spec/lib/api/helpers/variables_helpers_spec.rb
     - spec/lib/api/helpers_spec.rb
     - spec/lib/atlassian/jira_connect/client_spec.rb
@@ -1054,7 +1053,6 @@ RSpec/VerifiedDoubles:
     - spec/services/spam/ham_service_spec.rb
     - spec/services/spam/spam_action_service_spec.rb
     - spec/services/spam/spam_params_spec.rb
-    - spec/services/static_site_editor/config_service_spec.rb
     - spec/services/system_note_service_spec.rb
     - spec/services/system_notes/commit_service_spec.rb
     - spec/services/system_notes/issuables_service_spec.rb
diff --git a/.rubocop_todo/style/guard_clause.yml b/.rubocop_todo/style/guard_clause.yml
index 12eda8abf13..d34dc483b01 100644
--- a/.rubocop_todo/style/guard_clause.yml
+++ b/.rubocop_todo/style/guard_clause.yml
@@ -247,7 +247,6 @@ Style/GuardClause:
     - 'app/services/projects/update_service.rb'
     - 'app/services/protected_branches/legacy_api_update_service.rb'
     - 'app/services/snippets/repository_validation_service.rb'
-    - 'app/services/static_site_editor/config_service.rb'
     - 'app/services/todo_service.rb'
     - 'app/services/users/build_service.rb'
     - 'app/services/users/update_service.rb'
diff --git a/.rubocop_todo/style/if_unless_modifier.yml b/.rubocop_todo/style/if_unless_modifier.yml
index 7bbc62d4c27..60e43a74e4d 100644
--- a/.rubocop_todo/style/if_unless_modifier.yml
+++ b/.rubocop_todo/style/if_unless_modifier.yml
@@ -387,7 +387,6 @@ Style/IfUnlessModifier:
     - 'app/services/snippets/repository_validation_service.rb'
     - 'app/services/spam/spam_action_service.rb'
     - 'app/services/spam/spam_verdict_service.rb'
-    - 'app/services/static_site_editor/config_service.rb'
     - 'app/services/system_notes/issuables_service.rb'
     - 'app/services/tags/destroy_service.rb'
     - 'app/services/two_factor/destroy_service.rb'
diff --git a/.rubocop_todo/style/percent_literal_delimiters.yml b/.rubocop_todo/style/percent_literal_delimiters.yml
index b555882b7ac..d58b637f103 100644
--- a/.rubocop_todo/style/percent_literal_delimiters.yml
+++ b/.rubocop_todo/style/percent_literal_delimiters.yml
@@ -675,7 +675,6 @@ Style/PercentLiteralDelimiters:
     - 'spec/controllers/projects/performance_monitoring/dashboards_controller_spec.rb'
     - 'spec/controllers/projects/pipelines_controller_spec.rb'
     - 'spec/controllers/projects/settings/ci_cd_controller_spec.rb'
-    - 'spec/controllers/projects/static_site_editor_controller_spec.rb'
     - 'spec/controllers/projects_controller_spec.rb'
     - 'spec/controllers/registrations/welcome_controller_spec.rb'
     - 'spec/controllers/search_controller_spec.rb'