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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 57feba1fd0c4623ab2f34d99ed4f3f4c5d2ea0e3..4f7f64b99b474c50c77ae5d9dd55eb276ce5ceb4 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,499 +1,578 @@
 GEM
   remote: https://rubygems.org/
   specs:
 GEM
   remote: https://rubygems.org/
   specs:

-    SystemTimer (1.2.3)
-    aasm (5.0.2)
+    aasm (5.2.0)

       concurrent-ruby (~> 1.0)
       concurrent-ruby (~> 1.0)

-    actioncable (5.2.2.1)
-      actionpack (= 5.2.2.1)
+    actioncable (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activesupport (= 6.1.4.1)

       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)

-    actionmailer (5.2.2.1)
-      actionpack (= 5.2.2.1)
-      actionview (= 5.2.2.1)
-      activejob (= 5.2.2.1)
+    actionmailbox (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activejob (= 6.1.4.1)
+      activerecord (= 6.1.4.1)
+      activestorage (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+      mail (>= 2.7.1)
+    actionmailer (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      actionview (= 6.1.4.1)
+      activejob (= 6.1.4.1)
+      activesupport (= 6.1.4.1)

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

-    actionpack (5.2.2.1)
-      actionview (= 5.2.2.1)
-      activesupport (= 5.2.2.1)
-      rack (~> 2.0)
+    actionpack (6.1.4.1)
+      actionview (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+      rack (~> 2.0, >= 2.0.9)

       rack-test (>= 0.6.3)
       rails-dom-testing (~> 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.1)
-      actionpack (>= 4.0.0, < 6)
-    actionview (5.2.2.1)
-      activesupport (= 5.2.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionpack-page_caching (1.2.4)
+      actionpack (>= 4.0.0)
+    actiontext (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activerecord (= 6.1.4.1)
+      activestorage (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.1.4.1)
+      activesupport (= 6.1.4.1)

       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)

-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)

     active_record_union (1.3.0)
       activerecord (>= 4.0)
     active_record_union (1.3.0)
       activerecord (>= 4.0)

-    activejob (5.2.2.1)
-      activesupport (= 5.2.2.1)
+    activejob (6.1.4.1)
+      activesupport (= 6.1.4.1)

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

-    activemodel (5.2.2.1)
-      activesupport (= 5.2.2.1)
-    activerecord (5.2.2.1)
-      activemodel (= 5.2.2.1)
-      activesupport (= 5.2.2.1)
-      arel (>= 9.0)
-    activerecord-import (0.28.1)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord (6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord-import (1.2.0)

       activerecord (>= 3.2)
       activerecord (>= 3.2)

-    activestorage (5.2.2.1)
-      actionpack (= 5.2.2.1)
-      activerecord (= 5.2.2.1)
-      marcel (~> 0.3.1)
-    activesupport (5.2.2.1)
+    activestorage (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activejob (= 6.1.4.1)
+      activerecord (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+      marcel (~> 1.0.0)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.4.1)

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

-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    annotate (2.7.4)
-      activerecord (>= 3.2, < 6.0)
-      rake (>= 10.4, < 13.0)
-    arel (9.0.0)
-    ast (2.4.0)
-    autoprefixer-rails (8.6.5)
-      execjs
-    better_errors (2.5.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    annotate (3.1.1)
+      activerecord (>= 3.2, < 7.0)
+      rake (>= 10.4, < 14.0)
+    ast (2.4.2)
+    autoprefixer-rails (10.3.3.0)
+      execjs (~> 2)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.513.0)
+    aws-sdk-core (3.121.1)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.239.0)
+      aws-sigv4 (~> 1.1)
+      jmespath (~> 1.0)
+    aws-sdk-kms (1.49.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.103.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.4)
+    aws-sigv4 (1.4.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+    better_errors (2.9.1)

       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)

-    bigdecimal (1.1.0)
-    binding_of_caller (0.8.0)
+    better_html (1.0.16)
+      actionview (>= 4.0)
+      activesupport (>= 4.0)
+      ast (~> 2.0)
+      erubi (~> 1.4)
+      html_tokenizer (~> 0.0.6)
+      parser (>= 2.4)
+      smart_properties
+    binding_of_caller (1.0.0)

       debug_inspector (>= 0.0.1)
       debug_inspector (>= 0.0.1)

-    bootsnap (1.4.1)
+    bootsnap (1.9.1)

       msgpack (~> 1.0)
       msgpack (~> 1.0)

-    browser (2.5.3)
-    builder (3.2.3)
-    cancancan (2.3.0)
-    canonical-rails (0.2.5)
-      rails (>= 4.1, < 6.1)
-    capybara (2.18.0)
+    bootstrap (4.5.3)
+      autoprefixer-rails (>= 9.1.0)
+      popper_js (>= 1.14.3, < 2)
+      sassc-rails (>= 2.0.0)
+    bootstrap_form (4.5.0)
+      actionpack (>= 5.2)
+      activemodel (>= 5.2)
+    brakeman (5.1.1)
+    browser (5.3.1)
+    builder (3.2.4)
+    bzip2-ffi (1.1.0)
+      ffi (~> 1.0)
+    cancancan (3.3.0)
+    canonical-rails (0.2.12)
+      rails (>= 4.1, < 6.2)
+    capybara (3.35.3)

       addressable
       mini_mime (>= 0.1.3)
       addressable
       mini_mime (>= 0.1.3)

-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (>= 2.0, < 4.0)
-    climate_control (0.2.0)
-    cliver (0.3.2)
-    coderay (1.1.2)
-    coffee-rails (4.2.2)
-      coffee-script (>= 2.2.0)
-      railties (>= 4.0.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
-    composite_primary_keys (11.1.0)
-      activerecord (~> 5.2.1)
-    concurrent-ruby (1.1.5)
-    config (1.7.1)
-      activesupport (>= 3.0)
-      deep_merge (~> 1.2.1)
-      dry-validation (>= 0.12.2)
-    coveralls (0.8.22)
-      json (>= 1.8, < 3)
-      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)
-    dalli (2.7.9)
-    debug_inspector (0.0.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (>= 1.5, < 3.0)
+      xpath (~> 3.2)
+    childprocess (3.0.0)
+    coderay (1.1.3)
+    composite_primary_keys (13.0.0)
+      activerecord (~> 6.1.0)
+    concurrent-ruby (1.1.9)
+    config (3.1.0)
+      deep_merge (~> 1.2, >= 1.2.1)
+      dry-validation (~> 1.0, >= 1.0.0)
+    crack (0.4.5)
+      rexml
+    crass (1.0.6)
+    dalli (2.7.11)
+    debug_inspector (1.1.0)

     deep_merge (1.2.1)
     deep_merge (1.2.1)

-    delayed_job (4.1.5)
-      activesupport (>= 3.0, < 5.3)
-    delayed_job_active_record (4.1.3)
-      activerecord (>= 3.0, < 5.3)
+    delayed_job (4.1.9)
+      activesupport (>= 3.0, < 6.2)
+    delayed_job_active_record (4.1.6)
+      activerecord (>= 3.0, < 6.2)

       delayed_job (>= 3.0, < 5)
       delayed_job (>= 3.0, < 5)

-    docile (1.3.1)
-    dry-configurable (0.8.2)
+    docile (1.4.0)
+    doorkeeper (5.5.4)
+      railties (>= 5)
+    doorkeeper-i18n (5.2.3)
+      doorkeeper (>= 5.2)
+    dry-configurable (0.13.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.6)
+    dry-container (0.9.0)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.13, >= 0.13.0)
+    dry-core (0.7.1)

       concurrent-ruby (~> 1.0)
       concurrent-ruby (~> 1.0)

-      dry-core (~> 0.4, >= 0.4.7)
-    dry-container (0.7.0)
+    dry-inflector (0.2.1)
+    dry-initializer (3.0.4)
+    dry-logic (1.2.0)

       concurrent-ruby (~> 1.0)
       concurrent-ruby (~> 1.0)

-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.7)
+      dry-core (~> 0.5, >= 0.5)
+    dry-schema (1.8.0)

       concurrent-ruby (~> 1.0)
       concurrent-ruby (~> 1.0)

-    dry-equalizer (0.2.2)
-    dry-inflector (0.1.2)
-    dry-logic (0.5.0)
-      dry-container (~> 0.2, >= 0.2.6)
-      dry-core (~> 0.2)
-      dry-equalizer (~> 0.2)
-    dry-types (0.14.0)
+      dry-configurable (~> 0.13, >= 0.13.0)
+      dry-core (~> 0.5, >= 0.5)
+      dry-initializer (~> 3.0)
+      dry-logic (~> 1.0)
+      dry-types (~> 1.5)
+    dry-types (1.5.1)

       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)

-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5)

       dry-inflector (~> 0.1, >= 0.1.2)
       dry-inflector (~> 0.1, >= 0.1.2)

-      dry-logic (~> 0.5, >= 0.5)
-    dry-validation (0.13.0)
+      dry-logic (~> 1.0, >= 1.0.2)
+    dry-validation (1.7.0)

       concurrent-ruby (~> 1.0)
       concurrent-ruby (~> 1.0)

-      dry-configurable (~> 0.1, >= 0.1.3)
-      dry-core (~> 0.2, >= 0.2.1)
-      dry-equalizer (~> 0.2)
-      dry-logic (~> 0.5, >= 0.5.0)
-      dry-types (~> 0.14, >= 0.14)
-    dynamic_form (1.1.4)
-    erubi (1.8.0)
-    execjs (2.7.0)
-    exifr (1.3.6)
-    factory_bot (5.0.2)
-      activesupport (>= 4.2.0)
-    factory_bot_rails (5.0.1)
-      factory_bot (~> 5.0.0)
-      railties (>= 4.2.0)
-    fakefs (0.20.0)
-    faraday (0.15.4)
+      dry-container (~> 0.7, >= 0.7.1)
+      dry-core (~> 0.5, >= 0.5)
+      dry-initializer (~> 3.0)
+      dry-schema (~> 1.8, >= 1.8.0)
+    erb_lint (0.1.1)
+      activesupport
+      better_html (~> 1.0.7)
+      html_tokenizer
+      parser (>= 2.7.1.4)
+      rainbow
+      rubocop
+      smart_properties
+    erubi (1.10.0)
+    execjs (2.8.1)
+    exifr (1.3.9)
+    factory_bot (6.2.0)
+      activesupport (>= 5.0.0)
+    factory_bot_rails (6.2.0)
+      factory_bot (~> 6.2.0)
+      railties (>= 5.0.0)
+    faraday (1.8.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)

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

-    ffi (1.10.0)
-    fspath (3.1.0)
-    gd2-ffij (0.3.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    ffi (1.15.4)
+    ffi-libarchive (1.1.3)
+      ffi (~> 1.0)
+    fspath (3.1.2)
+    gd2-ffij (0.4.0)

       ffi (>= 1.0.0)
       ffi (>= 1.0.0)

-    geoip (1.6.4)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    hashdiff (0.3.8)
-    hashie (3.6.0)
+    globalid (0.5.2)
+      activesupport (>= 5.0)
+    hashdiff (1.0.1)
+    hashie (4.1.0)
+    html_tokenizer (0.0.7)

     htmlentities (4.3.4)
     htmlentities (4.3.4)

-    http_accept_language (2.0.5)
-    i18n (0.9.5)
+    http_accept_language (2.1.1)
+    i18n (1.8.10)

       concurrent-ruby (~> 1.0)
       concurrent-ruby (~> 1.0)

-    i18n-js (3.2.1)
+    i18n-js (3.9.0)

       i18n (>= 0.6.6)
       i18n (>= 0.6.6)

-    image_optim (0.26.3)
+    image_optim (0.31.0)

       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       image_size (>= 1.5, < 3)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       image_size (>= 1.5, < 3)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)

-    image_optim_rails (0.4.1)
+    image_optim_rails (0.4.3)

       image_optim (~> 0.24)
       rails
       sprockets
       image_optim (~> 0.24)
       rails
       sprockets

-    image_size (2.0.0)
-    in_threads (1.5.1)
-    jaro_winkler (1.5.2)
-    jquery-rails (4.3.3)
+    image_processing (1.12.1)
+      mini_magick (>= 4.9.5, < 5)
+      ruby-vips (>= 2.0.17, < 3)
+    image_size (2.1.2)
+    in_threads (1.5.4)
+    jbuilder (2.11.2)
+      activesupport (>= 5.0.0)
+    jmespath (1.4.0)
+    jquery-rails (4.4.0)

       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)

-    jshint (1.5.0)
-      execjs (>= 1.4.0)
-      multi_json (~> 1.0)
-      therubyracer (~> 0.12.1)
-    json (2.2.0)
-    jsonify (0.3.1)
-      multi_json (~> 1.0)
-    jsonify-rails (0.3.2)
-      actionpack
-      jsonify (< 0.4.0)
-    jwt (2.1.0)
-    kgio (2.11.2)
-    kramdown (2.1.0)
-    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)
-      ruby_dep (~> 1.2)
-    logstash-event (1.2.02)
-    logstasher (1.3.0)
-      activesupport (>= 4.0)
-      logstash-event (~> 1.2.0)
+    json (2.5.1)
+    jwt (2.3.0)
+    kgio (2.11.4)
+    kramdown (2.3.1)
+      rexml
+    libxml-ruby (3.2.1)
+    listen (3.7.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    logstasher (2.1.5)
+      activesupport (>= 5.2)

       request_store
       request_store

-    loofah (2.2.3)
+    loofah (2.12.0)

       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)

