From dacc208d9ae0caacfd975e5333e4286c9926e0dd Mon Sep 17 00:00:00 2001
From: Nate Holland <natesholland@gmail.com>
Date: Fri, 3 May 2019 20:47:52 -0500
Subject: [PATCH] Bump RuboCop to 0.68.1

Performance cops were extracted in rubocop-hq/rubocop#5977 and @koic
updated to 0.67.2 and added the rubocop-performance gem in #35989.

This bumps rubocop to 0.68.1 to be on the latest version. Two changes
were made in regards to the bump of the version:
* The first was that Layout/FirstParameterIndentation was renamed to
Layout/IndentFirstArgument. These changes can be seen in
rubocop-hq/rubocop#6982 and rubocop-hq/rubocop#6987
* The second was that a new instance of the Style/HashSyntax cop was
found. I updated that instance to follow the new Ruby >= 1.9 syntax.
---
 .rubocop.yml                                        | 2 +-
 Gemfile.lock                                        | 3 +--
 actionview/test/actionpack/abstract/layouts_test.rb | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 0cfe5d5d84004..4c566ec595dc7 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -77,7 +77,7 @@ Layout/EmptyLinesAroundMethodBody:
 Layout/EmptyLinesAroundModuleBody:
   Enabled: true
 
-Layout/FirstParameterIndentation:
+Layout/IndentFirstArgument:
   Enabled: true
 
 # Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
diff --git a/Gemfile.lock b/Gemfile.lock
index 8d34d9a24bd2b..cdce9799b897c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -411,11 +411,10 @@ GEM
       resque (~> 1.26)
       rufus-scheduler (~> 3.2)
     retriable (3.1.2)
-    rubocop (0.67.2)
+    rubocop (0.68.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
-      psych (>= 3.1.0)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.6)
diff --git a/actionview/test/actionpack/abstract/layouts_test.rb b/actionview/test/actionpack/abstract/layouts_test.rb
index 1146e6f64b22c..72d8e54bf8005 100644
--- a/actionview/test/actionpack/abstract/layouts_test.rb
+++ b/actionview/test/actionpack/abstract/layouts_test.rb
@@ -295,7 +295,7 @@ class TestBase < ActiveSupport::TestCase
         10.times do |x|
           controller = WithString.new
           controller.define_singleton_method :index do
-            render template: ActionView::Template::Text.new("Hello string!"), locals: { :"x#{x}" => :omg }
+            render template: ActionView::Template::Text.new("Hello string!"), locals: { "x#{x}": :omg }
           end
           controller.process(:index)
         end