Add latest changes from gitlab-org/gitlab@masterHEADmaster

9 files changed, 0 insertions, 11 deletions

diff --git a/.rubocop_todo/gitlab/namespaced_class.yml b/.rubocop_todo/gitlab/namespaced_class.yml
index 4cc5f4ffef0..eff4a6506cf 100644
--- a/.rubocop_todo/gitlab/namespaced_class.yml
+++ b/.rubocop_todo/gitlab/namespaced_class.yml
@@ -1215,7 +1215,6 @@ Gitlab/NamespacedClass:
     - 'lib/gitlab/untrusted_regexp.rb'
     - 'lib/gitlab/untrusted_regexp/ruby_syntax.rb'
     - 'lib/gitlab/uploads_transfer.rb'
-    - 'lib/gitlab/url_blocker.rb'
     - 'lib/gitlab/url_builder.rb'
     - 'lib/gitlab/url_helpers.rb'
     - 'lib/gitlab/url_sanitizer.rb'
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index 59f19430b57..6dd83f1aceb 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -2671,7 +2671,6 @@ Layout/LineLength:
     - 'lib/gitlab/tracking.rb'
     - 'lib/gitlab/tracking/destinations/snowplow.rb'
     - 'lib/gitlab/tracking/event_definition.rb'
-    - 'lib/gitlab/url_blocker.rb'
     - 'lib/gitlab/usage/metric_definition.rb'
     - 'lib/gitlab/usage/metrics/aggregates/aggregate.rb'
     - 'lib/gitlab/usage/metrics/aggregates/sources/calculations/intersection.rb'
@@ -3801,7 +3800,6 @@ Layout/LineLength:
     - 'spec/lib/gitlab/tracking/event_definition_spec.rb'
     - 'spec/lib/gitlab/tracking/standard_context_spec.rb'
     - 'spec/lib/gitlab/tracking_spec.rb'
-    - 'spec/lib/gitlab/url_blocker_spec.rb'
     - 'spec/lib/gitlab/url_builder_spec.rb'
     - 'spec/lib/gitlab/usage/metric_definition_spec.rb'
     - 'spec/lib/gitlab/usage/metric_spec.rb'
@@ -4024,7 +4022,6 @@ Layout/LineLength:
     - 'spec/models/todo_spec.rb'
     - 'spec/models/upload_spec.rb'
     - 'spec/models/uploads/fog_spec.rb'
-    - 'spec/models/user_detail_spec.rb'
     - 'spec/models/user_spec.rb'
     - 'spec/models/wiki_page_spec.rb'
     - 'spec/models/x509_certificate_spec.rb'
diff --git a/.rubocop_todo/performance/map_compact.yml b/.rubocop_todo/performance/map_compact.yml
index 576a610006e..4a3395ba823 100644
--- a/.rubocop_todo/performance/map_compact.yml
+++ b/.rubocop_todo/performance/map_compact.yml
@@ -103,7 +103,6 @@ Performance/MapCompact:
     - 'lib/gitlab/git/commit.rb'
     - 'lib/gitlab/git/conflict/file.rb'
     - 'lib/gitlab/sql/pattern.rb'
-    - 'lib/gitlab/url_blocker.rb'
     - 'qa/qa/page/component/issuable/sidebar.rb'
     - 'qa/qa/support/formatters/test_metrics_formatter.rb'
     - 'qa/qa/tools/ci/ff_changes.rb'
diff --git a/.rubocop_todo/rspec/feature_category.yml b/.rubocop_todo/rspec/feature_category.yml
index ff159a848f2..de0f4213855 100644
--- a/.rubocop_todo/rspec/feature_category.yml
+++ b/.rubocop_todo/rspec/feature_category.yml
@@ -4679,7 +4679,6 @@ RSpec/FeatureCategory:
     - 'spec/models/user_agent_detail_spec.rb'
     - 'spec/models/user_canonical_email_spec.rb'
     - 'spec/models/user_custom_attribute_spec.rb'
-    - 'spec/models/user_detail_spec.rb'
     - 'spec/models/user_highest_role_spec.rb'
     - 'spec/models/user_mentions/commit_user_mention_spec.rb'
     - 'spec/models/user_mentions/issue_user_mention_spec.rb'