-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
-    method_source (0.9.2)
-    mime-types (3.2.2)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
-    mimemagic (0.3.3)
-    mini_mime (1.0.1)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    msgpack (1.2.9)
-    multi_json (1.13.1)
+    marcel (1.0.2)
+    maxminddb (0.1.22)
+    method_source (1.0.0)
+    mini_magick (4.11.0)
+    mini_mime (1.1.2)
+    mini_portile2 (2.6.1)
+    minitest (5.14.4)
+    msgpack (1.4.2)
+    multi_json (1.15.0)

     multi_xml (0.6.0)
     multi_xml (0.6.0)

-    multipart-post (2.0.0)
-    nio4r (2.3.1)
-    nokogiri (1.10.1)
-      mini_portile2 (~> 2.4.0)
-    nokogumbo (2.0.1)
-      nokogiri (~> 1.8, >= 1.8.4)
+    multipart-post (2.1.1)
+    nio4r (2.5.8)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.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.1)
-      faraday (>= 0.8, < 0.16.0)
+    oauth2 (1.4.7)
+      faraday (>= 0.8, < 2.0)

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

-    omniauth (1.9.0)
-      hashie (>= 3.4.6, < 3.7.0)
+    omniauth (2.0.4)
+      hashie (>= 3.4.6)

       rack (>= 1.6.2, < 3)
       rack (>= 1.6.2, < 3)

