diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index f9a8c09f5fbe71e987bb185493371e05b2ebe352_LnJ1Ym9jb3BfdG9kby55bWw=..676c485d9fe3179a5d0328453b62600d2ab1ce36_LnJ1Ym9jb3BfdG9kby55bWw= 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,8 +1,8 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-04-22 00:00:00 UTC using RuboCop version 0.93.1.
+# on 2022-08-18 00:00:00 UTC using RuboCop version 0.93.1.
 # 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.
 
@@ -4,10 +4,9 @@
 # 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: 713
-# Cop supports --auto-correct.
+# Offense count: 738
 CodeReuse/ActiveRecord:
   Enabled: false
 
@@ -11,8 +10,16 @@
 CodeReuse/ActiveRecord:
   Enabled: false
 
-# Offense count: 47
+# Offense count: 5
+Cop/AvoidReturnFromBlocks:
+  Exclude:
+    - 'files/gitlab-cookbooks/consul/libraries/consul_helper.rb'
+    - 'files/gitlab-ctl-commands-ee/lib/patroni.rb'
+    - 'files/gitlab-ctl-commands-ee/lib/postgresql/ee.rb'
+    - 'lib/gitlab/tasks/build.rake'
+
+# Offense count: 41
 # Cop supports --auto-correct.
 Cop/LineBreakAroundConditionalBlock:
   Enabled: false
 
@@ -15,10 +22,7 @@
 # Cop supports --auto-correct.
 Cop/LineBreakAroundConditionalBlock:
   Enabled: false
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleAlignWith, Severity.
-# SupportedStylesAlignWith: start_of_line, begin
-Layout/BeginEndAlignment:
+# Offense count: 8
+Fips/MD5:
   Exclude:
@@ -24,5 +28,12 @@
   Exclude:
-    - 'files/gitlab-ctl-commands-ee/repmgr.rb'
+    - 'config/software/gitlab-geo-psql.rb'
+    - 'config/software/gitlab-healthcheck.rb'
+    - 'config/software/gitlab-pg-ctl.rb'
+    - 'config/software/gitlab-psql.rb'
+    - 'config/software/gitlab-redis-cli.rb'
+    - 'files/gitlab-cookbooks/gitlab/libraries/helpers/base_pg_helper.rb'
+    - 'files/gitlab-cookbooks/gitlab/libraries/rails_migration_helper.rb'
+    - 'files/gitlab-ctl-commands/lib/postgresql/password_hash.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
@@ -26,8 +37,21 @@
 
 # Offense count: 2
 # Cop supports --auto-correct.
+Fips/OpenSSL:
+  Exclude:
+    - 'files/gitlab-cookbooks/letsencrypt/recipes/enable.rb'
+    - 'files/gitlab-cookbooks/package/libraries/certificate_helper.rb'
+
+# Offense count: 2
+Fips/SHA1:
+  Exclude:
+    - 'files/gitlab-cookbooks/letsencrypt/recipes/enable.rb'
+    - 'files/gitlab-cookbooks/package/libraries/certificate_helper.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
 # Configuration parameters: AllowAliasSyntax, AllowedMethods.
 # AllowedMethods: alias_method, public, protected, private
 Layout/EmptyLinesAroundAttributeAccessor:
   Exclude:
     - 'files/gitlab-cookbooks/package/libraries/helpers/logging_helper.rb'
@@ -29,9 +53,8 @@
 # Configuration parameters: AllowAliasSyntax, AllowedMethods.
 # AllowedMethods: alias_method, public, protected, private
 Layout/EmptyLinesAroundAttributeAccessor:
   Exclude:
     - 'files/gitlab-cookbooks/package/libraries/helpers/logging_helper.rb'
-    - 'spec/gitlab/tasks/qa_spec.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -41,13 +64,7 @@
   Exclude:
     - 'files/gitlab-ctl-commands-ee/get_postgresql_primary.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Layout/RescueEnsureAlignment:
