Add latest changes from gitlab-org/gitlab@master

1 files changed, 263 insertions, 112 deletions

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index bd0f9184cd6..a4c56feda27 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,30 +1,21 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-01-16 11:53:06 -0800 using RuboCop version 0.74.0.
+# on 2020-05-20 16:32:14 -0400 using RuboCop version 0.82.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 299
+# Offense count: 308
 # Cop supports --auto-correct.
 Capybara/CurrentPathExpectation:
   Enabled: false
 
-# Offense count: 1432
+# Offense count: 1715
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: with_first_argument, with_fixed_indentation
-Layout/AlignArguments:
-  Enabled: false
-
-# Offense count: 1630
-# Cop supports --auto-correct.
-# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
-# SupportedHashRocketStyles: key, separator, table
-# SupportedColonStyles: key, separator, table
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/AlignHash:
+Layout/ArgumentAlignment:
   Enabled: false
 
 # Offense count: 13
@@ -41,7 +32,7 @@ Layout/ClosingHeredocIndentation:
     - 'spec/rubocop/cop/active_record_association_reload_spec.rb'
     - 'spec/services/task_list_toggle_service_spec.rb'
 
-# Offense count: 9
+# Offense count: 13
 # Cop supports --auto-correct.
 Layout/ClosingParenthesisIndentation:
   Exclude:
@@ -52,7 +43,7 @@ Layout/ClosingParenthesisIndentation:
     - 'spec/support/helpers/stub_object_storage.rb'
     - 'spec/workers/remove_unreferenced_lfs_objects_worker_spec.rb'
 
-# Offense count: 69
+# Offense count: 72
 # Cop supports --auto-correct.
 Layout/EmptyLinesAroundArguments:
   Exclude:
@@ -60,46 +51,61 @@ Layout/EmptyLinesAroundArguments:
     - 'app/models/concerns/resolvable_discussion.rb'
     - 'app/models/diff_discussion.rb'
     - 'app/models/discussion.rb'
-    - 'ee/app/helpers/license_helper.rb'
     - 'ee/spec/models/geo/project_registry_spec.rb'
     - 'lib/banzai/pipeline/broadcast_message_pipeline.rb'
     - 'lib/banzai/pipeline/gfm_pipeline.rb'
     - 'lib/banzai/pipeline/single_line_pipeline.rb'
     - 'spec/features/markdown/copy_as_gfm_spec.rb'
 
-# Offense count: 305
+# Offense count: 413
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_brackets
-Layout/IndentFirstArrayElement:
+Layout/FirstArrayElementIndentation:
   Enabled: false
 
-# Offense count: 1005
+# Offense count: 1218
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   Enabled: false
 
 # Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: consistent, align_parentheses
-Layout/IndentFirstParameter:
+Layout/FirstParameterIndentation:
   Exclude:
     - 'lib/gitlab/cross_project_access.rb'
     - 'lib/gitlab/data_builder/push.rb'
     - 'spec/support/helpers/repo_helpers.rb'
     - 'spec/support/helpers/stub_object_storage.rb'
 
-# Offense count: 54
+# Offense count: 2164
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Enabled: false
+
+# Offense count: 9396
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 1313
+
+# Offense count: 94
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: aligned, indented
 Layout/MultilineOperationIndentation:
   Enabled: false
 
-# Offense count: 10
+# Offense count: 9
 # Cop supports --auto-correct.
 Layout/RescueEnsureAlignment:
   Exclude:
@@ -107,21 +113,33 @@ Layout/RescueEnsureAlignment:
     - 'app/models/project.rb'
     - 'app/services/prometheus/proxy_service.rb'
     - 'app/workers/delete_stored_files_worker.rb'
-    - 'app/workers/reactive_caching_worker.rb'
     - 'config/initializers/1_settings.rb'
     - 'config/initializers/trusted_proxies.rb'
     - 'lib/gitlab/background_migration/archive_legacy_traces.rb'
     - 'lib/gitlab/highlight.rb'
     - 'lib/tasks/gitlab/lfs/migrate.rake'
 
