summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-30 06:07:59 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-30 06:07:59 +0000
commit7421e6f9f2b5889b05738af7eba568af6ae3fcbc (patch)
tree0c7f9656565ae4ef09611345248ea518c4deb5b8 /.rubocop.yml
parentbf32dbaad2b059a3bf3e880c08cb0a026effc158 (diff)
downloadgitlab-ce-7421e6f9f2b5889b05738af7eba568af6ae3fcbc.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml1
1 files changed, 0 insertions, 1 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 984377cbb90..df2e7c2cb0b 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -213,7 +213,6 @@ Gitlab/DuplicateSpecLocation:
- 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/lib/ee/gitlab/gl_repository_spec.rb
- ee/spec/models/ee/namespace_spec.rb
- ee/spec/models/ee/note_spec.rb
- ee/spec/serializers/ee/environment_entity_spec.rb