summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-08-18 08:17:02 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-08-18 08:17:02 +0000
commitb39512ed755239198a9c294b6a45e65c05900235 (patch)
treed234a3efade1de67c46b9e5a38ce813627726aa7 /.rubocop.yml
parentd31474cf3b17ece37939d20082b07f6657cc79a9 (diff)
downloadgitlab-ce-b39512ed755239198a9c294b6a45e65c05900235.tar.gz
Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml35
1 files changed, 23 insertions, 12 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 4c7abe0dc89..8ddd5087bb7 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -290,6 +290,10 @@ Rails/MailerName:
# See for the context on why it's excluded https://gitlab.com/gitlab-org/gitlab/-/issues/239356#note_956419227
- 'app/mailers/notify.rb'
+Rails/RakeEnvironment:
+ # Context on why it's disabled: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93419#note_1048223982
+ Enabled: false
+
# GitLab ###################################################################
Gitlab/ModuleWithInstanceVariables:
@@ -431,6 +435,10 @@ Naming/PredicateName:
- 'spec/**/*'
- 'ee/spec/**/*'
+# See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93828#note_1050812797
+Naming/RescuedExceptionsVariableName:
+ Enabled: false
+
RSpec/FactoriesInMigrationSpecs:
Enabled: true
Include:
@@ -558,18 +566,6 @@ Graphql/Descriptions:
RSpec/ImplicitSubject:
Enabled: false
-RSpec/EmptyLineAfterHook:
- Enabled: false
-
-RSpec/HooksBeforeExamples:
- Enabled: false
-
-RSpec/EmptyLineAfterExample:
- Enabled: false
-
-RSpec/Be:
- Enabled: false
-
RSpec/DescribedClass:
Enabled: false
@@ -596,6 +592,18 @@ RSpec/HaveGitlabHttpStatus:
- 'spec/**/*'
- 'ee/spec/**/*'
+RSpec/ContextWording:
+ Prefixes:
+ - 'when'
+ - 'with'
+ - 'without'
+ - 'for'
+ - 'and'
+ - 'on'
+ - 'in'
+ - 'as'
+ - 'if'
+
Style/MultilineWhenThen:
Enabled: false
@@ -780,3 +788,6 @@ Style/ClassAndModuleChildren:
Fips/OpenSSL:
Enabled: false
+
+Gemspec/AvoidExecutingGit:
+ Enabled: false