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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index ffa3cd93717ae5abaf4f3b146e22bfa325c69f30..997a7df09cc4ed54dbdaf84c3e2ad71a417f31f8 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,78 +1,99 @@
-GIT
-  remote: git@github.com:mmd-osm/gd2-ffij.git
-  revision: c92057a8f699a36b5f6d208db3d11eb3bae185dd
-  branch: animated_gif
-  specs:
-    gd2-ffij (0.3.1)
-      ffi (>= 1.0.0)
-

 GEM
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)
 GEM
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)

-    aasm (5.0.2)
+    aasm (5.0.6)

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

-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
+    actioncable (6.0.2.1)
+      actionpack (= 6.0.2.1)

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

-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
+    actionmailbox (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      mail (>= 2.7.1)
+    actionmailer (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      actionview (= 6.0.2.1)
+      activejob (= 6.0.2.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.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
-      rack (~> 2.0)
+    actionpack (6.0.2.1)
+      actionview (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      rack (~> 2.0, >= 2.0.8)

       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.3)
-      activesupport (= 5.2.3)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionpack-page_caching (1.2.0)
+      actionpack (>= 5.0.0)
+    actiontext (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.2.1)
+      activesupport (= 6.0.2.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.3)
-      activesupport (= 5.2.3)
+    activejob (6.0.2.1)
+      activesupport (= 6.0.2.1)

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

-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
-      arel (>= 9.0)
-    activerecord-import (1.0.1)
+    activemodel (6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord (6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord-import (1.0.4)

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

-    activestorage (5.2.3)
-      actionpack (= 5.2.3)
-      activerecord (= 5.2.3)
+    activestorage (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activerecord (= 6.0.2.1)

       marcel (~> 0.3.1)
       marcel (~> 0.3.1)

-    activesupport (5.2.3)
+    activesupport (6.0.2.1)

       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       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)
+      zeitwerk (~> 2.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    annotate (3.0.3)
+      activerecord (>= 3.2, < 7.0)
+      rake (>= 10.4, < 14.0)

     ast (2.4.0)
     ast (2.4.0)

-    autoprefixer-rails (8.6.5)
+    autoprefixer-rails (9.7.3)

       execjs
       execjs

+    aws-eventstream (1.0.3)
+    aws-partitions (1.261.0)
+    aws-sdk-core (3.86.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.239.0)
+      aws-sigv4 (~> 1.1)
+      jmespath (~> 1.0)
+    aws-sdk-kms (1.27.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.60.1)
+      aws-sdk-core (~> 3, >= 3.83.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.1.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)

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

-    better_html (1.0.13)
+    better_html (1.0.14)

       actionview (>= 4.0)
       activesupport (>= 4.0)
       ast (~> 2.0)
       actionview (>= 4.0)
       activesupport (>= 4.0)
       ast (~> 2.0)


@@ -83,180 +104,182 @@ GEM
     bigdecimal (1.1.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     bigdecimal (1.1.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)

-    bootsnap (1.4.2)
+    bootsnap (1.4.5)

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

-    browser (2.5.3)
-    builder (3.2.3)
-    cancancan (2.3.0)
-    canonical-rails (0.2.5)
+    bootstrap (4.3.1)
+      autoprefixer-rails (>= 9.1.0)
+      popper_js (>= 1.14.3, < 2)
+      sassc-rails (>= 2.0.0)
+    browser (3.0.0)
+    builder (3.2.4)
+    bzip2-ffi (1.0.0)
+      ffi (~> 1.0)
+    cancancan (3.0.1)
+    canonical-rails (0.2.6)

       rails (>= 4.1, < 6.1)
       rails (>= 4.1, < 6.1)

-    capybara (2.18.0)
+    capybara (3.30.0)

       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)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.5)
+      xpath (~> 3.2)
+    childprocess (3.0.0)

     cliver (0.3.2)
     coderay (1.1.2)
     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)
+    composite_primary_keys (12.0.1)
+      activerecord (~> 6.0.0)

     concurrent-ruby (1.1.5)
     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)
+    config (2.1.0)
+      deep_merge (~> 1.2, >= 1.2.1)
+      dry-validation (~> 1.0)
+    coveralls (0.8.23)

       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
       term-ansicolor (~> 1.3)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
       term-ansicolor (~> 1.3)

-      thor (~> 0.19.4)
+      thor (>= 0.19.4, < 2.0)

       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.4)
+    crass (1.0.5)

     dalli (2.7.10)
     debug_inspector (0.0.3)
     deep_merge (1.2.1)
     dalli (2.7.10)
     debug_inspector (0.0.3)
     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.8)
+      activesupport (>= 3.0, < 6.1)
+    delayed_job_active_record (4.1.4)
+      activerecord (>= 3.0, < 6.1)

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

-    docile (1.3.1)
-    dry-configurable (0.8.2)
+    docile (1.3.2)
+    dry-configurable (0.9.0)

       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)