-  Exclude:
-    - 'files/gitlab-ctl-commands-ee/repmgr.rb'
-
 # Offense count: 5
 # Cop supports --auto-correct.
 Layout/SpaceAroundMethodCallOperator:
   Exclude:
@@ -50,6 +67,7 @@
 # Offense count: 5
 # Cop supports --auto-correct.
 Layout/SpaceAroundMethodCallOperator:
   Exclude:
+    - 'spec/chef/cookbooks/package/libraries/helpers/logging_helper_spec.rb'
     - 'spec/chef/cookbooks/postgresql/recipes/postgresql_spec.rb'
     - 'spec/chef/gitlab-ctl-commands-ee/lib/postgresql/ee_spec.rb'
@@ -54,6 +72,5 @@
     - 'spec/chef/cookbooks/postgresql/recipes/postgresql_spec.rb'
     - 'spec/chef/gitlab-ctl-commands-ee/lib/postgresql/ee_spec.rb'
-    - 'spec/chef/cookbooks/package/libraries/helpers/logging_helper_spec.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -62,9 +79,9 @@
   Exclude:
     - 'files/gitlab-ctl-commands/pg-upgrade.rb'
 
-# Offense count: 12
+# Offense count: 11
 Lint/ConstantDefinitionInBlock:
   Exclude:
     - 'files/gitlab-ctl-commands/upgrade.rb'
     - 'spec/chef/cookbooks/package/libraries/secrets_helper_spec.rb'
     - 'spec/chef/gitlab-ctl-commands/gitlab_ctl_spec.rb'
@@ -66,9 +83,7 @@
 Lint/ConstantDefinitionInBlock:
   Exclude:
     - 'files/gitlab-ctl-commands/upgrade.rb'
     - 'spec/chef/cookbooks/package/libraries/secrets_helper_spec.rb'
     - 'spec/chef/gitlab-ctl-commands/gitlab_ctl_spec.rb'
-    - 'spec/lib/gitlab/build/image_spec.rb'
-    - 'spec/lib/gitlab/tasks/qa_spec.rb'
     - 'spec/chef/support/shared_examples/geo_promotion_command_accepts_option_shared_examples.rb'
     - 'spec/chef/support/shared_examples/gitlab_geo_promotion_commands_shared_examples.rb'
@@ -73,5 +88,6 @@
     - 'spec/chef/support/shared_examples/geo_promotion_command_accepts_option_shared_examples.rb'
     - 'spec/chef/support/shared_examples/gitlab_geo_promotion_commands_shared_examples.rb'
+    - 'spec/lib/gitlab/build/image_spec.rb'
 
 # Offense count: 1
 Lint/DuplicateMethods:
@@ -91,6 +107,6 @@
     - 'spec/chef_helper.rb'
     - 'spec/spec_helper.rb'
 
-# Offense count: 2
+# Offense count: 3
 # Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
@@ -95,4 +111,4 @@
 # Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Max: 17
+  Max: 15
 
@@ -98,4 +114,4 @@
 
-# Offense count: 2
+# Offense count: 4
 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
@@ -100,4 +116,4 @@
 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
-  Max: 18
+  Max: 16
 
@@ -103,7 +119,7 @@
 
-# Offense count: 91
+# Offense count: 90
 # Configuration parameters: ExpectMatchingDefinition, CheckDefinitionPathHierarchy, 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:
   Enabled: false
 
@@ -105,11 +121,11 @@
 # Configuration parameters: ExpectMatchingDefinition, CheckDefinitionPathHierarchy, 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:
   Enabled: false
 
-# Offense count: 42
+# Offense count: 43
 # Configuration parameters: ForbiddenDelimiters.
 # ForbiddenDelimiters: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
   Enabled: false
 
@@ -111,9 +127,9 @@
 # Configuration parameters: ForbiddenDelimiters.
 # ForbiddenDelimiters: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
   Enabled: false
 
-# Offense count: 24
+# Offense count: 23
 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
 # NamePrefix: is_, has_, have_
 # ForbiddenPrefixes: is_, has_, have_
