Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 14 insertions, 3 deletions

diff --git a/.rubocop.yml b/.rubocop.yml
index 34d6fe5e434..b133ecbcf93 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -32,6 +32,7 @@ AllCops:
     - 'builds/**/*'
     - 'plugins/**/*'
     - 'file_hooks/**/*'
+    - 'workhorse/**/*'
   CacheRootDirectory: tmp
   MaxFilesInCache: 18000
 
@@ -47,6 +48,10 @@ Cop/StaticTranslationDefinition:
     - 'spec/**/*'
     - 'ee/spec/**/*'
 
+Lint/LastKeywordArgument:
+  Enabled: true
+  Safe: false
+
 # This cop checks whether some constant value isn't a
 # mutable literal (e.g. array or hash).
 Style/MutableConstant:
@@ -271,6 +276,12 @@ GitlabSecurity/PublicSend:
 Gitlab/DuplicateSpecLocation:
   Enabled: true
 
+Gitlab/PolicyRuleBoolean:
+  Enabled: true
+  Include:
+    - 'app/policies/**/*'
+    - 'ee/app/policies/**/*'
+
 Cop/InjectEnterpriseEditionModule:
   Enabled: true
   Exclude:
@@ -357,6 +368,8 @@ Cop/SidekiqOptionsQueue:
 
 Graphql/ResolverType:
   Enabled: true
+  Exclude:
+    - 'app/graphql/resolvers/base_resolver.rb'
   Include:
     - 'app/graphql/resolvers/**/*'
     - 'ee/app/graphql/resolvers/**/*'
@@ -422,13 +435,11 @@ Scalability/FileUploads:
 
 Graphql/Descriptions:
   Enabled: true
+  AutoCorrect: true
   Include:
     - 'app/graphql/**/*'
     - 'ee/app/graphql/**/*'
 
-RSpec/AnyInstanceOf:
-  Enabled: false
-
 # Cops for upgrade to gitlab-styles 3.1.0
 RSpec/ImplicitSubject:
   Enabled: false