X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b6ecdb750773a0e089760ff8f0cbab2d81d6317d..f47aaa58c32c2fe9dc3a93989bacf5f39f4029d2:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 7d06ac98d..3ea9cd6fa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,72 +4,87 @@ GEM SystemTimer (1.2.3) aasm (5.0.6) 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) - 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) - 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) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - 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) - 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.2.1) + activesupport (= 6.0.2.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) + 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.3) 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) - 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) + 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) - arel (9.0.0) ast (2.4.0) - autoprefixer-rails (8.6.5) + autoprefixer-rails (9.7.3) execjs aws-eventstream (1.0.3) - aws-partitions (1.244.0) - aws-sdk-core (3.81.0) + aws-partitions (1.257.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.25.0) + aws-sdk-kms (1.27.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.57.0) - aws-sdk-core (~> 3, >= 3.77.0) + aws-sdk-s3 (1.60.0) + aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.1.0) @@ -91,31 +106,30 @@ GEM debug_inspector (>= 0.0.1) bootsnap (1.4.5) msgpack (~> 1.0) - browser (2.7.0) - 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 (2.7.1) + 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) - capybara (2.18.0) + capybara (3.29.0) addressable mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (>= 2.0, < 4.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) - 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) config (2.0.0) activesupport (>= 4.2) @@ -162,11 +176,11 @@ GEM dry-initializer (~> 3.0) dry-logic (~> 1.0) dry-types (~> 1.2) - dry-types (1.2.1) + dry-types (1.2.2) 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) dynamic_form (1.1.4) @@ -186,9 +200,9 @@ GEM factory_bot (~> 5.1.0) railties (>= 4.2.0) fakefs (0.20.1) - faraday (0.17.0) + faraday (0.17.1) multipart-post (>= 1.2, < 3) - ffi (1.11.2) + ffi (1.11.3) ffi-libarchive (0.4.10) ffi (~> 1.0) fspath (3.1.2) @@ -226,12 +240,12 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.2.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) + listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) logstash-event (1.2.02) @@ -239,7 +253,7 @@ GEM activesupport (>= 4.0) logstash-event (~> 1.2.0) request_store - loofah (2.3.1) + loofah (2.4.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -257,7 +271,7 @@ GEM multi_xml (0.6.0) multipart-post (2.1.1) nio4r (2.5.2) - nokogiri (1.10.5) + nokogiri (1.10.7) mini_portile2 (~> 2.4.0) nokogumbo (2.0.2) nokogiri (~> 1.8, >= 1.8.4) @@ -300,8 +314,6 @@ GEM omniauth-windowslive (0.0.12) multi_json (~> 1.12) omniauth-oauth2 (~> 1.4) - openstreetmap-actionpack-page_caching (1.1.2) - actionpack (>= 5.0.0) openstreetmap-deadlock_retry (1.3.0) parallel (1.19.1) parser (2.6.5.0) @@ -311,13 +323,14 @@ GEM capybara (>= 2.1, < 4) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) + popper_js (1.14.5) progress (3.5.2) psych (3.1.0) public_suffix (4.0.1) - puma (3.12.1) + puma (3.12.2) quad_tile (1.0.1) r2 (0.2.7) - rack (2.0.7) + rack (2.0.8) rack-cors (1.1.0) rack (>= 2.0.0) rack-openid (1.3.1) @@ -326,18 +339,20 @@ GEM 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) - 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) @@ -351,23 +366,24 @@ 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.2.1) + actionpack (= 6.0.2.1) + activesupport (= 6.0.2.1) method_source rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) + thor (>= 0.20.3, < 2.0) rainbow (3.0.0) rake (13.0.1) rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) + regexp_parser (1.6.0) request_store (1.4.1) rack (>= 1.4) rinku (2.0.6) rotp (5.1.0) addressable (~> 2.5) - rubocop (0.76.0) + rubocop (0.78.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) @@ -376,11 +392,12 @@ GEM unicode-display_width (>= 1.4.0, < 1.7) rubocop-performance (1.5.1) rubocop (>= 0.71.0) - rubocop-rails (2.3.2) + rubocop-rails (2.4.0) 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) sanitize (5.1.0) crass (~> 1.0.2) @@ -395,6 +412,9 @@ GEM sprockets-rails tilt secure_headers (6.1.1) + selenium-webdriver (3.142.6) + childprocess (>= 0.5, < 4.0) + rubyzip (>= 1.2.2) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -408,11 +428,11 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - strong_migrations (0.4.2) + strong_migrations (0.5.1) activerecord (>= 5) 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.22.2) @@ -433,6 +453,7 @@ GEM websocket-extensions (0.1.4) xpath (3.2.0) nokogiri (~> 1.8) + zeitwerk (2.2.2) PLATFORMS ruby @@ -440,22 +461,23 @@ PLATFORMS DEPENDENCIES SystemTimer (>= 1.1.3) aasm + 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 @@ -491,17 +513,16 @@ DEPENDENCIES omniauth-mediawiki (>= 0.0.4) omniauth-openid omniauth-windowslive - openstreetmap-actionpack-page_caching (>= 1.1.2) 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.2.1) rails-controller-testing rails-i18n (~> 4.0.0) rinku (>= 2.0.6) @@ -512,6 +533,7 @@ DEPENDENCIES sanitize sassc-rails secure_headers + selenium-webdriver strong_migrations uglifier (>= 1.3.0) validates_email_format_of (>= 1.5.1)