@@ -129,7 +145,5 @@
     - 'files/gitlab-cookbooks/monitoring/libraries/prometheus_helper.rb'
     - 'files/gitlab-cookbooks/package/libraries/certificate_helper.rb'
     - 'files/gitlab-cookbooks/package/libraries/omnibus_helper.rb'
-    - 'files/gitlab-ctl-commands-ee/lib/repmgr.rb'
-    - 'files/gitlab-ctl-commands/lib/gitlab_ctl/prometheus_upgrade.rb'
     - 'lib/gitlab/build/check.rb'
 
@@ -134,8 +148,8 @@
     - 'lib/gitlab/build/check.rb'
 
-# Offense count: 5
+# Offense count: 2
 # Configuration parameters: MinSize.
 Performance/CollectionLiteralInLoop:
   Exclude:
     - 'files/gitlab-cookbooks/gitlab/libraries/helpers/gitlab_rails.rb'
     - 'files/gitlab-cookbooks/pgbouncer/libraries/pgbouncer_helper.rb'
@@ -137,10 +151,8 @@
 # Configuration parameters: MinSize.
 Performance/CollectionLiteralInLoop:
   Exclude:
     - 'files/gitlab-cookbooks/gitlab/libraries/helpers/gitlab_rails.rb'
     - 'files/gitlab-cookbooks/pgbouncer/libraries/pgbouncer_helper.rb'
-    - 'files/gitlab-cookbooks/repmgr/libraries/repmgr_helper.rb'
-    - 'lib/gitlab/package_repository.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -148,9 +160,9 @@
   Exclude:
     - 'files/gitlab-cookbooks/package/libraries/config/roles/default.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Cop supports --auto-correct.
 Performance/Detect:
   Exclude:
     - 'files/gitlab-cookbooks/gitlab/libraries/patroni.rb'
 
@@ -152,9 +164,9 @@
 # Cop supports --auto-correct.
 Performance/Detect:
   Exclude:
     - 'files/gitlab-cookbooks/gitlab/libraries/patroni.rb'
 
-# Offense count: 7
+# Offense count: 6
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect.
 Performance/StringInclude:
@@ -163,6 +175,5 @@
     - 'config/software/jemalloc.rb'
     - 'config/software/libtiff.rb'
     - 'files/gitlab-cookbooks/package/libraries/helpers/redhat_helper.rb'
-    - 'files/gitlab-ctl-commands-ee/lib/repmgr.rb'
     - 'files/gitlab-ctl-commands/upgrade.rb'
 
@@ -167,6 +178,6 @@
     - 'files/gitlab-ctl-commands/upgrade.rb'
 
-# Offense count: 8
+# Offense count: 6
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: separated, grouped
@@ -181,7 +192,7 @@
   Exclude:
     - 'files/gitlab-cookbooks/package/libraries/helpers/services_helper.rb'
 
-# Offense count: 5
+# Offense count: 8
 # Cop supports --auto-correct.
 Style/CaseLikeIf:
   Exclude:
@@ -205,10 +216,10 @@
   Exclude:
     - 'files/gitlab-cookbooks/solo.rb'
 
-# Offense count: 714
+# Offense count: 717
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 
@@ -209,10 +220,10 @@
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-# Offense count: 37
+# Offense count: 26
 # Cop supports --auto-correct.
 Style/GlobalStdStream:
   Exclude:
@@ -216,8 +227,7 @@
 # Cop supports --auto-correct.
 Style/GlobalStdStream:
   Exclude:
-    - 'files/gitlab-ctl-commands-ee/lib/geo/promote_to_primary_node.rb'
     - 'files/gitlab-ctl-commands-ee/lib/geo/promotion_preflight_checks.rb'
     - 'files/gitlab-ctl-commands-ee/lib/geo/replication.rb'
     - 'files/gitlab-ctl-commands/lib/gitlab_ctl/util.rb'
     - 'lib/gitlab/build/trigger.rb'
