summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-03-08 18:08:14 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-03-08 18:08:14 +0000
commit9885b7e33ece32ac3bfbf077bb2dc53c459dbc0e (patch)
treebcbabc83286e8852df225b2117b28d4dc8678a7f /.rubocop.yml
parent684838d4bea13af1dac9c2f32b99985bf0f9f8e2 (diff)
downloadgitlab-ce-9885b7e33ece32ac3bfbf077bb2dc53c459dbc0e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 3489c2e2534..8f9a02bbadd 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -30,6 +30,7 @@ inherit_mode:
merge:
- Include
- Exclude
+ - AllowedPatterns
AllCops:
# Target the current Ruby version. For example, "2.7" or "3.0".
@@ -97,6 +98,9 @@ InternalAffairs/DeprecateCopHelper:
Include:
- spec/rubocop/**/*.rb
+Layout/LineLength:
+ AllowedPatterns: ['^RSpec\.describe\s.*\sdo']
+
Lint/LastKeywordArgument:
Safe: false