-    dry-container (0.7.0)
+    dry-container (0.7.2)

       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)

-    dry-core (0.4.7)
+    dry-core (0.4.9)
+      concurrent-ruby (~> 1.0)
+    dry-equalizer (0.3.0)
+    dry-inflector (0.2.0)
+    dry-initializer (3.0.2)
+    dry-logic (1.0.5)

       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-core (~> 0.2)
       dry-equalizer (~> 0.2)

-    dry-types (0.14.1)
+    dry-schema (1.4.2)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.8, >= 0.8.3)
+      dry-core (~> 0.4)
+      dry-equalizer (~> 0.2)
+      dry-initializer (~> 3.0)
+      dry-logic (~> 1.0)
+      dry-types (~> 1.2)
+    dry-types (1.2.2)

       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
       dry-core (~> 0.4, >= 0.4.4)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
       dry-core (~> 0.4, >= 0.4.4)

-      dry-equalizer (~> 0.2)
+      dry-equalizer (~> 0.3)

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

-      dry-logic (~> 0.5, >= 0.5)
-    dry-validation (0.13.1)
+      dry-logic (~> 1.0, >= 1.0.2)
+    dry-validation (1.4.0)

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

-      dry-configurable (~> 0.1, >= 0.1.3)
-      dry-core (~> 0.2, >= 0.2.1)
+      dry-container (~> 0.7, >= 0.7.1)
+      dry-core (~> 0.4)

       dry-equalizer (~> 0.2)
       dry-equalizer (~> 0.2)

-      dry-logic (~> 0.5, >= 0.5.0)
-      dry-types (~> 0.14.0)
+      dry-initializer (~> 3.0)
+      dry-schema (~> 1.0, >= 1.3.1)

     dynamic_form (1.1.4)
     dynamic_form (1.1.4)

-    erb_lint (0.0.28)
+    erb_lint (0.0.30)

       activesupport
       better_html (~> 1.0.7)
       html_tokenizer
       rainbow
       rubocop (~> 0.51)
       smart_properties
       activesupport
       better_html (~> 1.0.7)
       html_tokenizer
       rainbow
       rubocop (~> 0.51)
       smart_properties

-    erubi (1.8.0)
+    erubi (1.9.0)

     execjs (2.7.0)
     exifr (1.3.6)
     execjs (2.7.0)
     exifr (1.3.6)

-    factory_bot (5.0.2)
+    factory_bot (5.1.1)

       activesupport (>= 4.2.0)
       activesupport (>= 4.2.0)

-    factory_bot_rails (5.0.1)
-      factory_bot (~> 5.0.0)
+    factory_bot_rails (5.1.1)
+      factory_bot (~> 5.1.0)

       railties (>= 4.2.0)
       railties (>= 4.2.0)

-    fakefs (0.20.0)
-    faraday (0.15.4)
+    fakefs (0.20.1)
+    faraday (1.0.0)

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

-    ffi (1.10.0)
-    fspath (3.1.0)
-    geoip (1.6.4)
+    ffi (1.11.3)
+    ffi-libarchive (1.0.0)
+      ffi (~> 1.0)
+    fspath (3.1.2)
+    gd2-ffij (0.4.0)
+      ffi (>= 1.0.0)

     globalid (0.4.2)
       activesupport (>= 4.2.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)

-    hashdiff (0.3.8)
+    hashdiff (1.0.0)

     hashie (3.6.0)
     html_tokenizer (0.0.7)
     htmlentities (4.3.4)
     http_accept_language (2.0.5)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     hashie (3.6.0)
     html_tokenizer (0.0.7)
     htmlentities (4.3.4)
     http_accept_language (2.0.5)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)

-    i18n-js (3.2.1)
+    i18n-js (3.5.1)

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

-    image_optim (0.26.3)
+    image_optim (0.26.5)

       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_size (2.0.2)
+    in_threads (1.5.4)
+    jaro_winkler (1.5.4)
+    jbuilder (2.9.1)
+      activesupport (>= 4.2.0)
+    jmespath (1.4.0)
+    jquery-rails (4.3.5)

       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)
+    json (2.3.0)
+    jwt (2.2.1)

     kgio (2.11.2)
     kramdown (2.1.0)
     kgio (2.11.2)
     kramdown (2.1.0)