-    omniauth-facebook (5.0.0)
+      rack-protection
+    omniauth-facebook (8.0.0)

       omniauth-oauth2 (~> 1.2)
       omniauth-oauth2 (~> 1.2)

-    omniauth-github (1.3.0)
-      omniauth (~> 1.5)
-      omniauth-oauth2 (>= 1.4.0, < 2.0)
-    omniauth-google-oauth2 (0.6.1)
+    omniauth-github (2.0.0)
+      omniauth (~> 2.0)
+      omniauth-oauth2 (~> 1.7.1)
+    omniauth-google-oauth2 (1.0.0)

       jwt (>= 2.0)
       jwt (>= 2.0)

-      omniauth (>= 1.1.1)
-      omniauth-oauth2 (>= 1.5)
+      oauth2 (~> 1.1)
+      omniauth (~> 2.0)
+      omniauth-oauth2 (~> 1.7.1)

     omniauth-mediawiki (0.0.4)
       jwt (~> 2.0)
       omniauth-oauth (~> 1.0)
     omniauth-mediawiki (0.0.4)
       jwt (~> 2.0)
       omniauth-oauth (~> 1.0)

-    omniauth-oauth (1.1.0)
+    omniauth-oauth (1.2.0)

       oauth
       oauth

-      omniauth (~> 1.0)
-    omniauth-oauth2 (1.6.0)
-      oauth2 (~> 1.1)
-      omniauth (~> 1.9)
-    omniauth-openid (1.0.1)
-      omniauth (~> 1.0)
-      rack-openid (~> 1.3.1)
+      omniauth (>= 1.0, < 3)
+    omniauth-oauth2 (1.7.1)
+      oauth2 (~> 1.4)
+      omniauth (>= 1.9, < 3)
+    omniauth-openid (2.0.1)
+      omniauth (>= 1.0, < 3.0)
+      rack-openid (~> 1.4.0)
+    omniauth-rails_csrf_protection (1.0.0)
+      actionpack (>= 4.2)
+      omniauth (~> 2.0)

     omniauth-windowslive (0.0.12)
       multi_json (~> 1.12)
       omniauth-oauth2 (~> 1.4)
     omniauth-windowslive (0.0.12)
       multi_json (~> 1.12)
       omniauth-oauth2 (~> 1.4)

