diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 00:07:49 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 00:07:49 +0000 |
commit | 5d32a7a175fd1a7a6c97019a022c11434ea637dc (patch) | |
tree | 8741a075a83a139de103915278b87e66da6efb03 /.rubocop.yml | |
parent | d74fcc9b69746c4d9582299c370a95aafe2ac3ac (diff) | |
download | gitlab-ce-5d32a7a175fd1a7a6c97019a022c11434ea637dc.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.rubocop.yml')
-rw-r--r-- | .rubocop.yml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 1418a72c88a..62f5af0a8dd 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -221,14 +221,12 @@ Gitlab/DuplicateSpecLocation: - ee/spec/services/merge_requests/create_service_spec.rb - 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/helpers/ee/auth_helper_spec.rb - ee/spec/models/ee/namespace_spec.rb - ee/spec/services/ee/issues/create_service_spec.rb - ee/spec/services/ee/merge_requests/create_service_spec.rb - ee/spec/services/ee/merge_requests/refresh_service_spec.rb - ee/spec/services/ee/merge_requests/update_service_spec.rb - - ee/spec/services/ee/system_hooks_service_spec.rb Cop/InjectEnterpriseEditionModule: Enabled: true |