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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 551523c7af69ddb0c96fac24285ea6383bab3ef8..5ddadc3e067533df6f93cb04d9e707316f8fb450 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,63 +2,71 @@ GEM
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)

-    actioncable (5.1.5)
-      actionpack (= 5.1.5)
+    aasm (5.0.1)
+      concurrent-ruby (~> 1.0)
+    actioncable (5.2.0)
+      actionpack (= 5.2.0)

       nio4r (~> 2.0)
       nio4r (~> 2.0)

-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.5)
-      actionpack (= 5.1.5)
-      actionview (= 5.1.5)
-      activejob (= 5.1.5)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)

       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)

-    actionpack (5.1.5)
-      actionview (= 5.1.5)
-      activesupport (= 5.1.5)
+    actionpack (5.2.0)
+      actionview (= 5.2.0)
+      activesupport (= 5.2.0)

       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)

-    actionpack-page_caching (1.1.0)
+    actionpack-page_caching (1.1.1)

       actionpack (>= 4.0.0, < 6)
       actionpack (>= 4.0.0, < 6)

-    actionview (5.1.5)
-      activesupport (= 5.1.5)
+    actionview (5.2.0)
+      activesupport (= 5.2.0)

       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)

-    activejob (5.1.5)
-      activesupport (= 5.1.5)
+    activejob (5.2.0)
+      activesupport (= 5.2.0)

       globalid (>= 0.3.6)
       globalid (>= 0.3.6)

-    activemodel (5.1.5)
-      activesupport (= 5.1.5)
-    activerecord (5.1.5)
-      activemodel (= 5.1.5)
-      activesupport (= 5.1.5)
-      arel (~> 8.0)
-    activesupport (5.1.5)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activestorage (5.2.0)
+      actionpack (= 5.2.0)
+      activerecord (= 5.2.0)
+      marcel (~> 0.3.1)
+    activesupport (5.2.0)

       concurrent-ruby (~> 1.0, >= 1.0.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)

-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)

       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)

-    annotate (2.7.3)
+    annotate (2.7.4)

       activerecord (>= 3.2, < 6.0)
       rake (>= 10.4, < 13.0)
       activerecord (>= 3.2, < 6.0)
       rake (>= 10.4, < 13.0)

-    arel (8.0.0)
+    arel (9.0.0)

     ast (2.4.0)
     ast (2.4.0)

-    autoprefixer-rails (8.5.0)
+    autoprefixer-rails (8.6.5)

       execjs
       execjs

-    better_errors (2.4.0)
+    better_errors (2.5.0)

       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
     bigdecimal (1.1.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
     bigdecimal (1.1.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)

+    bootsnap (1.3.2)
+      msgpack (~> 1.0)

     builder (3.2.3)
     builder (3.2.3)

-    canonical-rails (0.2.3)
+    canonical-rails (0.2.4)

       rails (>= 4.1, < 5.3)
     capybara (2.18.0)
       addressable
       rails (>= 4.1, < 5.3)
     capybara (2.18.0)
       addressable


@@ -77,33 +85,38 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)

-    composite_primary_keys (10.0.3)
-      activerecord (~> 5.1.0, >= 5.1.5)
+    composite_primary_keys (11.0.3)
+      activerecord (~> 5.2.0)

     concurrent-ruby (1.0.5)
     concurrent-ruby (1.0.5)

-    coveralls (0.8.21)
+    coveralls (0.8.22)

       json (>= 1.8, < 3)
       json (>= 1.8, < 3)

-      simplecov (~> 0.14.1)
+      simplecov (~> 0.16.1)

       term-ansicolor (~> 1.3)
       thor (~> 0.19.4)
       tins (~> 1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.4)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.4)
       tins (~> 1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.4)

-    dalli (2.7.8)
+    dalli (2.7.9)

     debug_inspector (0.0.3)
     debug_inspector (0.0.3)

-    docile (1.1.5)
+    delayed_job (4.1.5)
+      activesupport (>= 3.0, < 5.3)
+    delayed_job_active_record (4.1.3)
+      activerecord (>= 3.0, < 5.3)
+      delayed_job (>= 3.0, < 5)
+    docile (1.3.1)

     dynamic_form (1.1.4)
     erubi (1.7.1)
     execjs (2.7.0)
     exifr (1.3.4)
     dynamic_form (1.1.4)
     erubi (1.7.1)
     execjs (2.7.0)
     exifr (1.3.4)

-    factory_bot (4.8.2)
+    factory_bot (4.11.1)

       activesupport (>= 3.0.0)
       activesupport (>= 3.0.0)

-    factory_bot_rails (4.8.2)
-      factory_bot (~> 4.8.2)
+    factory_bot_rails (4.11.1)
+      factory_bot (~> 4.11.1)

       railties (>= 3.0.0)
       railties (>= 3.0.0)

-    faraday (0.12.2)
+    faraday (0.15.3)

       multipart-post (>= 1.2, < 3)
       multipart-post (>= 1.2, < 3)

-    ffi (1.9.23)
+    ffi (1.9.25)

     fspath (3.1.0)
     geoip (1.6.4)
     globalid (0.4.1)
     fspath (3.1.0)
     geoip (1.6.4)
     globalid (0.4.1)