-    openstreetmap-deadlock_retry (1.3.0)
-    paperclip (5.3.0)
-      activemodel (>= 4.2.0)
-      activesupport (>= 4.2.0)
-      mime-types
-      mimemagic (~> 0.3.0)
-      terrapin (~> 0.6.0)
-    parallel (1.14.0)
-    parser (2.6.0.0)
-      ast (~> 2.4.0)
-    pg (0.21.0)
-    poltergeist (1.18.1)
-      capybara (>= 2.1, < 4)
-      cliver (~> 0.3.1)
-      websocket-driver (>= 0.2.0)
-    powerpack (0.1.2)
-    progress (3.5.0)
-    psych (3.1.0)
-    public_suffix (3.0.3)
-    puma (3.12.0)
+    openstreetmap-deadlock_retry (1.3.1)
+    parallel (1.21.0)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
+    pg (1.2.3)
+    popper_js (1.16.0)
+    progress (3.6.0)
+    public_suffix (4.0.6)
+    puma (5.5.1)
+      nio4r (~> 2.0)

     quad_tile (1.0.1)
     r2 (0.2.7)
     quad_tile (1.0.1)
     r2 (0.2.7)

-    rack (2.0.6)
-    rack-cors (1.0.2)
-    rack-openid (1.3.1)
+    racc (1.5.2)
+    rack (2.2.3)
+    rack-cors (1.1.1)
+      rack (>= 2.0.0)
+    rack-openid (1.4.2)

       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)

