summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-06 15:10:04 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-06 15:10:04 +0000
commitf3b1e07903a7f509b11ad7cf188fac46d98f77f6 (patch)
treea6fa5e65d83d94334387952f1f526ed438604408 /.rubocop.yml
parentba174c982f40d71a87fd511b091753807174f7e7 (diff)
downloadgitlab-ce-f3b1e07903a7f509b11ad7cf188fac46d98f77f6.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml3
1 files changed, 0 insertions, 3 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index b03aa069ebf..6dd06984de6 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -216,10 +216,8 @@ Gitlab/DuplicateSpecLocation:
Exclude:
- ee/spec/helpers/auth_helper_spec.rb
- ee/spec/lib/gitlab/gl_repository_spec.rb
- - ee/spec/models/namespace_spec.rb
- ee/spec/services/merge_requests/refresh_service_spec.rb
- ee/spec/helpers/ee/auth_helper_spec.rb
- - ee/spec/models/ee/namespace_spec.rb
- ee/spec/services/ee/merge_requests/refresh_service_spec.rb
Cop/InjectEnterpriseEditionModule:
@@ -387,5 +385,4 @@ Performance/ChainArrayAllocation:
RSpec/RepeatedExample:
Exclude:
- 'spec/features/merge_request/user_posts_diff_notes_spec.rb'
- - 'spec/features/projects/files/template_type_dropdown_spec.rb'
- 'spec/services/notification_service_spec.rb'