diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 06:09:14 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 06:09:14 +0000 |
commit | 42f41de46525ce0065f02ee07c1a79f5669526a0 (patch) | |
tree | 6e8151aae2628d2c2ce8942be1ba547afe0264b2 /.rubocop.yml | |
parent | 1eeef229aae5affdce415c2364858e8efc64f4b5 (diff) | |
download | gitlab-ce-42f41de46525ce0065f02ee07c1a79f5669526a0.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 62f5af0a8dd..6b8fb30b961 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -217,13 +217,11 @@ Gitlab/DuplicateSpecLocation: - ee/spec/helpers/auth_helper_spec.rb - ee/spec/lib/gitlab/gl_repository_spec.rb - ee/spec/models/namespace_spec.rb - - ee/spec/services/issues/create_service_spec.rb - 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/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 |