Fix all rubocop violations

4 files changed, 16 insertions, 19 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 5c8ae21fe7..67b5f8c240 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,7 +40,7 @@ GIT
 
 GIT
   remote: https://github.com/rails/arel.git
-  revision: b26638ef041953992010590b31615c519fa0ea7d
+  revision: ab109d3bf1c773da5e78ddc93bb6b55aebbb1c2a
   specs:
     arel (8.0.0)
 
@@ -184,7 +184,7 @@ GEM
     eventmachine (1.2.1-x64-mingw32)
     eventmachine (1.2.1-x86-mingw32)
     execjs (2.7.0)
-    faraday (0.10.0)
+    faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
     faye (1.2.3)
       cookiejar (>= 0.3.0)
@@ -197,19 +197,17 @@ GEM
     faye-websocket (0.10.5)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
-    ffi (1.9.14)
-    ffi (1.9.14-x64-mingw32)
-    ffi (1.9.14-x86-mingw32)
+    ffi (1.9.17)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     hiredis (0.6.1)
     http_parser.rb (0.6.0)
     i18n (0.7.0)
-    jquery-rails (4.2.1)
+    jquery-rails (4.2.2)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.0.2)
+    json (2.0.3)
     kindlerb (1.2.0)
       mustache
       nokogiri
@@ -239,11 +237,11 @@ GEM
     mysql2 (0.4.5-x64-mingw32)
     mysql2 (0.4.5-x86-mingw32)
     nio4r (2.0.0)
-    nokogiri (1.7.0)
+    nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
-    nokogiri (1.7.0-x64-mingw32)
+    nokogiri (1.7.0.1-x64-mingw32)
       mini_portile2 (~> 2.1.0)
-    nokogiri (1.7.0-x86-mingw32)
+    nokogiri (1.7.0.1-x86-mingw32)
       mini_portile2 (~> 2.1.0)
     parser (2.3.3.1)
       ast (~> 2.2)
@@ -252,7 +250,7 @@ GEM
     pg (0.19.0-x86-mingw32)
     powerpack (0.1.1)
     psych (2.2.2)
-    public_suffix (2.0.4)
+    public_suffix (2.0.5)
     puma (3.6.2)
     qu (0.2.0)
       multi_json
@@ -287,7 +285,7 @@ GEM
       redis (~> 3.3)
       resque (~> 1.26)
       rufus-scheduler (~> 3.2)
-    rubocop (0.47.0)
+    rubocop (0.47.1)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -296,7 +294,7 @@ GEM
     ruby-progressbar (1.8.1)
     ruby_dep (1.5.0)
     rubyzip (1.2.0)
-    rufus-scheduler (3.3.1)
+    rufus-scheduler (3.3.2)
       tzinfo
     sass (3.4.23)
     sass-rails (5.0.6)
@@ -311,10 +309,10 @@ GEM
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    sequel (4.41.0)
+    sequel (4.42.1)
     serverengine (1.5.11)
       sigdump (~> 0.2.2)
-    sidekiq (4.2.7)
+    sidekiq (4.2.9)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
diff --git a/actionpack/test/controller/parameters/nested_parameters_permit_test.rb b/actionpack/test/controller/parameters/nested_parameters_permit_test.rb
index 138d83726c..00e591d5a7 100644
--- a/actionpack/test/controller/parameters/nested_parameters_permit_test.rb
+++ b/actionpack/test/controller/parameters/nested_parameters_permit_test.rb
@@ -141,7 +141,7 @@ class NestedParametersPermitTest < ActiveSupport::TestCase
     assert_equal "Unattributed Assistant", permitted[:book][:authors_attributes]["1"][:name]
 
     assert_equal(
-      {"book"=>{"authors_attributes"=>{"0"=>{"name"=>"William Shakespeare"}, "1"=>{"name"=>"Unattributed Assistant"}, "2"=>{}}}}, 
+      { "book" => { "authors_attributes" => { "0" => { "name" => "William Shakespeare" }, "1" => { "name" => "Unattributed Assistant" }, "2" => {} } } },
       permitted.to_h
     )
 
diff --git a/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb b/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
index 4cc1e2d0fd..cf97c22160 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
@@ -20,7 +20,6 @@ module Rails
         template template_file, File.join("app/controllers", controller_class_path, "#{controller_file_name}_controller.rb")
       end
 
-
       hook_for :template_engine, as: :scaffold do |template_engine|
         invoke template_engine unless options.api?
       end
diff --git a/railties/lib/rails/tasks/yarn.rake b/railties/lib/rails/tasks/yarn.rake
index bb99d38fde..7c5e266e3e 100644
--- a/railties/lib/rails/tasks/yarn.rake
+++ b/railties/lib/rails/tasks/yarn.rake
@@ -1,9 +1,9 @@
 namespace :yarn do
   desc "Install all JavaScript dependencies as specified via Yarn"
   task :install do
-    system('./bin/yarn install')
+    system("./bin/yarn install")
   end
 end
 
 # Run Yarn prior to Sprockets assets precompilation, so dependencies are available for use.
-Rake::Task['assets:precompile'].enhance [ 'yarn:install' ]
+Rake::Task["assets:precompile"].enhance [ "yarn:install" ]