-    libv8 (3.16.14.19)

     libxml-ruby (3.1.0)
     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)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)

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

-    loofah (2.2.3)
+    loofah (2.4.0)

       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)
       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)

+    maxminddb (0.1.22)

     method_source (0.9.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)
     mimemagic (0.3.3)

-    mini_mime (1.0.1)
+    mini_magick (4.9.5)
+    mini_mime (1.0.2)

     mini_portile2 (2.4.0)
     mini_portile2 (2.4.0)

-    minitest (5.11.3)
-    msgpack (1.2.9)
-    multi_json (1.13.1)
+    minitest (5.13.0)
+    msgpack (1.3.1)
+    multi_json (1.14.1)

     multi_xml (0.6.0)
     multi_xml (0.6.0)

-    multipart-post (2.0.0)
-    nio4r (2.3.1)
-    nokogiri (1.10.2)
+    multipart-post (2.1.1)
+    nio4r (2.5.2)
+    nokogiri (1.10.7)

       mini_portile2 (~> 2.4.0)
       mini_portile2 (~> 2.4.0)

-    nokogumbo (2.0.1)
+    nokogumbo (2.0.2)

       nokogiri (~> 1.8, >= 1.8.4)
     oauth (0.4.7)
     oauth-plugin (0.5.1)
       nokogiri (~> 1.8, >= 1.8.4)
     oauth (0.4.7)
     oauth-plugin (0.5.1)


@@ -264,8 +287,8 @@ GEM
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack

-    oauth2 (1.4.1)
-      faraday (>= 0.8, < 0.16.0)
+    oauth2 (1.4.2)
+      faraday (>= 0.8, < 2.0)

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


@@ -278,10 +301,10 @@ GEM
     omniauth-github (1.3.0)
       omniauth (~> 1.5)
       omniauth-oauth2 (>= 1.4.0, < 2.0)
     omniauth-github (1.3.0)
       omniauth (~> 1.5)
       omniauth-oauth2 (>= 1.4.0, < 2.0)

-    omniauth-google-oauth2 (0.6.1)
+    omniauth-google-oauth2 (0.8.0)

       jwt (>= 2.0)
       omniauth (>= 1.1.1)
       jwt (>= 2.0)
       omniauth (>= 1.1.1)

-      omniauth-oauth2 (>= 1.5)
+      omniauth-oauth2 (>= 1.6)

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


@@ -298,46 +321,44 @@ GEM
       multi_json (~> 1.12)
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.0)
       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.16.0)
-    parser (2.6.2.0)
+    parallel (1.19.1)
+    parser (2.7.0.1)

       ast (~> 2.4.0)
       ast (~> 2.4.0)

-    pg (0.21.0)
+    pg (1.2.1)

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

-    progress (3.5.0)
+    popper_js (1.14.5)
+    progress (3.5.2)

     psych (3.1.0)
     psych (3.1.0)

-    public_suffix (3.0.3)
-    puma (3.12.1)
+    public_suffix (4.0.2)
+    puma (3.12.2)

     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.3)
+    rack (2.0.8)
+    rack-cors (1.1.1)
+      rack (>= 2.0.0)

     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rack-uri_sanitizer (0.0.2)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rack-uri_sanitizer (0.0.2)

-    rails (5.2.3)
-      actioncable (= 5.2.3)
-      actionmailer (= 5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      activemodel (= 5.2.3)
-      activerecord (= 5.2.3)
-      activestorage (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails (6.0.2.1)
+      actioncable (= 6.0.2.1)
+      actionmailbox (= 6.0.2.1)
+      actionmailer (= 6.0.2.1)
+      actionpack (= 6.0.2.1)
+      actiontext (= 6.0.2.1)
+      actionview (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)

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

-      railties (= 5.2.3)
+      railties (= 6.0.2.1)

       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.4)
       actionpack (>= 5.0.1.x)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.4)
       actionpack (>= 5.0.1.x)


@@ -346,97 +367,99 @@ GEM
     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-html-sanitizer (1.3.0)
+      loofah (~> 2.3)

     rails-i18n (4.0.2)
       i18n (~> 0.6)
       rails (>= 4.0)
     rails-i18n (4.0.2)
       i18n (~> 0.6)
       rails (>= 4.0)