@@ -114,20 +127,21 @@ GEM
     http_accept_language (2.0.5)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     http_accept_language (2.0.5)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)

-    i18n-js (3.0.5)
+    i18n-js (3.1.0)

       i18n (>= 0.6.6, < 2)
       i18n (>= 0.6.6, < 2)

-    image_optim (0.26.1)
+    image_optim (0.26.3)

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

-      image_size (~> 1.5)
+      image_size (>= 1.5, < 3)

       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
     image_optim_rails (0.4.1)
       image_optim (~> 0.24)
       rails
       sprockets
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
     image_optim_rails (0.4.1)
       image_optim (~> 0.24)
       rails
       sprockets

-    image_size (1.5.0)
+    image_size (2.0.0)

     in_threads (1.5.0)
     in_threads (1.5.0)

+    jaro_winkler (1.5.1)

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


@@ -147,42 +161,47 @@ GEM
     libv8 (3.16.14.19)
     libxml-ruby (3.1.0)
     listen (3.1.5)
     libv8 (3.16.14.19)
     libxml-ruby (3.1.0)
     listen (3.1.5)

+      rb-fsevent (~> 0.9, >= 0.9.4)

       rb-inotify (~> 0.9, >= 0.9.7)
       rb-inotify (~> 0.9, >= 0.9.7)

+      ruby_dep (~> 1.2)

     logstash-event (1.2.02)
     logstash-event (1.2.02)

-    logstasher (1.2.2)
+    logstasher (1.3.0)

       activesupport (>= 4.0)
       logstash-event (~> 1.2.0)
       request_store
       activesupport (>= 4.0)
       logstash-event (~> 1.2.0)
       request_store

-    loofah (2.2.2)
+    loofah (2.2.3)

       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)

-    mail (2.7.0)
+    mail (2.7.1)

       mini_mime (>= 0.1.1)
       mini_mime (>= 0.1.1)

+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)

     method_source (0.9.0)
     method_source (0.9.0)

-    mime-types (3.1)
+    mime-types (3.2.2)

       mime-types-data (~> 3.2015)
       mime-types-data (~> 3.2015)

-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2018.0812)

     mimemagic (0.3.2)
     mimemagic (0.3.2)

-    mini_mime (1.0.0)
+    mini_mime (1.0.1)

     mini_portile2 (2.3.0)
     minitest (5.11.3)
     mini_portile2 (2.3.0)
     minitest (5.11.3)

+    msgpack (1.2.4)

     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nio4r (2.3.1)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nio4r (2.3.1)

-    nokogiri (1.8.2)
+    nokogiri (1.8.5)

       mini_portile2 (~> 2.3.0)
       mini_portile2 (~> 2.3.0)

-    nokogumbo (1.5.0)
-      nokogiri
+    nokogumbo (2.0.0)
+      nokogiri (~> 1.8, >= 1.8.4)

     oauth (0.4.7)
     oauth-plugin (0.5.1)
       multi_json
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack
     oauth (0.4.7)
     oauth-plugin (0.5.1)
       multi_json
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack

-    oauth2 (1.4.0)
-      faraday (>= 0.8, < 0.13)
-      jwt (~> 1.0)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)

       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)


@@ -221,38 +240,40 @@ GEM
       mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)
     parallel (1.12.1)
       mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)
     parallel (1.12.1)

-    parser (2.5.1.0)
+    parser (2.5.3.0)

       ast (~> 2.4.0)
     pg (0.21.0)
       ast (~> 2.4.0)
     pg (0.21.0)

-    poltergeist (1.18.0)
+    poltergeist (1.18.1)

       capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
       capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)

-    powerpack (0.1.1)
-    progress (3.4.0)
-    psych (3.0.2)
-    public_suffix (3.0.2)
-    puma (3.11.4)
+    powerpack (0.1.2)
+    progress (3.5.0)
+    psych (3.0.3)
+    public_suffix (3.0.3)
+    puma (3.12.0)
+    quad_tile (1.0.1)

     r2 (0.2.7)
     rack (2.0.5)
     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.5)
     rack-cors (1.0.2)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)

-    rack-test (1.0.0)
+    rack-test (1.1.0)

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

-    rails (5.1.5)
-      actioncable (= 5.1.5)
-      actionmailer (= 5.1.5)
-      actionpack (= 5.1.5)
-      actionview (= 5.1.5)
-      activejob (= 5.1.5)
-      activemodel (= 5.1.5)
-      activerecord (= 5.1.5)
-      activesupport (= 5.1.5)
+    rails (5.2.0)
+      actioncable (= 5.2.0)
+      actionmailer (= 5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      activemodel (= 5.2.0)
+      activerecord (= 5.2.0)
+      activestorage (= 5.2.0)
+      activesupport (= 5.2.0)

       bundler (>= 1.3.0)
       bundler (>= 1.3.0)

-      railties (= 5.1.5)
+      railties (= 5.2.0)

       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.2)
       actionpack (~> 5.x, >= 5.0.1)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.2)
       actionpack (~> 5.x, >= 5.0.1)


