Merge branch 'master' into moderation

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 50833ef44939bada55fb19db11cad175e7f19ed6..9164f63d148eacdb25f7744084a0744cc2b09807 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -55,7 +55,7 @@ GEM
     builder (3.2.3)
     canonical-rails (0.2.1)
       rails (>= 4.1, < 5.2)
     builder (3.2.3)
     canonical-rails (0.2.1)
       rails (>= 4.1, < 5.2)

-    capybara (2.15.4)
+    capybara (2.16.1)

       addressable
       mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)


@@ -84,7 +84,7 @@ GEM
       tins (~> 1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
       tins (~> 1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)

-    crass (1.0.2)
+    crass (1.0.3)

     dalli (2.7.6)
     docile (1.1.5)
     dynamic_form (1.1.4)
     dalli (2.7.6)
     docile (1.1.5)
     dynamic_form (1.1.4)


@@ -107,11 +107,11 @@ GEM
     hashie (3.5.6)
     htmlentities (4.3.4)
     http_accept_language (2.0.5)
     hashie (3.5.6)
     htmlentities (4.3.4)
     http_accept_language (2.0.5)

-    i18n (0.9.0)
+    i18n (0.9.1)

       concurrent-ruby (~> 1.0)
     i18n-js (3.0.2)
       i18n (~> 0.6, >= 0.6.6)
       concurrent-ruby (~> 1.0)
     i18n-js (3.0.2)
       i18n (~> 0.6, >= 0.6.6)

-    image_optim (0.25.0)
+    image_optim (0.26.0)

       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       image_size (~> 1.5)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       image_size (~> 1.5)


@@ -122,7 +122,7 @@ GEM
       rails
       sprockets
     image_size (1.5.0)
       rails
       sprockets
     image_size (1.5.0)

-    in_threads (1.4.0)
+    in_threads (1.5.0)

     jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
     jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)


@@ -153,14 +153,14 @@ GEM
     loofah (2.1.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     loofah (2.1.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)

-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)

     method_source (0.9.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mimemagic (0.3.0)
     method_source (0.9.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mimemagic (0.3.0)

-    mini_mime (0.1.4)
+    mini_mime (1.0.0)

     mini_portile2 (2.3.0)
     minitest (5.10.3)
     multi_json (1.12.2)
     mini_portile2 (2.3.0)
     minitest (5.10.3)
     multi_json (1.12.2)


@@ -219,8 +219,8 @@ GEM
       mime-types
       mimemagic (= 0.3.0)
     parallel (1.12.0)
       mime-types
       mimemagic (= 0.3.0)
     parallel (1.12.0)

-    parser (2.4.0.0)
-      ast (~> 2.2)
+    parser (2.4.0.2)
+      ast (~> 2.3)

     pg (0.21.0)
     poltergeist (1.16.0)
       capybara (~> 2.1)
     pg (0.21.0)
     poltergeist (1.16.0)
       capybara (~> 2.1)


@@ -229,15 +229,15 @@ GEM
     powerpack (0.1.1)
     progress (3.4.0)
     psych (2.2.4)
     powerpack (0.1.1)
     progress (3.4.0)
     psych (2.2.4)

-    public_suffix (3.0.0)
-    puma (3.10.0)
+    public_suffix (3.0.1)
+    puma (3.11.0)

     r2 (0.2.7)
     rack (2.0.3)
     rack-cors (1.0.2)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     r2 (0.2.7)
     rack (2.0.3)
     rack-cors (1.0.2)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)

-    rack-test (0.7.0)
+    rack-test (0.8.2)

       rack (>= 1.0, < 3)
     rack-uri_sanitizer (0.0.2)
     rails (5.1.4)
       rack (>= 1.0, < 3)
     rack-uri_sanitizer (0.0.2)
     rails (5.1.4)


@@ -272,7 +272,7 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.2)
       rake
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.2)
       rake

-    rake (12.2.1)
+    rake (12.3.0)

     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)


@@ -303,13 +303,13 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)

-    sass-rails (5.0.6)
+    sass-rails (5.0.7)

       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)

-    secure_headers (5.0.1)
+    secure_headers (5.0.3)

       useragent (>= 0.15.0)
     simplecov (0.14.1)
       docile (~> 1.1.0)
       useragent (>= 0.15.0)
     simplecov (0.14.1)
       docile (~> 1.1.0)


@@ -331,7 +331,7 @@ GEM
     thor (0.19.4)
     thread_safe (0.3.6)
     tilt (2.0.8)
     thor (0.19.4)
     thread_safe (0.3.6)
     tilt (2.0.8)

-    tins (1.15.0)
+    tins (1.16.0)

     tzinfo (1.2.4)
       thread_safe (~> 0.1)
     uglifier (3.2.0)
     tzinfo (1.2.4)
       thread_safe (~> 0.1)
     uglifier (3.2.0)


@@ -341,13 +341,13 @@ GEM
     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.1.16)
     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.1.16)

-    webmock (3.1.0)
+    webmock (3.1.1)

       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)

-    websocket-extensions (0.1.2)
+    websocket-extensions (0.1.3)

     xpath (2.1.0)
       nokogiri (~> 1.3)
 
     xpath (2.1.0)
       nokogiri (~> 1.3)