summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-06-08 18:40:49 +0000
committerRobert Speicher <robert@gitlab.com>2016-06-08 18:40:49 +0000
commit97b0074278070059b9d5fa1c9b2cca5f35171eeb (patch)
tree1076610077615651e0ee46b0fbb8e632000aa62b /.rubocop.yml
parent0cfa368bf8cae4f9a54186241b06ef588688cfb2 (diff)
parent1faed033ce12fb5a7190a3393e43cbea0154cb8a (diff)
downloadgitlab-ce-97b0074278070059b9d5fa1c9b2cca5f35171eeb.tar.gz
Merge branch 'rubocop/disable-uniq-before-pluck-cop' into 'master'
Disable Rails/UniqBeforePluck rubocop cop Rails/UniqBeforePluck seems to have some bugs * https://github.com/bbatsov/rubocop/issues/3122 * https://github.com/bbatsov/rubocop/issues/3148 and we had some problems in EE with that https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/425#note_12245005 See merge request !4477
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml3
1 files changed, 3 insertions, 0 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index eb51a04c0ec..678f7db025b 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1088,6 +1088,9 @@ Rails/TimeZone:
Rails/Validation:
Enabled: false
+Rails/UniqBeforePluck:
+ Enabled: false
+
##################### RSpec ##################################
# Check that instances are not being stubbed globally.