diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-28 03:09:53 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-28 03:09:53 +0000 |
commit | 2e4d8b3449e8c2c750a816b9566c61a0a96b934b (patch) | |
tree | 831b4d55a3b283e519a4c911e444564d4c7c3344 /.rubocop.yml | |
parent | 56df7f06f1e57d66efcff5d8ad0026252cc91192 (diff) | |
download | gitlab-ce-2e4d8b3449e8c2c750a816b9566c61a0a96b934b.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.rubocop.yml')
-rw-r--r-- | .rubocop.yml | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index bd19b80e8b5..300cfe3d74c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -284,18 +284,6 @@ Gitlab/Union: - 'spec/**/*' - 'ee/spec/**/*' -API/GrapeAPIInstance: - Enabled: true - Include: - - 'lib/**/api/**/*.rb' - - 'ee/**/api/**/*.rb' - -API/GrapeArrayMissingCoerce: - Enabled: true - Include: - - 'lib/**/api/**/*.rb' - - 'ee/**/api/**/*.rb' - Cop/SidekiqOptionsQueue: Enabled: true Exclude: |