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

diff --git a/Gemfile.lock b/Gemfile.lock
index f0c73d888479c8c66cff4c6bfd2d6329e10d19ef..309992f75a1273f93052ee3403a1b7508b562bea 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -333,7 +333,7 @@ GEM
     progress (3.5.2)
     psych (3.2.0)
     public_suffix (4.0.5)
-    puma (4.3.5)
+    puma (4.3.6)
       nio4r (~> 2.0)
     quad_tile (1.0.1)
     r2 (0.2.7)
@@ -405,7 +405,7 @@ GEM
       rubocop (>= 0.87)
     rubocop-performance (1.7.1)
       rubocop (>= 0.82.0)
-    rubocop-rails (2.7.1)
+    rubocop-rails (2.8.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 0.87.0)