@@ -266,9 +287,9 @@ GEM
     rails-i18n (4.0.2)
       i18n (~> 0.6)
       rails (>= 4.0)
     rails-i18n (4.0.2)
       i18n (~> 0.6)
       rails (>= 4.0)

-    railties (5.1.5)
-      actionpack (= 5.1.5)
-      activesupport (= 5.1.5)
+    railties (5.2.0)
+      actionpack (= 5.2.0)
+      activesupport (= 5.2.0)

       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)


@@ -284,39 +305,40 @@ GEM
     request_store (1.4.1)
       rack (>= 1.4)
     rinku (2.0.4)
     request_store (1.4.1)
       rack (>= 1.4)
     rinku (2.0.4)

-    rotp (3.3.1)
-    rubocop (0.56.0)
+    rotp (4.0.2)
+      addressable (~> 2.5)
+    rubocop (0.60.0)
+      jaro_winkler (~> 1.5.1)

       parallel (~> 1.10)
       parallel (~> 1.10)

-      parser (>= 2.5)
+      parser (>= 2.5, != 2.5.1.1)

       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)

-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (~> 1.4.0)

     ruby-openid (2.7.0)
     ruby-openid (2.7.0)

-    ruby-progressbar (1.9.0)
+    ruby-progressbar (1.10.0)
+    ruby_dep (1.5.0)

     safe_yaml (1.0.4)
     safe_yaml (1.0.4)

-    sanitize (4.6.5)
+    sanitize (5.0.0)

       crass (~> 1.0.2)
       crass (~> 1.0.2)

-      nokogiri (>= 1.4.4)
-      nokogumbo (~> 1.4)
-    sass (3.5.6)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    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)
+      nokogiri (>= 1.8.0)
+      nokogumbo (~> 2.0)
+    sassc (2.0.0)
+      ffi (~> 1.9.6)
+      rake
+    sassc-rails (2.0.0)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt

     secure_headers (6.0.0)
     secure_headers (6.0.0)

-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)

       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)

-    sprockets (3.7.1)
+    sprockets (3.7.2)

       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)


@@ -333,23 +355,23 @@ 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.16.3)
+    tins (1.17.0)

     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)

-    uglifier (4.1.10)
+    uglifier (4.1.19)

       execjs (>= 0.3.0, < 3)
       execjs (>= 0.3.0, < 3)

-    unicode-display_width (1.3.2)
+    unicode-display_width (1.4.0)

     validates_email_format_of (1.6.3)
       i18n
     validates_email_format_of (1.6.3)
       i18n

-    vendorer (0.1.16)
-    webmock (3.4.1)
+    vendorer (0.2.0)
+    webmock (3.4.2)

       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff

-    websocket-driver (0.6.5)
+    websocket-driver (0.7.0)

       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)

-    xpath (3.0.0)
+    xpath (3.2.0)

       nokogiri (~> 1.8)
 
 PLATFORMS
       nokogiri (~> 1.8)
 
 PLATFORMS


@@ -357,18 +379,21 @@ PLATFORMS
 
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
 
 DEPENDENCIES
   SystemTimer (>= 1.1.3)

+  aasm

   actionpack-page_caching
   annotate
   actionpack-page_caching
   annotate

-  autoprefixer-rails
+  autoprefixer-rails (~> 8.6.3)

   better_errors
   bigdecimal (~> 1.1.0)
   binding_of_caller
   better_errors
   bigdecimal (~> 1.1.0)
   binding_of_caller

+  bootsnap (>= 1.1.0)

   canonical-rails
   capybara (~> 2.13)
   coffee-rails (~> 4.2)
   canonical-rails
   capybara (~> 2.13)
   coffee-rails (~> 4.2)

-  composite_primary_keys (~> 10.0.0)
+  composite_primary_keys (~> 11.0.0)

   coveralls
   dalli
   coveralls
   dalli

+  delayed_job_active_record

   dynamic_form
   factory_bot_rails
   faraday
   dynamic_form
   factory_bot_rails
   faraday


@@ -400,10 +425,11 @@ DEPENDENCIES
   poltergeist
   psych
   puma (~> 3.7)
   poltergeist
   psych
   puma (~> 3.7)

+  quad_tile (~> 1.0.1)

   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer
   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer

-  rails (= 5.1.5)
+  rails (= 5.2.0)

   rails-controller-testing
   rails-i18n (~> 4.0.0)
   record_tag_helper
   rails-controller-testing
   rails-i18n (~> 4.0.0)
   record_tag_helper


@@ -412,7 +438,7 @@ DEPENDENCIES
   rotp
   rubocop
   sanitize
   rotp
   rubocop
   sanitize

-  sass-rails (~> 5.0)
+  sassc-rails

   secure_headers
   uglifier (>= 1.3.0)
   validates_email_format_of (>= 1.5.1)
   secure_headers
   uglifier (>= 1.3.0)
   validates_email_format_of (>= 1.5.1)


@@ -420,4 +446,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
   webmock
 
 BUNDLED WITH

-   1.16.1
+   1.16.2