@@ -220,8 +230,7 @@
     - 'files/gitlab-ctl-commands-ee/lib/geo/promotion_preflight_checks.rb'
     - 'files/gitlab-ctl-commands-ee/lib/geo/replication.rb'
     - 'files/gitlab-ctl-commands/lib/gitlab_ctl/util.rb'
     - 'lib/gitlab/build/trigger.rb'
-    - 'spec/chef/gitlab-ctl-commands-ee/lib/geo/promote_to_primary_node_spec.rb'
     - 'spec/chef/gitlab-ctl-commands-ee/lib/geo/promotion_preflight_checks_spec.rb'
     - 'spec/chef/gitlab-ctl-commands-ee/lib/geo/replication_spec.rb'
     - 'spec/chef/gitlab-ctl-commands/lib/gitlab_ctl_backup_spec.rb'
@@ -253,10 +262,10 @@
   Exclude:
     - 'files/gitlab-cookbooks/monitoring/recipes/grafana.rb'
 
-# Offense count: 42
+# Offense count: 43
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedOctalStyle.
 # SupportedOctalStyles: zero_with_o, zero_only
 Style/NumericLiteralPrefix:
   Enabled: false
 
@@ -257,12 +266,12 @@
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedOctalStyle.
 # SupportedOctalStyles: zero_with_o, zero_only
 Style/NumericLiteralPrefix:
   Enabled: false
 
-# Offense count: 331
+# Offense count: 366
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
   Enabled: false
 
@@ -264,10 +273,10 @@
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
   Enabled: false
 
-# Offense count: 2
+# Offense count: 1
 # Cop supports --auto-correct.
 Style/RedundantAssignment:
   Exclude:
     - 'files/gitlab-cookbooks/gitlab/libraries/redis_helper.rb'
@@ -270,6 +279,5 @@
 # Cop supports --auto-correct.
 Style/RedundantAssignment:
   Exclude:
     - 'files/gitlab-cookbooks/gitlab/libraries/redis_helper.rb'
-    - 'files/gitlab-cookbooks/package/libraries/deprecations.rb'
 
@@ -275,5 +283,5 @@
 
-# Offense count: 6
+# Offense count: 5
 # Cop supports --auto-correct.
 Style/RedundantBegin:
   Exclude:
@@ -277,7 +285,6 @@
 # Cop supports --auto-correct.
 Style/RedundantBegin:
   Exclude:
-    - 'files/gitlab-cookbooks/postgresql/recipes/bin.rb'
     - 'files/gitlab-ctl-commands/lib/gitlab_ctl/pg_upgrade.rb'
     - 'files/gitlab-ctl-commands/lib/postgresql.rb'
     - 'files/gitlab-ctl-commands/pg-upgrade.rb'
@@ -289,7 +296,7 @@
     - 'files/gitlab-cookbooks/mattermost/recipes/enable.rb'
     - 'files/gitlab-ctl-commands-ee/lib/geo/replication.rb'
 
-# Offense count: 75
+# Offense count: 62
 # Cop supports --auto-correct.
 Style/RedundantFileExtensionInRequire:
   Enabled: false
@@ -300,7 +307,7 @@
   Exclude:
     - 'spec/chef_helper.rb'
 
-# Offense count: 84
+# Offense count: 58
 # Cop supports --auto-correct.
 Style/RedundantRegexpEscape:
   Exclude:
@@ -310,4 +317,5 @@
     - 'spec/chef/cookbooks/gitlab/recipes/gitlab-workhorse_spec.rb'
     - 'spec/chef/cookbooks/gitlab/recipes/mailroom_spec.rb'
     - 'spec/chef/cookbooks/gitlab/recipes/puma_spec.rb'
+    - 'spec/chef/cookbooks/gitlab/recipes/sidekiq_spec.rb'
     - 'spec/chef/cookbooks/registry/recipes/registry_spec.rb'
@@ -313,4 +321,2 @@
     - 'spec/chef/cookbooks/registry/recipes/registry_spec.rb'
-    - 'spec/chef/cookbooks/gitlab/recipes/sidekiq_spec.rb'
-    - 'spec/chef/cookbooks/gitlab/recipes/unicorn_spec.rb'
     - 'spec/chef_helper.rb'
