Add latest changes from gitlab-org/gitlab@master

4 files changed, 0 insertions, 9 deletions

diff --git a/.rubocop_todo/style/explicit_block_argument.yml b/.rubocop_todo/style/explicit_block_argument.yml
index f6bff468c76..e5ce2576f8c 100644
--- a/.rubocop_todo/style/explicit_block_argument.yml
+++ b/.rubocop_todo/style/explicit_block_argument.yml
@@ -16,7 +16,6 @@ Style/ExplicitBlockArgument:
     - 'app/models/merge_request.rb'
     - 'app/models/snippet_repository.rb'
     - 'app/services/import_export_clean_up_service.rb'
-    - 'app/services/issuable/clone/attributes_rewriter.rb'
     - 'app/services/packages/debian/generate_distribution_key_service.rb'
     - 'app/workers/concerns/each_shard_worker.rb'
     - 'db/migrate/20210629031900_associate_existing_dast_builds_with_variables.rb'
diff --git a/.rubocop_todo/style/format_string.yml b/.rubocop_todo/style/format_string.yml
index a9065bb5932..caa293b31ae 100644
--- a/.rubocop_todo/style/format_string.yml
+++ b/.rubocop_todo/style/format_string.yml
@@ -165,8 +165,6 @@ Style/FormatString:
     - 'app/services/metrics/dashboard/update_dashboard_service.rb'
     - 'app/services/milestones/promote_service.rb'
     - 'app/services/personal_access_tokens/revoke_service.rb'
-    - 'app/services/pod_logs/elasticsearch_service.rb'
-    - 'app/services/pod_logs/kubernetes_service.rb'
     - 'app/services/projects/cleanup_service.rb'
     - 'app/services/projects/create_from_template_service.rb'
     - 'app/services/projects/import_service.rb'
@@ -232,8 +230,6 @@ Style/FormatString:
     - 'ee/app/services/incident_management/escalation_policies/base_service.rb'
     - 'ee/app/services/issues/build_from_vulnerability_service.rb'
     - 'ee/app/services/merge_requests/create_from_vulnerability_data_service.rb'
-    - 'ee/app/services/namespaces/check_excess_storage_size_service.rb'
-    - 'ee/app/services/namespaces/check_storage_size_service.rb'
     - 'ee/app/services/security/security_orchestration_policies/policy_configuration_validation_service.rb'
     - 'ee/app/services/security/security_orchestration_policies/validate_policy_service.rb'
     - 'ee/app/services/timebox_report_service.rb'
diff --git a/.rubocop_todo/style/if_unless_modifier.yml b/.rubocop_todo/style/if_unless_modifier.yml
index 845a59a2a14..1dfedcc91c0 100644
--- a/.rubocop_todo/style/if_unless_modifier.yml
+++ b/.rubocop_todo/style/if_unless_modifier.yml
@@ -307,7 +307,6 @@ Style/IfUnlessModifier:
     - 'app/services/import/github_service.rb'
     - 'app/services/import/gitlab_projects/file_acquisition_strategies/remote_file.rb'
     - 'app/services/issuable/bulk_update_service.rb'
-    - 'app/services/issuable/clone/attributes_rewriter.rb'
     - 'app/services/issuable/common_system_notes_service.rb'
     - 'app/services/issuable_base_service.rb'
     - 'app/services/issuable_links/create_service.rb'
@@ -356,7 +355,6 @@ Style/IfUnlessModifier:
     - 'app/services/packages/pypi/create_package_service.rb'
     - 'app/services/packages/rubygems/dependency_resolver_service.rb'
     - 'app/services/pages/migrate_legacy_storage_to_deployment_service.rb'
-    - 'app/services/pod_logs/kubernetes_service.rb'
     - 'app/services/post_receive_service.rb'
     - 'app/services/projects/container_repository/gitlab/delete_tags_service.rb'
     - 'app/services/projects/container_repository/third_party/delete_tags_service.rb'
@@ -936,7 +934,6 @@ Style/IfUnlessModifier:
     - 'lib/gitlab/database/with_lock_retries.rb'
     - 'lib/gitlab/diff/formatters/base_formatter.rb'
     - 'lib/gitlab/diff/rendered/notebook/diff_file.rb'
-    - 'lib/gitlab/elasticsearch/logs/lines.rb'
     - 'lib/gitlab/email/handler/service_desk_handler.rb'
     - 'lib/gitlab/email/message/in_product_marketing/base.rb'
     - 'lib/gitlab/email/message/repository_push.rb'
diff --git a/.rubocop_todo/style/percent_literal_delimiters.yml b/.rubocop_todo/style/percent_literal_delimiters.yml
index cd8a41669bb..ecf7a5cf05e 100644
--- a/.rubocop_todo/style/percent_literal_delimiters.yml
+++ b/.rubocop_todo/style/percent_literal_delimiters.yml
@@ -20,7 +20,6 @@ Style/PercentLiteralDelimiters:
     - 'app/controllers/jira_connect/app_descriptor_controller.rb'
     - 'app/controllers/jira_connect/subscriptions_controller.rb'
     - 'app/controllers/profiles/two_factor_auths_controller.rb'
-    - 'app/controllers/projects/logs_controller.rb'
     - 'app/controllers/projects/performance_monitoring/dashboards_controller.rb'
     - 'app/controllers/projects/product_analytics_controller.rb'
     - 'app/controllers/projects/service_desk_controller.rb'