Merge remote-tracking branch 'upstream/pull/5726'

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index c3f4a2bc8b4c8b4181054932567820eb59132a8a..64a8d0a0f04509b6dad14174ab882718d524f452 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -133,7 +133,6 @@ Rails/SpecificActionNames:
     - app/controllers/**/*.rb
   Exclude:
     # This is a todo list, but is currently too long for `rubocop --auto-gen-config`
     - app/controllers/**/*.rb
   Exclude:
     # This is a todo list, but is currently too long for `rubocop --auto-gen-config`

-    - 'app/controllers/api/changeset_comments_controller.rb'

     - 'app/controllers/api/changesets_controller.rb'
     - 'app/controllers/api/notes_controller.rb'
     - 'app/controllers/api/user_preferences_controller.rb'
     - 'app/controllers/api/changesets_controller.rb'
     - 'app/controllers/api/notes_controller.rb'
     - 'app/controllers/api/user_preferences_controller.rb'