@@ -316,3 +322,2 @@
     - 'spec/chef_helper.rb'
-    - 'spec/chef/gitlab-ctl-commands-ee/lib/geo/promote_to_primary_node_spec.rb'
 
@@ -318,8 +323,8 @@
 
-# Offense count: 249
+# Offense count: 315
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, AllowInnerSlashes.
 # SupportedStyles: slashes, percent_r, mixed
 Style/RegexpLiteral:
   Enabled: false
 
@@ -320,10 +325,10 @@
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, AllowInnerSlashes.
 # SupportedStyles: slashes, percent_r, mixed
 Style/RegexpLiteral:
   Enabled: false
 
-# Offense count: 5
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods.
 # AllowedMethods: present?, blank?, presence, try, try!
@@ -333,12 +338,6 @@
 
 # Offense count: 1
 # Cop supports --auto-correct.
-Style/SingleArgumentDig:
-  Exclude:
-    - 'spec/chef/recipes/gitlab-rails_spec.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
 Style/SlicingWithRange:
   Exclude:
     - 'files/gitlab-cookbooks/patroni/recipes/enable.rb'
@@ -342,5 +341,4 @@
 Style/SlicingWithRange:
   Exclude:
     - 'files/gitlab-cookbooks/patroni/recipes/enable.rb'
-    - 'files/gitlab-ctl-commands-ee/lib/repmgr.rb'
 
@@ -346,5 +344,5 @@
 
-# Offense count: 6
+# Offense count: 3
 # Configuration parameters: AllowModifier.
 Style/SoleNestedConditional:
   Exclude:
@@ -348,10 +346,7 @@
 # Configuration parameters: AllowModifier.
 Style/SoleNestedConditional:
   Exclude:
-    - 'config/software/libffi.rb'
-    - 'config/software/libxslt.rb'
-    - 'config/software/ncurses.rb'
     - 'files/gitlab-ctl-commands/lib/gitlab_ctl/upgrade_check.rb'
     - 'files/gitlab-ctl-commands/pg-upgrade.rb'
     - 'lib/gitlab/version.rb'
 
@@ -354,10 +349,10 @@
     - 'files/gitlab-ctl-commands/lib/gitlab_ctl/upgrade_check.rb'
     - 'files/gitlab-ctl-commands/pg-upgrade.rb'
     - 'lib/gitlab/version.rb'
 
-# Offense count: 39
+# Offense count: 34
 # Cop supports --auto-correct.
 Style/StderrPuts:
   Exclude:
     - 'files/gitlab-cookbooks/package/libraries/handlers/gitlab.rb'
     - 'files/gitlab-ctl-commands-ee/lib/pgbouncer.rb'
@@ -359,7 +354,6 @@
 # Cop supports --auto-correct.
 Style/StderrPuts:
   Exclude:
     - 'files/gitlab-cookbooks/package/libraries/handlers/gitlab.rb'
     - 'files/gitlab-ctl-commands-ee/lib/pgbouncer.rb'
-    - 'files/gitlab-ctl-commands-ee/lib/repmgr.rb'
     - 'files/gitlab-ctl-commands-ee/pgbouncer.rb'
@@ -365,5 +359,4 @@
     - 'files/gitlab-ctl-commands-ee/pgbouncer.rb'
-    - 'files/gitlab-ctl-commands-ee/repmgr.rb'
     - 'files/gitlab-ctl-commands/letsencrypt.rb'
     - 'files/gitlab-ctl-commands/lib/gitlab_ctl/pg_upgrade.rb'
     - 'files/gitlab-ctl-commands/lib/postgresql/replication.rb'
@@ -388,10 +381,10 @@
 Style/TrailingCommaInArrayLiteral:
   Enabled: false
 
-# Offense count: 139
+# Offense count: 188
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForMultiline.
 # SupportedStylesForMultiline: comma, consistent_comma, no_comma
 Style/TrailingCommaInHashLiteral:
   Enabled: false
 