-# Offense count: 522
+# Offense count: 36
+# Cop supports --auto-correct.
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment.
+Layout/SpaceBeforeFirstArg:
+  Exclude:
+    - 'spec/requests/api/runner_spec.rb'
+    - 'spec/support/shared_examples/requests/api/custom_attributes_shared_examples.rb'
+
+# Offense count: 642
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: require_no_space, require_space
 Layout/SpaceInLambdaLiteral:
   Enabled: false
 
-# Offense count: 796
+# Offense count: 926
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
 # SupportedStyles: space, no_space
@@ -129,7 +147,7 @@ Layout/SpaceInLambdaLiteral:
 Layout/SpaceInsideBlockBraces:
   Enabled: false
 
-# Offense count: 315
+# Offense count: 401
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: space, no_space
@@ -153,12 +171,47 @@ Lint/DuplicateMethods:
     - 'lib/gitlab/git/tree.rb'
     - 'lib/gitlab/git/wiki_page.rb'
 
-# Offense count: 122
+# Offense count: 157
 # Configuration parameters: MaximumRangeSize.
 Lint/MissingCopEnableDirective:
   Enabled: false
 
-# Offense count: 6
+# Offense count: 11
+# Cop supports --auto-correct.
+Lint/NonDeterministicRequireOrder:
+  Exclude:
+    - 'ee/spec/spec_helper.rb'
+    - 'qa/spec/spec_helper.rb'
+    - 'spec/spec_helper.rb'
+
+# Offense count: 3
+# Configuration parameters: AllowedImplicitNamespaces.
+# AllowedImplicitNamespaces: Gem
+Lint/RaiseException:
+  Exclude:
+    - 'db/migrate/20190402150158_backport_enterprise_schema.rb'
+    - 'ee/spec/requests/api/helpers_spec.rb'
+    - 'spec/requests/api/helpers_spec.rb'
+
+# Offense count: 27
+# Cop supports --auto-correct.
+Lint/RedundantCopDisableDirective:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Lint/SendWithMixinArgument:
+  Exclude:
+    - 'config/initializers/trusted_proxies.rb'
+
+# Offense count: 3
+Lint/StructNewOverride:
+  Exclude:
+    - 'app/presenters/sentry_error_presenter.rb'
+    - 'app/serializers/environment_serializer.rb'
+    - 'lib/gitlab/ci/pipeline/duration.rb'
+
+# Offense count: 7
 Lint/UriEscapeUnescape:
   Exclude:
     - 'app/controllers/application_controller.rb'
@@ -166,14 +219,20 @@ Lint/UriEscapeUnescape:
     - 'spec/lib/google_api/auth_spec.rb'
     - 'spec/requests/api/files_spec.rb'
 
-# Offense count: 165
+# Offense count: 3
 # Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 176
+Lint/UriRegexp:
+  Exclude:
+    - 'app/models/concerns/mentionable/reference_regexes.rb'
+    - 'app/services/projects/download_service.rb'
+    - 'lib/gitlab/ci/pipeline/chain/config/content/remote.rb'
+
+# Offense count: 65
+# Cop supports --auto-correct.
+Migration/DepartmentName:
+  Enabled: false
 
-# Offense count: 143
+# Offense count: 156
 # Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
 # AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
 Naming/FileName:
@@ -190,43 +249,78 @@ Naming/HeredocDelimiterCase:
     - 'spec/support/helpers/repo_helpers.rb'
     - 'spec/support/helpers/seed_repo.rb'
 
-# Offense count: 211
-# Configuration parameters: Blacklist.
-# Blacklist: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
+# Offense count: 239
+# Configuration parameters: ForbiddenDelimiters.
+# ForbiddenDelimiters: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
   Enabled: false
 
-# Offense count: 139
+# Offense count: 5
+# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+# AllowedNames: io, id, to, by, on, in, at, ip, db, os, pp
+Naming/MethodParameterName:
+  Exclude:
+    - 'lib/gitlab/diff/inline_diff.rb'
+    - 'spec/support/helpers/key_generator_helper.rb'
+
+# Offense count: 162
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredName.
 Naming/RescuedExceptionsVariableName:
   Enabled: false
 
