Merge branch '35869-disable-the-Rails/Delegate-cop' into 'master'

Disable the Rails/Delegate cop Closes #35869 See merge request !13267

Merge branch '35869-disable-the-Rails/Delegate-cop' into 'master'
dc412b48 · Douwe Maan · f15e7642 · 7ace475a · dc412b48
Commit dc412b48 authored Aug 03, 2017 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

.rubocop.yml .rubocop.yml +2 -1

No files found.
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -943,8 +943,9 @@ Rails/Date:
  Enabled: false

 # Prefer delegate method for delegations.
+# Disabled per https://gitlab.com/gitlab-org/gitlab-ce/issues/35869
 Rails/Delegate:
-  Enabled: true
+  Enabled: false

 # This cop checks dynamic `find_by_*` methods.
 Rails/DynamicFindBy: