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

diff --git a/Gemfile.lock b/Gemfile.lock
index 309992f75a1273f93052ee3403a1b7508b562bea..bbc6dcd47fd76fa60065f589164d4b9089677c63 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -403,8 +403,8 @@ GEM
       parser (>= 2.7.1.4)
     rubocop-minitest (0.10.1)
       rubocop (>= 0.87)
-    rubocop-performance (1.7.1)
-      rubocop (>= 0.82.0)
+    rubocop-performance (1.8.0)
+      rubocop (>= 0.87.0)
     rubocop-rails (2.8.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)