-# Offense count: 9913
+# Offense count: 20
+# Cop supports --auto-correct.
+Performance/Count:
+  Exclude:
+    - 'app/helpers/groups_helper.rb'
+    - 'app/services/merge_requests/add_context_service.rb'
+    - 'ee/lib/gitlab/geo/fdw.rb'
+    - 'ee/lib/gitlab/graphql/aggregations/epics/epic_node.rb'
+    - 'ee/spec/controllers/projects/feature_flags_controller_spec.rb'
+    - 'ee/spec/requests/api/feature_flags_spec.rb'
+    - 'lib/gitlab/sidekiq_status.rb'
+    - 'spec/lib/gitlab/conflict/file_spec.rb'
+    - 'spec/lib/gitlab/git/tree_spec.rb'
+    - 'spec/models/ci/build_spec.rb'
+    - 'spec/support/matchers/exceed_query_limit.rb'
+
+# Offense count: 25
+# Cop supports --auto-correct.
+Performance/Detect:
+  Exclude:
+    - 'ee/spec/controllers/projects/dependencies_controller_spec.rb'
+    - 'ee/spec/controllers/projects/feature_flags_controller_spec.rb'
+    - 'ee/spec/requests/api/unleash_spec.rb'
+    - 'spec/lib/gitlab/git/tree_spec.rb'
+    - 'spec/lib/gitlab/import_export/project/tree_restorer_spec.rb'
+    - 'spec/models/event_spec.rb'
+    - 'spec/requests/api/jobs_spec.rb'
+
+# Offense count: 11832
 # Configuration parameters: Prefixes.
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Enabled: false
 
-# Offense count: 879
+# Offense count: 1121
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: method_call, block
 RSpec/ExpectChange:
   Enabled: false
 
-# Offense count: 660
+# Offense count: 751
 RSpec/ExpectInHook:
   Enabled: false
 
-# Offense count: 10
+# Offense count: 9
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: it_behaves_like, it_should_behave_like
 RSpec/ItBehavesLike:
   Exclude:
     - 'spec/lib/gitlab/git/commit_spec.rb'
-    - 'spec/lib/gitlab/git/repository_spec.rb'
     - 'spec/services/notification_service_spec.rb'
 
 # Offense count: 68
@@ -244,30 +338,28 @@ RSpec/LetBeforeExamples:
     - 'spec/rubocop/cop/migration/update_column_in_batches_spec.rb'
     - 'spec/serializers/pipeline_details_entity_spec.rb'
 
-# Offense count: 2018
+# Offense count: 2188
 # Cop supports --auto-correct.
 # Configuration parameters: Strict, EnforcedStyle, AllowedExplicitMatchers.
 # SupportedStyles: inflected, explicit
 RSpec/PredicateMatcher:
   Enabled: false
 
-# Offense count: 584
+# Offense count: 635
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: and_return, block
 RSpec/ReturnFromStub:
   Enabled: false
 
-# Offense count: 380
+# Offense count: 518
 RSpec/ScatteredLet:
   Enabled: false
 
-# Offense count: 8
+# Offense count: 4
 RSpec/ScatteredSetup:
   Exclude:
-    - 'spec/lib/gitlab/bitbucket_import/importer_spec.rb'
     - 'spec/requests/api/jobs_spec.rb'
-    - 'spec/services/projects/create_service_spec.rb'
 
 # Offense count: 10
 # Cop supports --auto-correct.
@@ -284,67 +376,92 @@ Rails/ApplicationController:
     - 'spec/controllers/concerns/continue_params_spec.rb'
     - 'spec/lib/marginalia_spec.rb'
 
-# Offense count: 8
+# Offense count: 3
 # Cop supports --auto-correct.
 Rails/BelongsTo:
   Exclude:
     - 'app/models/deployment.rb'
     - 'app/models/environment.rb'
-    - 'ee/app/models/prometheus_alert.rb'
-    - 'ee/app/models/prometheus_alert_event.rb'
 