+    rack-protection (2.1.0)
+      rack

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

-    rails (5.2.2.1)
-      actioncable (= 5.2.2.1)
-      actionmailer (= 5.2.2.1)
-      actionpack (= 5.2.2.1)
-      actionview (= 5.2.2.1)
-      activejob (= 5.2.2.1)
-      activemodel (= 5.2.2.1)
-      activerecord (= 5.2.2.1)
-      activestorage (= 5.2.2.1)
-      activesupport (= 5.2.2.1)
-      bundler (>= 1.3.0)
-      railties (= 5.2.2.1)
+    rails (6.1.4.1)
+      actioncable (= 6.1.4.1)
+      actionmailbox (= 6.1.4.1)
+      actionmailer (= 6.1.4.1)
+      actionpack (= 6.1.4.1)
+      actiontext (= 6.1.4.1)
+      actionview (= 6.1.4.1)
+      activejob (= 6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activerecord (= 6.1.4.1)
+      activestorage (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+      bundler (>= 1.15.0)
+      railties (= 6.1.4.1)

       sprockets-rails (>= 2.0.0)
       sprockets-rails (>= 2.0.0)

-    rails-controller-testing (1.0.4)
-      actionpack (>= 5.0.1.x)
-      actionview (>= 5.0.1.x)
-      activesupport (>= 5.0.1.x)
+    rails-controller-testing (1.0.5)
+      actionpack (>= 5.0.1.rc1)
+      actionview (>= 5.0.1.rc1)
+      activesupport (>= 5.0.1.rc1)

     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)

-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    rails-i18n (4.0.2)
-      i18n (~> 0.6)
-      rails (>= 4.0)
-    railties (5.2.2.1)
-      actionpack (= 5.2.2.1)
-      activesupport (= 5.2.2.1)
+    rails-html-sanitizer (1.4.2)
+      loofah (~> 2.3)
+    rails-i18n (6.0.0)
+      i18n (>= 0.7, < 2)
+      railties (>= 6.0.0, < 7)
+    railties (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activesupport (= 6.1.4.1)

       method_source
       method_source

-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      rake (>= 0.13)
+      thor (~> 1.0)

     rainbow (3.0.0)
     rainbow (3.0.0)

-    rake (12.3.2)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rake (13.0.6)
+    rb-fsevent (0.11.0)
+    rb-inotify (0.10.1)

       ffi (~> 1.0)
       ffi (~> 1.0)

-    record_tag_helper (1.0.0)
-      actionview (~> 5.x)
-    ref (2.0.0)
-    request_store (1.4.1)
+    regexp_parser (2.1.1)
+    request_store (1.5.0)

       rack (>= 1.4)
       rack (>= 1.4)

-    rinku (2.0.4)
-    rotp (4.1.0)
-      addressable (~> 2.5)
-    rubocop (0.65.0)
-      jaro_winkler (~> 1.5.1)
+    rexml (3.2.5)
+    rinku (2.0.6)
+    rotp (6.2.0)
+    rubocop (1.22.1)

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

-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
-      psych (>= 3.1.0)
+      parser (>= 3.0.0.0)

       rainbow (>= 2.2.2, < 4.0)
       rainbow (>= 2.2.2, < 4.0)

+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.12.0, < 2.0)

       ruby-progressbar (~> 1.7)
       ruby-progressbar (~> 1.7)

-      unicode-display_width (~> 1.4.0)
-    ruby-openid (2.7.0)
-    ruby-progressbar (1.10.0)
-    ruby_dep (1.5.0)
-    safe_yaml (1.0.5)
-    sanitize (5.0.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.12.0)
+      parser (>= 3.0.1.1)
+    rubocop-minitest (0.15.2)
+      rubocop (>= 0.90, < 2.0)
+    rubocop-performance (1.11.5)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.11.3)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    ruby-openid (2.9.2)
+    ruby-progressbar (1.11.0)
+    ruby-vips (2.1.3)
+      ffi (~> 1.12)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
+    sanitize (6.0.0)

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

