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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 75866beeb57d9ff12e625a899eb86bc5714c7caa..6d9878656e8cd4d29857e48ca1e914635dc7a347 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -424,7 +424,7 @@ GEM
     rubocop-performance (1.12.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-performance (1.12.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)

-    rubocop-rails (2.11.3)
+    rubocop-rails (2.12.4)

       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)


@@ -564,7 +564,7 @@ DEPENDENCIES
   rubocop
   rubocop-minitest
   rubocop-performance
   rubocop
   rubocop-minitest
   rubocop-performance

-  rubocop-rails (~> 2.11.3)
+  rubocop-rails

   rubocop-rake
   sanitize
   sassc-rails
   rubocop-rake
   sanitize
   sassc-rails