Add latest changes from gitlab-org/gitlab@master

6 files changed, 0 insertions, 6 deletions

diff --git a/.rubocop_todo/layout/first_hash_element_indentation.yml b/.rubocop_todo/layout/first_hash_element_indentation.yml
index 4537d0a499b..bd8bee3b69f 100644
--- a/.rubocop_todo/layout/first_hash_element_indentation.yml
+++ b/.rubocop_todo/layout/first_hash_element_indentation.yml
@@ -56,7 +56,6 @@ Layout/FirstHashElementIndentation:
     - 'ee/app/services/timebox_report_service.rb'
     - 'ee/lib/ee/gitlab/ci/parsers.rb'
     - 'ee/lib/ee/gitlab/usage_data.rb'
-    - 'ee/lib/elastic/latest/application_class_proxy.rb'
     - 'ee/lib/elastic/latest/issue_class_proxy.rb'
     - 'ee/lib/gitlab/analytics/type_of_work/tasks_by_type.rb'
     - 'ee/lib/gitlab/ci/parsers/security/formatters/dependency_list.rb'
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index 13ed078563f..3e29279693e 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -1287,7 +1287,6 @@ Layout/LineLength:
     - 'ee/lib/ee/gitlab/usage_data.rb'
     - 'ee/lib/ee/sidebars/groups/panel.rb'
     - 'ee/lib/ee/sidebars/projects/menus/security_compliance_menu.rb'
-    - 'ee/lib/elastic/latest/application_class_proxy.rb'
     - 'ee/lib/elastic/latest/config.rb'
     - 'ee/lib/elastic/latest/custom_language_analyzers.rb'
     - 'ee/lib/elastic/latest/git_class_proxy.rb'
diff --git a/.rubocop_todo/style/guard_clause.yml b/.rubocop_todo/style/guard_clause.yml
index 50a823c9ee8..18075377acb 100644
--- a/.rubocop_todo/style/guard_clause.yml
+++ b/.rubocop_todo/style/guard_clause.yml
@@ -406,7 +406,6 @@ Style/GuardClause:
     - 'ee/lib/ee/gitlab/gon_helper.rb'
     - 'ee/lib/ee/gitlab/omniauth_initializer.rb'
     - 'ee/lib/ee/sidebars/projects/panel.rb'
-    - 'ee/lib/elastic/latest/application_class_proxy.rb'
     - 'ee/lib/gitlab/analytics/cycle_analytics/summary/base_time.rb'
     - 'ee/lib/gitlab/ci/config/security_orchestration_policies/processor.rb'
     - 'ee/lib/gitlab/ci/minutes/cost_factor.rb'
diff --git a/.rubocop_todo/style/lambda.yml b/.rubocop_todo/style/lambda.yml
index 270cdafa855..adbf5a5b8be 100644
--- a/.rubocop_todo/style/lambda.yml
+++ b/.rubocop_todo/style/lambda.yml
@@ -27,7 +27,6 @@ Style/Lambda:
     - 'ee/lib/ee/api/entities/group_push_rule.rb'
     - 'ee/lib/ee/banzai/filter/sanitization_filter.rb'
     - 'ee/lib/ee/gitlab/checks/diff_check.rb'
-    - 'ee/lib/elastic/latest/application_class_proxy.rb'
     - 'ee/lib/gem_extensions/elasticsearch/model/adapter/active_record/importing.rb'
     - 'ee/spec/elastic_integration/global_search_spec.rb'
     - 'ee/spec/lib/gitlab/geo/event_gap_tracking_spec.rb'
diff --git a/.rubocop_todo/style/redundant_self.yml b/.rubocop_todo/style/redundant_self.yml
index 3168a5d2150..df5c1b6172a 100644
--- a/.rubocop_todo/style/redundant_self.yml
+++ b/.rubocop_todo/style/redundant_self.yml
@@ -232,7 +232,6 @@ Style/RedundantSelf:
     - 'ee/lib/ee/legacy_model.rb'
     - 'ee/lib/ee/model.rb'
     - 'ee/lib/elastic/instance_proxy_util.rb'
-    - 'ee/lib/elastic/latest/application_class_proxy.rb'
     - 'ee/lib/elastic/latest/commit_config.rb'
     - 'ee/lib/elastic/latest/issue_config.rb'
     - 'ee/lib/elastic/latest/merge_request_config.rb'
diff --git a/.rubocop_todo/style/sole_nested_conditional.yml b/.rubocop_todo/style/sole_nested_conditional.yml
index 9b867a430f2..65cac595cde 100644
--- a/.rubocop_todo/style/sole_nested_conditional.yml
+++ b/.rubocop_todo/style/sole_nested_conditional.yml
@@ -33,7 +33,6 @@ Style/SoleNestedConditional:
     - 'ee/app/workers/ee/post_receive.rb'
     - 'ee/lib/ee/gitlab/auth/o_auth/auth_hash.rb'
     - 'ee/lib/ee/gitlab/checks/push_rules/commit_check.rb'
-    - 'ee/lib/elastic/latest/application_class_proxy.rb'
     - 'ee/lib/elastic/latest/issue_class_proxy.rb'
     - 'ee/lib/gitlab/code_owners/groups_loader.rb'
     - 'lib/api/deploy_keys.rb'