-      nokogiri (>= 1.8.0)
-      nokogumbo (~> 2.0)
-    sassc (2.0.1)
+      nokogiri (>= 1.12.0)
+    sassc (2.4.0)

       ffi (~> 1.9)
       ffi (~> 1.9)

-      rake
-    sassc-rails (2.1.0)
+    sassc-rails (2.1.2)

       railties (>= 4.0.0)
       sassc (>= 2.0)
       sprockets (> 3.0)
       sprockets-rails
       tilt
       railties (>= 4.0.0)
       sassc (>= 2.0)
       sprockets (> 3.0)
       sprockets-rails
       tilt

-    secure_headers (6.1.0)
-    simplecov (0.16.1)
+    secure_headers (6.3.3)
+    selenium-webdriver (3.142.7)
+      childprocess (>= 0.5, < 4.0)
+      rubyzip (>= 1.2.2)
+    simplecov (0.21.2)

       docile (~> 1.1)
       docile (~> 1.1)

-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sprockets (3.7.2)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov-lcov (0.8.0)
+    simplecov_json_formatter (0.1.3)
+    smart_properties (1.16.3)
+    sprockets (4.0.2)

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

-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)

       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)

-    term-ansicolor (1.7.1)
-      tins (~> 1.0)
-    terrapin (0.6.0)
-      climate_control (>= 0.0.3, < 1.0)
-    therubyracer (0.12.3)
-      libv8 (~> 3.16.14.15)
-      ref
-    thor (0.19.4)
-    thread_safe (0.3.6)
-    tilt (2.0.9)
-    tins (1.20.2)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    uglifier (4.1.20)
+    strong_migrations (0.7.8)
+      activerecord (>= 5)
+    terser (1.1.7)

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

-    unicode-display_width (1.4.1)
+    thor (1.1.0)
+    tilt (2.0.10)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)

     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.5.1)
-      addressable (>= 2.3.6)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)

       crack (>= 0.3.2)
       crack (>= 0.3.2)

-      hashdiff
-    websocket-driver (0.7.0)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    websocket-driver (0.7.5)

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

-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.5)

     xpath (3.2.0)
       nokogiri (~> 1.8)
     xpath (3.2.0)
       nokogiri (~> 1.8)

+    zeitwerk (2.4.2)

 
 PLATFORMS
   ruby
 
 DEPENDENCIES
 
 PLATFORMS
   ruby
 
 DEPENDENCIES