-# Offense count: 151
+# Offense count: 71
+# Configuration parameters: Database, Include.
+# SupportedDatabases: mysql, postgresql
+# Include: db/migrate/*.rb
+Rails/BulkChangeTable:
+  Enabled: false
+
+# Offense count: 208
 # Configuration parameters: Include.
 # Include: db/migrate/*.rb
 Rails/CreateTableWithTimestamps:
   Enabled: false
 
-# Offense count: 266
+# Offense count: 346
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: slashes, arguments
 Rails/FilePath:
   Enabled: false
 
-# Offense count: 211
+# Offense count: 264
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasManyOrHasOneDependent:
   Enabled: false
 
-# Offense count: 431
+# Offense count: 467
 # Configuration parameters: Include.
 # Include: app/helpers/**/*.rb
 Rails/HelperInstanceVariable:
   Enabled: false
 
-# Offense count: 103
+# Offense count: 15
+# Cop supports --auto-correct.
+Rails/IndexBy:
+  Exclude:
+    - 'app/models/ci/pipeline.rb'
+    - 'app/services/ci/pipeline_processing/atomic_processing_service/status_collection.rb'
+    - 'ee/app/services/projects/update_mirror_service.rb'
+    - 'ee/app/services/security/store_report_service.rb'
+    - 'ee/lib/ee/gitlab/auth/ldap/sync/group.rb'
+    - 'ee/lib/ee/gitlab/background_migration/backfill_version_data_from_gitaly.rb'
+    - 'ee/lib/gitlab/analytics/type_of_work/tasks_by_type.rb'
+    - 'ee/lib/gitlab/elastic/document_reference.rb'
+    - 'ee/lib/gitlab/group_plans_preloader.rb'
+    - 'lib/gitlab/database/count/reltuples_count_strategy.rb'
+    - 'lib/gitlab/language_detection.rb'
+
+# Offense count: 36
+# Cop supports --auto-correct.
+Rails/IndexWith:
+  Enabled: false
+
+# Offense count: 105
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/InverseOf:
   Enabled: false
 
-# Offense count: 51
+# Offense count: 55
 # Configuration parameters: Include.
 # Include: app/controllers/**/*.rb
 Rails/LexicallyScopedActionFilter:
   Enabled: false
 
-# Offense count: 4
+# Offense count: 3
 # Cop supports --auto-correct.
 Rails/LinkToBlank:
   Exclude:
     - 'app/helpers/projects_helper.rb'
     - 'app/helpers/wiki_helper.rb'
     - 'ee/app/helpers/ee/user_callouts_helper.rb'
-    - 'ee/app/helpers/license_helper.rb'
 
-# Offense count: 35
+# Offense count: 34
 # Configuration parameters: Include.
 # Include: **/Rakefile, **/*.rake
 Rails/RakeEnvironment:
   Enabled: false
 
-# Offense count: 868
+# Offense count: 926
 # Configuration parameters: Blacklist, Whitelist.
 # Blacklist: decrement!, decrement_counter, increment!, increment_counter, toggle!, touch, update_all, update_attribute, update_column, update_columns, update_counters
 Rails/SkipsModelValidations:
@@ -360,13 +477,18 @@ Security/YAMLLoad:
     - 'spec/initializers/secret_token_spec.rb'
     - 'spec/lib/gitlab/prometheus/additional_metrics_parser_spec.rb'
 
-# Offense count: 34
-# Configuration parameters: EnforcedStyle.
+# Offense count: 10
+# Configuration parameters: EnforcedStyle, AllowModifiersOnSymbols.
 # SupportedStyles: inline, group
 Style/AccessModifierDeclarations:
-  Enabled: false
+  Exclude:
+    - 'app/helpers/issues_helper.rb'
+    - 'app/helpers/lazy_image_tag_helper.rb'
+    - 'lib/gitlab/cache/request_cache.rb'
+    - 'lib/gitlab/request_profiler.rb'
+    - 'spec/support/forgery_protection.rb'
 
-# Offense count: 127
+# Offense count: 148
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: percent_q, bare_percent
@@ -379,7 +501,7 @@ Style/CommentedKeyword:
     - 'lib/tasks/gitlab/backup.rake'
     - 'spec/tasks/gitlab/backup_rake_spec.rb'
 