diff --git a/.rubocop_todo/rspec/named_subject.yml b/.rubocop_todo/rspec/named_subject.yml
index 13ea468885a..77ed1246b7a 100644
--- a/.rubocop_todo/rspec/named_subject.yml
+++ b/.rubocop_todo/rspec/named_subject.yml
@@ -2416,7 +2416,6 @@ RSpec/NamedSubject:
     - 'spec/lib/gitlab/tree_summary_spec.rb'
     - 'spec/lib/gitlab/unicode_spec.rb'
     - 'spec/lib/gitlab/untrusted_regexp_spec.rb'
-    - 'spec/lib/gitlab/url_blocker_spec.rb'
     - 'spec/lib/gitlab/url_builder_spec.rb'
     - 'spec/lib/gitlab/usage/metric_definition_spec.rb'
     - 'spec/lib/gitlab/usage/metrics/instrumentations/database_metric_spec.rb'
diff --git a/.rubocop_todo/style/arguments_forwarding.yml b/.rubocop_todo/style/arguments_forwarding.yml
index f578b75e5f0..b72751ed279 100644
--- a/.rubocop_todo/style/arguments_forwarding.yml
+++ b/.rubocop_todo/style/arguments_forwarding.yml
@@ -115,7 +115,6 @@ Style/ArgumentsForwarding:
     - 'lib/gitlab/redis/multi_store.rb'
     - 'lib/gitlab/repository_cache.rb'
     - 'lib/gitlab/tracking.rb'
-    - 'lib/gitlab/url_blocker.rb'
     - 'lib/gitlab/url_builder.rb'
     - 'lib/gitlab/usage/metrics/query.rb'
     - 'lib/gitlab_settings/settings.rb'
diff --git a/.rubocop_todo/style/guard_clause.yml b/.rubocop_todo/style/guard_clause.yml
index 933b33999e3..9896356b1f6 100644
--- a/.rubocop_todo/style/guard_clause.yml
+++ b/.rubocop_todo/style/guard_clause.yml
@@ -538,7 +538,6 @@ Style/GuardClause:
     - 'lib/gitlab/sidekiq_config/cli_methods.rb'
     - 'lib/gitlab/sidekiq_middleware/size_limiter/compressor.rb'
     - 'lib/gitlab/sql/set_operator.rb'
-    - 'lib/gitlab/url_blocker.rb'
     - 'lib/gitlab/usage/metrics/instrumentations/count_bulk_imports_entities_metric.rb'
     - 'lib/gitlab/utils/override.rb'
     - 'lib/gitlab/webpack/manifest.rb'
diff --git a/.rubocop_todo/style/if_unless_modifier.yml b/.rubocop_todo/style/if_unless_modifier.yml
index cb5e5134dcf..72189f27bd0 100644
--- a/.rubocop_todo/style/if_unless_modifier.yml
+++ b/.rubocop_todo/style/if_unless_modifier.yml
@@ -881,7 +881,6 @@ Style/IfUnlessModifier:
     - 'lib/gitlab/suggestions/suggestion_set.rb'
     - 'lib/gitlab/template_parser/eval_state.rb'
     - 'lib/gitlab/untrusted_regexp.rb'
-    - 'lib/gitlab/url_blocker.rb'
     - 'lib/gitlab/usage_data_counters/base_counter.rb'
     - 'lib/gitlab/usage_data_counters/hll_redis_counter.rb'
     - 'lib/gitlab/utils/delegator_override.rb'
diff --git a/.rubocop_todo/style/inline_disable_annotation.yml b/.rubocop_todo/style/inline_disable_annotation.yml
index 470ede21304..58650799d8d 100644
--- a/.rubocop_todo/style/inline_disable_annotation.yml
+++ b/.rubocop_todo/style/inline_disable_annotation.yml
@@ -2620,7 +2620,6 @@ Style/InlineDisableAnnotation:
     - 'lib/gitlab/throttle.rb'
     - 'lib/gitlab/tracking.rb'
     - 'lib/gitlab/uploads/migration_helper.rb'
-    - 'lib/gitlab/url_blocker.rb'
     - 'lib/gitlab/url_builder.rb'
     - 'lib/gitlab/usage/metrics/instrumentations/count_imported_projects_metric.rb'
     - 'lib/gitlab/usage/metrics/instrumentations/database_metric.rb'