-  SystemTimer (>= 1.1.3)

   aasm
   aasm

-  actionpack-page_caching
+  actionpack-page_caching (>= 1.2.0)

   active_record_union
   activerecord-import
   annotate
   active_record_union
   activerecord-import
   annotate

-  autoprefixer-rails (~> 8.6.3)
+  autoprefixer-rails
+  aws-sdk-s3

   better_errors
   better_errors

-  bigdecimal (~> 1.1.0)

   binding_of_caller
   binding_of_caller

-  bootsnap (>= 1.1.0)
+  bootsnap (>= 1.4.2)
+  bootstrap (~> 4.5.0)
+  bootstrap_form (~> 4.0)
+  brakeman

   browser
   browser

+  bzip2-ffi

   cancancan
   canonical-rails
   cancancan
   canonical-rails

-  capybara (~> 2.13)
-  coffee-rails (~> 4.2)
-  composite_primary_keys (~> 11.1.0)
+  capybara (>= 2.15)
+  composite_primary_keys (~> 13.0.0)

   config
   config

-  coveralls

   dalli
   dalli

+  debug_inspector

   delayed_job_active_record
   delayed_job_active_record

-  dynamic_form
+  doorkeeper
+  doorkeeper-i18n
+  erb_lint

   factory_bot_rails
   factory_bot_rails

-  fakefs

   faraday
   faraday

-  gd2-ffij
-  geoip
+  ffi-libarchive
+  gd2-ffij (>= 0.4.0)

   htmlentities
   htmlentities

-  http_accept_language (~> 2.0.0)
+  http_accept_language (~> 2.1.1)

   i18n-js (>= 3.0.0)
   image_optim_rails
   i18n-js (>= 3.0.0)
   image_optim_rails

+  image_processing
+  jbuilder (~> 2.7)

   jquery-rails
   jquery-rails

-  jshint

   json
   json

-  jsonify-rails

   kgio
   kramdown
   libxml-ruby (>= 2.0.5)
   listen
   logstasher
   kgio
   kramdown
   libxml-ruby (>= 2.0.5)
   listen
   logstasher

+  marcel
+  maxminddb

   minitest (~> 5.1)
   oauth-plugin (>= 0.5.1)
   minitest (~> 5.1)
   oauth-plugin (>= 0.5.1)

-  omniauth
+  omniauth (~> 2.0.2)

   omniauth-facebook
   omniauth-github
   omniauth-google-oauth2 (>= 0.6.0)
   omniauth-mediawiki (>= 0.0.4)
   omniauth-openid
   omniauth-facebook
   omniauth-github
   omniauth-google-oauth2 (>= 0.6.0)
   omniauth-mediawiki (>= 0.0.4)
   omniauth-openid

+  omniauth-rails_csrf_protection (~> 1.0)

   omniauth-windowslive
   omniauth-windowslive

-  openstreetmap-deadlock_retry (>= 1.3.0)
-  paperclip (~> 5.2)
-  pg (~> 0.18)
-  poltergeist
-  psych
-  puma (~> 3.7)
+  openstreetmap-deadlock_retry (>= 1.3.1)
+  pg
+  puma (~> 5.3)

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

-  rails (= 5.2.2.1)
+  rails (= 6.1.4.1)

   rails-controller-testing
   rails-controller-testing

-  rails-i18n (~> 4.0.0)
-  record_tag_helper
-  rinku (= 2.0.4)
+  rails-i18n (~> 6.0.0)
+  rinku (>= 2.0.6)

   rotp
   rubocop
   rotp
   rubocop

+  rubocop-minitest
+  rubocop-performance
+  rubocop-rails (~> 2.11.3)
+  rubocop-rake

   sanitize
   sassc-rails
   secure_headers
   sanitize
   sassc-rails
   secure_headers

-  uglifier (>= 1.3.0)
+  selenium-webdriver
+  simplecov
+  simplecov-lcov
+  strong_migrations
+  terser

   validates_email_format_of (>= 1.5.1)
   vendorer
   webmock
 
 BUNDLED WITH
   validates_email_format_of (>= 1.5.1)
   vendorer
   webmock
 
 BUNDLED WITH

-   1.16.2
+   2.2.16