summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-03 09:08:47 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-03 09:08:47 +0000
commit31a432e38a8b70d3ffb16afa8d7cfeee4f5f5921 (patch)
treeb59f8b4e2ef7486f13adb01328a749f19b93a023 /.rubocop.yml
parent6b7b853dff4cb7e72d76bd501d75708111c95585 (diff)
downloadgitlab-ce-31a432e38a8b70d3ffb16afa8d7cfeee4f5f5921.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 227c8dfa494..244f8938f50 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -252,8 +252,6 @@ GitlabSecurity/PublicSend:
Gitlab/DuplicateSpecLocation:
Exclude:
- ee/spec/lib/gitlab/gl_repository_spec.rb
- - ee/spec/services/merge_requests/refresh_service_spec.rb
- - ee/spec/services/ee/merge_requests/refresh_service_spec.rb
Cop/InjectEnterpriseEditionModule:
Enabled: true