-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
+    railties (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activesupport (= 6.0.2.1)

       method_source
       rake (>= 0.8.7)
       method_source
       rake (>= 0.8.7)

-      thor (>= 0.19.0, < 2.0)
+      thor (>= 0.20.3, < 2.0)

     rainbow (3.0.0)
     rainbow (3.0.0)

-    rake (12.3.2)
+    rake (13.0.1)

     rb-fsevent (0.10.3)
     rb-fsevent (0.10.3)

-    rb-inotify (0.10.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 (1.6.0)
+    request_store (1.5.0)

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

-    rinku (2.0.4)
-    rotp (4.1.0)
+    rinku (2.0.6)
+    rotp (5.1.0)

       addressable (~> 2.5)
       addressable (~> 2.5)

-    rubocop (0.66.0)
+    rubocop (0.78.0)

       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)

-      parser (>= 2.5, != 2.5.1.1)
-      psych (>= 3.1.0)
+      parser (>= 2.6)

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

-      unicode-display_width (>= 1.4.0, < 1.6)
-    ruby-openid (2.7.0)
-    ruby-progressbar (1.10.0)
-    ruby_dep (1.5.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    rubocop-performance (1.5.2)
+      rubocop (>= 0.71.0)
+    rubocop-rails (2.4.1)
+      rack (>= 1.1)
+      rubocop (>= 0.72.0)
+    ruby-openid (2.9.2)
+    ruby-progressbar (1.10.1)
+    rubyzip (2.0.0)

     safe_yaml (1.0.5)
     safe_yaml (1.0.5)

-    sanitize (5.0.0)
+    sanitize (5.1.0)

       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)

-    sassc (2.0.1)
+    sassc (2.2.1)

       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)
+    secure_headers (6.1.1)
+    selenium-webdriver (3.142.7)
+      childprocess (>= 0.5, < 4.0)
+      rubyzip (>= 1.2.2)

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

-    smart_properties (1.13.1)
-    sprockets (3.7.2)
+    smart_properties (1.15.0)
+    sprockets (4.0.0)

       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)

+    strong_migrations (0.5.1)
+      activerecord (>= 5)

     term-ansicolor (1.7.1)
       tins (~> 1.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)
+    thor (1.0.1)

     thread_safe (0.3.6)
     thread_safe (0.3.6)

-    tilt (2.0.9)
-    tins (1.20.2)
-    tzinfo (1.2.5)
+    tilt (2.0.10)
+    tins (1.22.2)
+    tzinfo (1.2.6)

       thread_safe (~> 0.1)
       thread_safe (~> 0.1)

-    uglifier (4.1.20)
+    uglifier (4.2.0)

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

-    unicode-display_width (1.5.0)
+    unicode-display_width (1.6.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)
+    webmock (3.7.6)

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

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

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

-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.4)

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

+    zeitwerk (2.2.2)

 
 PLATFORMS
   ruby
 
 PLATFORMS
   ruby


@@ -444,21 +467,23 @@ PLATFORMS
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
   aasm
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
   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
   bigdecimal (~> 1.1.0)
   binding_of_caller
   better_errors
   bigdecimal (~> 1.1.0)
   binding_of_caller

-  bootsnap (>= 1.1.0)
+  bootsnap (>= 1.4.2)
+  bootstrap (~> 4.3.1)

   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 (~> 12.0.0)

   config
   coveralls
   dalli
   config
   coveralls
   dalli


@@ -468,21 +493,23 @@ DEPENDENCIES
   factory_bot_rails
   fakefs
   faraday
   factory_bot_rails
   fakefs
   faraday

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

   htmlentities
   http_accept_language (~> 2.0.0)
   i18n-js (>= 3.0.0)
   image_optim_rails
   htmlentities
   http_accept_language (~> 2.0.0)
   i18n-js (>= 3.0.0)
   image_optim_rails

+  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

+  maxminddb
+  mimemagic
+  mini_magick

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


@@ -493,29 +520,31 @@ DEPENDENCIES
   omniauth-openid
   omniauth-windowslive
   openstreetmap-deadlock_retry (>= 1.3.0)
   omniauth-openid
   omniauth-windowslive
   openstreetmap-deadlock_retry (>= 1.3.0)

-  paperclip (~> 5.2)
-  pg (~> 0.18)
+  pg

   poltergeist
   psych
   poltergeist
   psych

-  puma (~> 3.7)
+  puma (~> 3.11)

   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.3)
+  rails (= 6.0.2.1)

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

-  record_tag_helper
-  rinku (= 2.0.4)
+  rinku (>= 2.0.6)

   rotp
   rubocop
   rotp
   rubocop

+  rubocop-performance
+  rubocop-rails

   sanitize
   sassc-rails
   secure_headers
   sanitize
   sassc-rails
   secure_headers

+  selenium-webdriver
+  strong_migrations

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

-   1.16.6
+   1.17.2