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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index f7666c9a9b944ced76c6ecdfef129e9c7a4a5a1c..fabead7cdb2dc23927a01445fc99dfb5617eeadc 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -433,7 +433,7 @@ GEM
     rubocop-performance (1.15.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.17.1)
+    rubocop-rails (2.16.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
@@ -585,7 +585,7 @@ DEPENDENCIES
   rubocop
   rubocop-minitest
   rubocop-performance
-  rubocop-rails
+  rubocop-rails (= 2.16.1)
   rubocop-rake
   sanitize
   sassc-rails