-# Offense count: 6
+# Offense count: 5
 # Cop supports --auto-correct.
 Style/EachWithObject:
   Exclude:
@@ -388,9 +510,8 @@ Style/EachWithObject:
     - 'lib/gitlab/hook_data/issuable_builder.rb'
     - 'lib/gitlab/i18n/po_linter.rb'
     - 'lib/gitlab/import_export/members_mapper.rb'
-    - 'lib/gitlab/import_export/relation_factory.rb'
 
-# Offense count: 41
+# Offense count: 46
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: empty, nil, both
@@ -404,7 +525,7 @@ Style/EmptyLambdaParameter:
     - 'app/models/ci/build.rb'
     - 'app/models/ci/runner.rb'
 
-# Offense count: 8
+# Offense count: 7
 # Cop supports --auto-correct.
 Style/EmptyLiteral:
   Exclude:
@@ -414,38 +535,66 @@ Style/EmptyLiteral:
     - 'spec/helpers/merge_requests_helper_spec.rb'
     - 'spec/lib/gitlab/workhorse_spec.rb'
     - 'spec/requests/api/jobs_spec.rb'
-    - 'spec/support/shared_examples/chat_slash_commands_shared_examples.rb'
 
-# Offense count: 148
+# Offense count: 170
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: compact, expanded
 Style/EmptyMethod:
   Enabled: false
 
-# Offense count: 346
+# Offense count: 431
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: format, sprintf, percent
 Style/FormatString:
   Enabled: false
 
-# Offense count: 692
+# Offense count: 769
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Enabled: false
 
-# Offense count: 27
+# Offense count: 47
+# Cop supports --auto-correct.
+Style/HashEachMethods:
+  Enabled: false
+
+# Offense count: 6
+# Cop supports --auto-correct.
+Style/HashTransformKeys:
+  Exclude:
+    - 'ee/app/models/vulnerabilities/occurrence.rb'
+    - 'ee/spec/lib/gitlab/ci/templates/dependency_scanning_gitlab_ci_yaml_spec.rb'
+    - 'lib/banzai/filter/commit_trailers_filter.rb'
+    - 'lib/gitlab/analytics/cycle_analytics/stage_events.rb'
+
+# Offense count: 10
+# Cop supports --auto-correct.
+Style/HashTransformValues:
+  Exclude:
+    - 'app/validators/addressable_url_validator.rb'
+    - 'config/initializers/action_dispatch_journey_formatter.rb'
+    - 'ee/app/helpers/compliance_management/compliance_framework/project_settings_helper.rb'
+    - 'ee/app/services/packages/nuget/metadata_extraction_service.rb'
+    - 'lib/gitlab/config/entry/configurable.rb'
+    - 'lib/gitlab/config/entry/node.rb'
+    - 'lib/gitlab/discussions_diff/file_collection.rb'
+    - 'lib/gitlab/error_tracking.rb'
+    - 'lib/rspec_flaky/flaky_examples_collection.rb'
+    - 'spec/lib/gitlab/database_importers/common_metrics/prometheus_metric_spec.rb'
+
+# Offense count: 31
 # Configuration parameters: AllowIfModifier.
 Style/IfInsideElse:
   Enabled: false
 
-# Offense count: 1474
+# Offense count: 1313
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
   Enabled: false
 
-# Offense count: 314
+# Offense count: 377
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: line_count_dependent, lambda, literal
@@ -460,51 +609,49 @@ Style/MethodMissingSuper:
 Style/MissingRespondToMissing:
   Enabled: false
 
-# Offense count: 6
+# Offense count: 5
 Style/MixinUsage:
   Exclude:
     - 'spec/factories/ci/builds.rb'
     - 'spec/factories/ci/job_artifacts.rb'
     - 'spec/factories/lfs_objects.rb'
     - 'spec/factories/notes.rb'
-    - 'spec/lib/gitlab/import_export/project_tree_restorer_spec.rb'
     - 'spec/lib/gitlab/import_export/version_checker_spec.rb'
 