@@ -392,8 +385,8 @@
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForMultiline.
 # SupportedStylesForMultiline: comma, consistent_comma, no_comma
 Style/TrailingCommaInHashLiteral:
   Enabled: false
 
-# Offense count: 3
+# Offense count: 23
 # Cop supports --auto-correct.
@@ -399,4 +392,4 @@
 # Cop supports --auto-correct.
-# Configuration parameters: WordRegex.
+# Configuration parameters: EnforcedStyle, MinSize, WordRegex.
 # SupportedStyles: percent, brackets
 Style/WordArray:
@@ -401,5 +394,16 @@
 # SupportedStyles: percent, brackets
 Style/WordArray:
-  EnforcedStyle: percent
-  MinSize: 7
+  Exclude:
+    - 'files/gitlab-cookbooks/gitlab/libraries/nginx.rb'
+    - 'files/gitlab-cookbooks/package/libraries/config/services.rb'
+    - 'files/gitlab-cookbooks/package/libraries/deprecations.rb'
+    - 'files/gitlab-ctl-commands-ee/lib/postgresql/ee.rb'
+    - 'files/gitlab-ctl-commands/lib/praefect.rb'
+    - 'lib/gitlab/ohai_helper.rb'
+    - 'spec/chef/cookbooks/gitlab/recipes/gitlab-rails/gitlab_yml/omniauth_spec.rb'
+    - 'spec/chef/cookbooks/gitlab/recipes/nginx_spec.rb'
+    - 'spec/chef/cookbooks/logrotate/recipes/folders_and_configs_spec.rb'
+    - 'spec/chef/cookbooks/monitoring/recipes/prometheus_spec.rb'
+    - 'spec/chef/cookbooks/package/libraries/deprecations_spec.rb'
+    - 'spec/chef/gitlab-ctl-commands/lib/praefect_spec.rb'
 
@@ -405,6 +409,6 @@
 
-# Offense count: 771
+# Offense count: 821
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
@@ -407,5 +411,5 @@
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Max: 379
+  Max: 410
diff --git a/Gemfile b/Gemfile
index f9a8c09f5fbe71e987bb185493371e05b2ebe352_R2VtZmlsZQ==..676c485d9fe3179a5d0328453b62600d2ab1ce36_R2VtZmlsZQ== 100644
--- a/Gemfile
+++ b/Gemfile
@@ -51,7 +51,7 @@
 end
 
 group :rubocop do
-  gem 'gitlab-styles', '~> 6.1', require: false
+  gem 'gitlab-styles', '~> 7.1', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index f9a8c09f5fbe71e987bb185493371e05b2ebe352_R2VtZmlsZS5sb2Nr..676c485d9fe3179a5d0328453b62600d2ab1ce36_R2VtZmlsZS5sb2Nr 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -241,6 +241,6 @@
       danger (>= 8.4.5)
       danger-gitlab (>= 8.0.0)
       rake
-    gitlab-styles (6.1.0)
+    gitlab-styles (7.1.0)
       rubocop (~> 0.91, >= 0.91.1)
       rubocop-gitlab-security (~> 0.1.1)
@@ -245,5 +245,6 @@
       rubocop (~> 0.91, >= 0.91.1)
       rubocop-gitlab-security (~> 0.1.1)
+      rubocop-graphql (~> 0.10)
       rubocop-performance (~> 1.9.2)
       rubocop-rails (~> 2.9)
       rubocop-rspec (~> 1.44)
@@ -419,6 +420,8 @@
       parser (>= 2.7.1.5)
     rubocop-gitlab-security (0.1.1)
       rubocop (>= 0.51)
+    rubocop-graphql (0.14.5)
+      rubocop (>= 0.87, < 2)
     rubocop-performance (1.9.2)
       rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
@@ -550,7 +553,7 @@
   fantaskspec
   gitlab
   gitlab-dangerfiles (~> 3.0)
-  gitlab-styles (~> 6.1)
+  gitlab-styles (~> 7.1)
   http
   json
   knapsack