X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7321023bd5a094ea98cdef9a56e61d4a112c4745..a8c63724f64ef47e94ed739193314161bbdf9e1b:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 5c6a91b26..8e6d4ab85 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,85 +2,98 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) - aasm (5.0.6) + aasm (5.0.8) concurrent-ruby (~> 1.0) - actioncable (5.2.3) - actionpack (= 5.2.3) + actioncable (6.0.3.1) + actionpack (= 6.0.3.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.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + mail (>= 2.7.1) + actionmailer (6.0.3.1) + actionpack (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) 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.3.1) + actionview (= 6.0.3.1) + activesupport (= 6.0.3.1) + rack (~> 2.0, >= 2.0.8) 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.2) + actionpack (>= 5.0.0) + actiontext (6.0.3.1) + actionpack (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + nokogiri (>= 1.8.5) + actionview (6.0.3.1) + activesupport (= 6.0.3.1) 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) - activejob (5.2.3) - activesupport (= 5.2.3) + activejob (6.0.3.1) + activesupport (= 6.0.3.1) 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.3) + activemodel (6.0.3.1) + activesupport (= 6.0.3.1) + activerecord (6.0.3.1) + activemodel (= 6.0.3.1) + activesupport (= 6.0.3.1) + activerecord-import (1.0.5) activerecord (>= 3.2) - activestorage (5.2.3) - actionpack (= 5.2.3) - activerecord (= 5.2.3) + activestorage (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) marcel (~> 0.3.1) - activesupport (5.2.3) + activesupport (6.0.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - annotate (3.0.2) + annotate (3.1.1) activerecord (>= 3.2, < 7.0) - rake (>= 10.4, < 13.0) - arel (9.0.0) + rake (>= 10.4, < 14.0) ast (2.4.0) - autoprefixer-rails (8.6.5) + autoprefixer-rails (9.7.6) execjs - aws-eventstream (1.0.3) - aws-partitions (1.226.0) - aws-sdk-core (3.69.1) - aws-eventstream (~> 1.0, >= 1.0.2) - aws-partitions (~> 1.0) + aws-eventstream (1.1.0) + aws-partitions (1.321.0) + aws-sdk-core (3.96.1) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.24.0) - aws-sdk-core (~> 3, >= 3.61.1) + aws-sdk-kms (1.31.0) + aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.50.0) - aws-sdk-core (~> 3, >= 3.61.1) + aws-sdk-s3 (1.66.0) + aws-sdk-core (~> 3, >= 3.96.1) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sigv4 (1.1.0) + aws-sigv4 (1.1.3) aws-eventstream (~> 1.0, >= 1.0.2) - better_errors (2.5.1) + better_errors (2.7.1) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) - better_html (1.0.14) + better_html (1.0.15) actionview (>= 4.0) activesupport (>= 4.0) ast (~> 2.0) @@ -91,38 +104,35 @@ GEM bigdecimal (1.1.0) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bootsnap (1.4.5) + bootsnap (1.4.6) msgpack (~> 1.0) - browser (2.6.1) - builder (3.2.3) + bootstrap (4.3.1) + autoprefixer-rails (>= 9.1.0) + popper_js (>= 1.14.3, < 2) + sassc-rails (>= 2.0.0) + browser (4.1.0) + builder (3.2.4) bzip2-ffi (1.0.0) ffi (~> 1.0) - cancancan (3.0.1) - canonical-rails (0.2.6) + cancancan (3.1.0) + canonical-rails (0.2.8) rails (>= 4.1, < 6.1) - capybara (2.18.0) + capybara (3.32.2) addressable mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (>= 2.0, < 4.0) - cliver (0.3.2) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.5) + xpath (~> 3.2) + childprocess (3.0.0) 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 (2.0.0) - activesupport (>= 4.2) + composite_primary_keys (12.0.2) + activerecord (~> 6.0.0) + concurrent-ruby (1.1.6) + config (2.2.1) deep_merge (~> 1.2, >= 1.2.1) - dry-schema (~> 1.0) + dry-validation (~> 1.0, >= 1.0.0) coveralls (0.8.23) json (>= 1.8, < 3) simplecov (~> 0.16.1) @@ -131,7 +141,7 @@ GEM tins (~> 1.6) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.5) + crass (1.0.6) dalli (2.7.10) debug_inspector (0.0.3) deep_merge (1.2.1) @@ -141,72 +151,78 @@ GEM activerecord (>= 3.0, < 6.1) delayed_job (>= 3.0, < 5) docile (1.3.2) - dry-configurable (0.8.3) + dry-configurable (0.11.5) concurrent-ruby (~> 1.0) dry-core (~> 0.4, >= 0.4.7) + dry-equalizer (~> 0.2) dry-container (0.7.2) concurrent-ruby (~> 1.0) dry-configurable (~> 0.1, >= 0.1.3) dry-core (0.4.9) concurrent-ruby (~> 1.0) - dry-equalizer (0.2.2) + dry-equalizer (0.3.0) dry-inflector (0.2.0) - dry-initializer (3.0.1) - dry-logic (1.0.3) + dry-initializer (3.0.3) + dry-logic (1.0.6) concurrent-ruby (~> 1.0) dry-core (~> 0.2) dry-equalizer (~> 0.2) - dry-schema (1.4.1) + dry-schema (1.5.1) 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.0) + dry-types (~> 1.4) + dry-types (1.4.0) concurrent-ruby (~> 1.0) dry-container (~> 0.3) dry-core (~> 0.4, >= 0.4.4) - dry-equalizer (~> 0.2, >= 0.2.2) + dry-equalizer (~> 0.3) dry-inflector (~> 0.1, >= 0.1.2) dry-logic (~> 1.0, >= 1.0.2) + dry-validation (1.5.0) + concurrent-ruby (~> 1.0) + dry-container (~> 0.7, >= 0.7.1) + dry-core (~> 0.4) + dry-equalizer (~> 0.2) + dry-initializer (~> 3.0) + dry-schema (~> 1.5) dynamic_form (1.1.4) - erb_lint (0.0.30) + erb_lint (0.0.33) activesupport better_html (~> 1.0.7) html_tokenizer rainbow - rubocop (~> 0.51) + rubocop (~> 0.79) smart_properties erubi (1.9.0) execjs (2.7.0) exifr (1.3.6) - factory_bot (5.1.1) + factory_bot (5.2.0) activesupport (>= 4.2.0) - factory_bot_rails (5.1.1) - factory_bot (~> 5.1.0) + factory_bot_rails (5.2.0) + factory_bot (~> 5.2.0) railties (>= 4.2.0) - fakefs (0.20.1) - faraday (0.17.0) + faraday (1.0.1) multipart-post (>= 1.2, < 3) - ffi (1.11.1) - ffi-libarchive (0.4.10) + ffi (1.12.2) + ffi-libarchive (1.0.0) ffi (~> 1.0) fspath (3.1.2) gd2-ffij (0.4.0) ffi (>= 1.0.0) - geoip (1.6.4) globalid (0.4.2) activesupport (>= 4.2.0) - hashdiff (1.0.0) - hashie (3.6.0) + hashdiff (1.0.1) + hashie (4.1.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.4.0) + i18n-js (3.6.0) i18n (>= 0.6.6) image_optim (0.26.5) exifr (~> 1.2, >= 1.2.2) @@ -219,24 +235,21 @@ GEM rails sprockets image_size (2.0.2) - in_threads (1.5.3) - jaro_winkler (1.5.3) + in_threads (1.5.4) + jbuilder (2.10.0) + activesupport (>= 5.0.0) jmespath (1.4.0) - jquery-rails (4.3.5) + jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.2.0) - jsonify (0.3.1) - multi_json (~> 1.0) - jsonify-rails (0.3.2) - actionpack - jsonify (< 0.4.0) + json (2.3.0) jwt (2.2.1) - kgio (2.11.2) - kramdown (2.1.0) - libxml-ruby (3.1.0) - listen (3.2.0) + kgio (2.11.3) + kramdown (2.2.1) + rexml + libxml-ruby (3.2.0) + listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) logstash-event (1.2.02) @@ -244,27 +257,28 @@ GEM activesupport (>= 4.0) logstash-event (~> 1.2.0) request_store - loofah (2.3.0) + loofah (2.5.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) - method_source (0.9.2) - mimemagic (0.3.3) - mini_magick (4.9.5) + maxminddb (0.1.22) + method_source (1.0.0) + mimemagic (0.3.5) + mini_magick (4.10.1) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.12.2) - msgpack (1.3.1) + minitest (5.14.1) + msgpack (1.3.3) multi_json (1.14.1) multi_xml (0.6.0) multipart-post (2.1.1) nio4r (2.5.2) - nokogiri (1.10.4) + nokogiri (1.10.9) 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) @@ -272,18 +286,18 @@ GEM oauth (~> 0.4.4) oauth2 (>= 0.5.0) rack - oauth2 (1.4.2) + oauth2 (1.4.4) faraday (>= 0.8, < 2.0) 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 (1.9.1) + hashie (>= 3.4.6) rack (>= 1.6.2, < 3) - omniauth-facebook (5.0.0) + omniauth-facebook (6.0.0) omniauth-oauth2 (~> 1.2) - omniauth-github (1.3.0) + omniauth-github (1.4.0) omniauth (~> 1.5) omniauth-oauth2 (>= 1.4.0, < 2.0) omniauth-google-oauth2 (0.8.0) @@ -306,40 +320,40 @@ GEM multi_json (~> 1.12) omniauth-oauth2 (~> 1.4) openstreetmap-deadlock_retry (1.3.0) - parallel (1.18.0) - parser (2.6.5.0) + parallel (1.19.1) + parser (2.7.1.3) ast (~> 2.4.0) - pg (1.1.4) - poltergeist (1.18.1) - capybara (>= 2.1, < 4) - cliver (~> 0.3.1) - websocket-driver (>= 0.2.0) + pg (1.2.3) + popper_js (1.16.0) progress (3.5.2) psych (3.1.0) - public_suffix (4.0.1) - puma (3.12.1) + public_suffix (4.0.5) + puma (3.12.6) quad_tile (1.0.1) r2 (0.2.7) - rack (2.0.7) - rack-cors (1.0.3) + rack (2.2.2) + 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) - 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.3.1) + actioncable (= 6.0.3.1) + actionmailbox (= 6.0.3.1) + actionmailer (= 6.0.3.1) + actionpack (= 6.0.3.1) + actiontext (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + activemodel (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) bundler (>= 1.3.0) - railties (= 5.2.3) + railties (= 6.0.3.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.4) actionpack (>= 5.0.1.x) @@ -353,44 +367,51 @@ GEM 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.3.1) + actionpack (= 6.0.3.1) + activesupport (= 6.0.3.1) method_source rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) + thor (>= 0.20.3, < 2.0) rainbow (3.0.0) - rake (12.3.3) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) + rake (13.0.1) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) ffi (~> 1.0) - record_tag_helper (1.0.0) - actionview (~> 5.x) - request_store (1.4.1) + regexp_parser (1.7.0) + request_store (1.5.0) rack (>= 1.4) + rexml (3.2.4) rinku (2.0.6) - rotp (5.1.0) - addressable (~> 2.5) - rubocop (0.75.1) - jaro_winkler (~> 1.5.1) + rotp (6.0.0) + addressable (~> 2.7) + rubocop (0.84.0) parallel (~> 1.10) - parser (>= 2.6) + parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) + rexml + rubocop-ast (>= 0.0.3) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) - rubocop-performance (1.5.0) + unicode-display_width (>= 1.4.0, < 2.0) + rubocop-ast (0.0.3) + parser (>= 2.7.0.1) + rubocop-minitest (0.9.0) + rubocop (>= 0.74) + rubocop-performance (1.6.0) rubocop (>= 0.71.0) - rubocop-rails (2.3.2) + rubocop-rails (2.5.2) + activesupport rack (>= 1.1) rubocop (>= 0.72.0) ruby-openid (2.9.2) ruby-progressbar (1.10.1) + rubyzip (2.3.0) safe_yaml (1.0.5) sanitize (5.1.0) crass (~> 1.0.2) nokogiri (>= 1.8.0) nokogumbo (~> 2.0) - sassc (2.2.1) + sassc (2.3.0) ffi (~> 1.9) sassc-rails (2.1.2) railties (>= 4.0.0) @@ -398,45 +419,51 @@ GEM sprockets (> 3.0) sprockets-rails tilt - secure_headers (6.1.1) + secure_headers (6.3.0) + 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) smart_properties (1.15.0) - sprockets (3.7.2) + 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) - strong_migrations (0.4.1) + strong_migrations (0.6.8) activerecord (>= 5) + sync (0.5.0) term-ansicolor (1.7.1) tins (~> 1.0) - thor (0.20.3) + thor (1.0.1) thread_safe (0.3.6) tilt (2.0.10) - tins (1.21.1) - tzinfo (1.2.5) + tins (1.25.0) + sync + tzinfo (1.2.7) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (1.6.0) + unicode-display_width (1.7.0) validates_email_format_of (1.6.3) i18n vendorer (0.2.0) - webmock (3.7.6) + webmock (3.8.3) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - websocket-driver (0.7.1) + websocket-driver (0.7.2) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) xpath (3.2.0) nokogiri (~> 1.8) + zeitwerk (2.3.0) PLATFORMS ruby @@ -444,23 +471,23 @@ PLATFORMS DEPENDENCIES SystemTimer (>= 1.1.3) aasm - actionpack-page_caching + actionpack-page_caching (>= 1.2.0) 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 - bootsnap (>= 1.1.0) + bootsnap (>= 1.4.2) + bootstrap (~> 4.3.1) browser bzip2-ffi 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 @@ -468,23 +495,22 @@ DEPENDENCIES dynamic_form erb_lint factory_bot_rails - fakefs faraday ffi-libarchive gd2-ffij (>= 0.4.0) - geoip htmlentities http_accept_language (~> 2.0.0) i18n-js (>= 3.0.0) image_optim_rails + jbuilder (~> 2.7) jquery-rails json - jsonify-rails kgio kramdown libxml-ruby (>= 2.0.5) listen logstasher + maxminddb mimemagic mini_magick minitest (~> 5.1) @@ -498,25 +524,25 @@ DEPENDENCIES omniauth-windowslive openstreetmap-deadlock_retry (>= 1.3.0) pg - poltergeist psych - puma (~> 3.7) + puma (~> 3.11) quad_tile (~> 1.0.1) r2 (~> 0.2.7) rack-cors rack-uri_sanitizer - rails (= 5.2.3) + rails (= 6.0.3.1) rails-controller-testing rails-i18n (~> 4.0.0) - record_tag_helper rinku (>= 2.0.6) rotp rubocop + rubocop-minitest rubocop-performance rubocop-rails sanitize sassc-rails secure_headers + selenium-webdriver strong_migrations uglifier (>= 1.3.0) validates_email_format_of (>= 1.5.1)