diff --git a/.codeclimate.yml b/.codeclimate.yml index 908a988e69e..3c6e743df66 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -23,7 +23,7 @@ checks: engines: rubocop: enabled: true - channel: rubocop-0-63 + channel: rubocop-0-66 ratings: paths: diff --git a/Gemfile.lock b/Gemfile.lock index 10f0630bc86..62cab7261b6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -342,14 +342,17 @@ GEM mini_portile2 (~> 2.4.0) os (1.0.0) parallel (1.13.0) - parser (2.6.0.0) + parser (2.6.2.0) ast (~> 2.4.0) path_expander (1.0.3) pg (1.1.3) pg (1.1.3-x64-mingw32) pg (1.1.3-x86-mingw32) - powerpack (0.1.2) - psych (3.0.3) + psych (3.1.0) + psych (3.1.0-java) + jar-dependencies (>= 0.1.7) + psych (3.1.0-x64-mingw32) + psych (3.1.0-x86-mingw32) public_suffix (3.0.3) puma (3.12.1) puma (3.12.1-java) @@ -400,14 +403,14 @@ GEM resque (~> 1.26) rufus-scheduler (~> 3.2) retriable (3.1.2) - rubocop (0.63.0) + rubocop (0.66.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) - powerpack (~> 0.1) + psych (>= 3.1.0) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.4.0) + unicode-display_width (>= 1.4.0, < 1.6) ruby-progressbar (1.10.0) ruby-vips (2.0.13) ffi (~> 1.9) @@ -488,7 +491,7 @@ GEM uber (0.1.0) uglifier (4.1.19) execjs (>= 0.3.0, < 3) - unicode-display_width (1.4.0) + unicode-display_width (1.5.0) useragent (0.16.10) vegas (0.1.11) rack (>= 1.0.0) diff --git a/actionview/test/actionpack/abstract/abstract_controller_test.rb b/actionview/test/actionpack/abstract/abstract_controller_test.rb index 4d4e2b8ef20..eecc19d413d 100644 --- a/actionview/test/actionpack/abstract/abstract_controller_test.rb +++ b/actionview/test/actionpack/abstract/abstract_controller_test.rb @@ -229,11 +229,11 @@ module AbstractController end class ActionMissingRespondToActionController < AbstractController::Base - # No actions - private - def action_missing(action_name) - self.response_body = "success" - end + # No actions + private + def action_missing(action_name) + self.response_body = "success" + end end class RespondToActionController < AbstractController::Base