-# Offense count: 4
+# Offense count: 2
 # Cop supports --auto-correct.
 Style/MultilineIfModifier:
   Exclude:
-    - 'app/helpers/snippets_helper.rb'
     - 'app/services/ci/process_pipeline_service.rb'
     - 'lib/api/commit_statuses.rb'
 
-# Offense count: 25
+# Offense count: 29
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, MinBodyLength.
 # SupportedStyles: skip_modifier_ifs, always
 Style/Next:
   Enabled: false
 
-# Offense count: 71
+# Offense count: 89
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedOctalStyle.
 # SupportedOctalStyles: zero_with_o, zero_only
 Style/NumericLiteralPrefix:
   Enabled: false
 
-# Offense count: 234
+# Offense count: 255
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
   Enabled: false
 
-# Offense count: 106
+# Offense count: 117
 # Cop supports --auto-correct.
 Style/ParallelAssignment:
   Enabled: false
 
-# Offense count: 1692
+# Offense count: 2035
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
@@ -526,51 +673,60 @@ Style/PerlBackrefs:
     - 'lib/gitlab/search_results.rb'
     - 'lib/gitlab/sherlock/query.rb'
 
-# Offense count: 165
+# Offense count: 200
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: compact, exploded
 Style/RaiseArgs:
   Enabled: false
 
-# Offense count: 221
+# Offense count: 246
 # Cop supports --auto-correct.
 Style/RedundantFreeze:
   Enabled: false
 
-# Offense count: 15
+# Offense count: 123
+# Cop supports --auto-correct.
+Style/RedundantInterpolation:
+  Enabled: false
+
+# Offense count: 6
+# Cop supports --auto-correct.
+Style/RedundantParentheses:
+  Exclude:
+    - 'ee/app/models/ee/merge_request.rb'
+
+# Offense count: 33
 # Cop supports --auto-correct.
 # Configuration parameters: AllowMultipleReturnValues.
 Style/RedundantReturn:
-  Exclude:
-    - 'app/controllers/application_controller.rb'
-    - 'app/controllers/concerns/issuable_actions.rb'
-    - 'app/controllers/groups/application_controller.rb'
-    - 'app/controllers/omniauth_callbacks_controller.rb'
-    - 'app/controllers/profiles/keys_controller.rb'
-    - 'app/controllers/projects/application_controller.rb'
-    - 'app/services/access_token_validation_service.rb'
-    - 'lib/gitlab/utils.rb'
-    - 'lib/google_api/auth.rb'
+  Enabled: false
 
-# Offense count: 739
+# Offense count: 801
 # Cop supports --auto-correct.
 Style/RedundantSelf:
   Enabled: false
 
-# Offense count: 80
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/RedundantSort:
+  Exclude:
+    - 'ee/app/presenters/packages/nuget/search_results_presenter.rb'
+    - 'ee/spec/presenters/packages/nuget/search_results_presenter_spec.rb'
+
+# Offense count: 120
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, AllowInnerSlashes.
 # SupportedStyles: slashes, percent_r, mixed
 Style/RegexpLiteral:
   Enabled: false
 
-# Offense count: 42
+# Offense count: 46
 # Cop supports --auto-correct.
 Style/RescueModifier:
   Enabled: false
 
-# Offense count: 237
+# Offense count: 286
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: implicit, explicit
@@ -592,28 +748,23 @@ Style/SingleLineMethods:
   Exclude:
     - 'lib/gitlab/ci/ansi2html.rb'
 
-# Offense count: 94
+# Offense count: 102
 # Cop supports --auto-correct.
 # Configuration parameters: .
 # SupportedStyles: use_perl_names, use_english_names
 Style/SpecialGlobalVars:
   EnforcedStyle: use_perl_names
 
-# Offense count: 75
+# Offense count: 93
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiteralsInInterpolation:
   Enabled: false
 
-# Offense count: 216
+# Offense count: 233
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoredMethods.
 # IgnoredMethods: respond_to, define_method
 Style/SymbolProc:
   Enabled: false
-
-# Offense count: 99
-# Cop supports --auto-correct.
-Style/UnneededInterpolation:
-  Enabled: false