summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-24 12:09:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-24 12:09:42 +0000
commit729e3765d5feb762df1ccfbc228a8dd4662aa3f9 (patch)
treef326420fc64999c6bcc28816ed54f0972fb46459 /.rubocop.yml
parent6f7881ee9dcec34141a8f34fc814b56b366d2b48 (diff)
downloadgitlab-ce-729e3765d5feb762df1ccfbc228a8dd4662aa3f9.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml2
1 files changed, 0 insertions, 2 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index b379f0ee722..fd0b626919a 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -202,7 +202,6 @@ GitlabSecurity/PublicSend:
Gitlab/DuplicateSpecLocation:
Exclude:
- - ee/spec/controllers/groups_controller_spec.rb
- ee/spec/controllers/projects/jobs_controller_spec.rb
- ee/spec/helpers/auth_helper_spec.rb
- ee/spec/lib/gitlab/gl_repository_spec.rb
@@ -215,7 +214,6 @@ Gitlab/DuplicateSpecLocation:
- ee/spec/services/merge_requests/refresh_service_spec.rb
- ee/spec/services/merge_requests/update_service_spec.rb
- ee/spec/services/system_hooks_service_spec.rb
- - ee/spec/controllers/ee/groups_controller_spec.rb
- ee/spec/controllers/ee/projects/jobs_controller_spec.rb
- ee/spec/helpers/ee/auth_helper_spec.rb
- ee/spec/lib/ee/gitlab/gl_repository_spec.rb