diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-08-03 07:51:47 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-08-03 07:51:47 +0000 |
commit | dc412b48693668f7fba3adea57b8be76685afa76 (patch) | |
tree | a35885016eac5ac84d14c9805ad098ef71cae7f9 | |
parent | f15e7642c1f47d809b9bfdcc4e172c18e7393624 (diff) | |
parent | 7ace475ae2cac65b49f93b32c3d385a96dee22bb (diff) | |
download | gitlab-ce-dc412b48693668f7fba3adea57b8be76685afa76.tar.gz |
Merge branch '35869-disable-the-Rails/Delegate-cop' into 'master'
Disable the Rails/Delegate cop
Closes #35869
See merge request !13267
-rw-r--r-- | .rubocop.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 3e4275c271d..a5ccec0437b 100644 --- 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: |