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

diff --git a/Gemfile.lock b/Gemfile.lock
index 0fd5071c24fb9081a9efa19fdef2c15413e5d688..799b2d95aa414ca2a2d4142e9e0ae393396450b0 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -399,8 +399,8 @@ GEM
       parser (>= 2.7.0.1)
     rubocop-minitest (0.9.0)
       rubocop (>= 0.74)
-    rubocop-performance (1.6.1)
-      rubocop (>= 0.71.0)
+    rubocop-performance (1.7.0)
+      rubocop (>= 0.82.0)
     rubocop-rails (2.6.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)