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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index f61bd6eca97236906d7becdf571a35e6e0de0b8d..0d3627354af6ea3fcbfe576433b6ccb5471cf8fb 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -226,7 +226,7 @@ GEM
     http_accept_language (2.1.1)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     http_accept_language (2.1.1)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)

-    i18n-js (3.7.1)
+    i18n-js (3.8.0)

       i18n (>= 0.6.6)
     image_optim (0.27.1)
       exifr (~> 1.2, >= 1.2.2)
       i18n (>= 0.6.6)
     image_optim (0.27.1)
       exifr (~> 1.2, >= 1.2.2)


@@ -383,13 +383,13 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)

-    regexp_parser (1.8.1)
+    regexp_parser (1.8.2)

     request_store (1.5.0)
       rack (>= 1.4)
     rexml (3.2.4)
     rinku (2.0.6)
     rotp (6.2.0)
     request_store (1.5.0)
       rack (>= 1.4)
     rexml (3.2.4)
     rinku (2.0.6)
     rotp (6.2.0)

-    rubocop (0.93.0)
+    rubocop (0.93.1)

       parallel (~> 1.10)
       parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)


@@ -398,7 +398,7 @@ GEM
       rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
       rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)

-    rubocop-ast (0.7.1)
+    rubocop-ast (0.8.0)

       parser (>= 2.7.1.5)
     rubocop-minitest (0.10.1)
       rubocop (>= 0.87)
       parser (>= 2.7.1.5)
     rubocop-minitest (0.10.1)
       rubocop (>= 0.87)


@@ -459,7 +459,7 @@ GEM
     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.2.0)
     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.2.0)

-    webmock (3.9.1)
+    webmock (3.9.2)

       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)