X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/29aac6e14964d612ee6a06998ae61bc8923f5946..1cea9f6e41043d300a215a17179dee33ec30c05a:/Gemfile.lock?ds=sidebyside diff --git a/Gemfile.lock b/Gemfile.lock index 43a488aec..f4403e7a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) - aasm (5.0.6) + aasm (5.0.8) concurrent-ruby (~> 1.0) actioncable (6.0.2.1) actionpack (= 6.0.2.1) @@ -67,29 +67,29 @@ GEM zeitwerk (~> 2.2) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - annotate (3.0.3) + annotate (3.1.0) activerecord (>= 3.2, < 7.0) rake (>= 10.4, < 14.0) ast (2.4.0) - autoprefixer-rails (9.7.3) + autoprefixer-rails (9.7.4) execjs aws-eventstream (1.0.3) - aws-partitions (1.260.0) - aws-sdk-core (3.86.0) + aws-partitions (1.281.0) + aws-sdk-core (3.91.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-kms (1.30.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.60.1) + aws-sdk-s3 (1.61.0) aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sigv4 (1.1.0) + aws-sigv4 (1.1.1) aws-eventstream (~> 1.0, >= 1.0.2) - better_errors (2.5.1) + better_errors (2.6.0) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) @@ -104,20 +104,20 @@ 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) bootstrap (4.3.1) autoprefixer-rails (>= 9.1.0) popper_js (>= 1.14.3, < 2) sassc-rails (>= 2.0.0) - browser (2.7.1) + browser (4.0.0) builder (3.2.4) bzip2-ffi (1.0.0) ffi (~> 1.0) - cancancan (3.0.1) + cancancan (3.0.2) canonical-rails (0.2.6) rails (>= 4.1, < 6.1) - capybara (3.30.0) + capybara (3.31.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -130,11 +130,10 @@ GEM coderay (1.1.2) composite_primary_keys (12.0.1) activerecord (~> 6.0.0) - concurrent-ruby (1.1.5) - config (2.0.0) - activesupport (>= 4.2) + 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) @@ -143,7 +142,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) @@ -153,9 +152,10 @@ GEM activerecord (>= 3.0, < 6.1) delayed_job (>= 3.0, < 5) docile (1.3.2) - dry-configurable (0.9.0) + dry-configurable (0.11.3) 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) @@ -163,26 +163,33 @@ GEM concurrent-ruby (~> 1.0) dry-equalizer (0.3.0) dry-inflector (0.2.0) - dry-initializer (3.0.2) - dry-logic (1.0.5) + 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.2) + dry-schema (1.5.0) 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) + 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.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) activesupport @@ -199,26 +206,25 @@ GEM factory_bot_rails (5.1.1) factory_bot (~> 5.1.0) railties (>= 4.2.0) - fakefs (0.20.1) - faraday (0.17.1) + fakefs (1.0.0) + faraday (1.0.0) multipart-post (>= 1.2, < 3) - ffi (1.11.3) + 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.5.1) + i18n-js (3.6.0) i18n (>= 0.6.6) image_optim (0.26.5) exifr (~> 1.2, >= 1.2.2) @@ -233,8 +239,8 @@ GEM image_size (2.0.2) in_threads (1.5.4) jaro_winkler (1.5.4) - jbuilder (2.9.1) - activesupport (>= 4.2.0) + jbuilder (2.10.0) + activesupport (>= 5.0.0) jmespath (1.4.0) jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) @@ -242,7 +248,7 @@ GEM thor (>= 0.14, < 2.0) json (2.3.0) jwt (2.2.1) - kgio (2.11.2) + kgio (2.11.3) kramdown (2.1.0) libxml-ruby (3.1.0) listen (3.2.1) @@ -260,18 +266,19 @@ GEM mini_mime (>= 0.1.1) marcel (0.3.3) mimemagic (~> 0.3.2) + maxminddb (0.1.22) method_source (0.9.2) - mimemagic (0.3.3) - mini_magick (4.9.5) + mimemagic (0.3.4) + mini_magick (4.10.1) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.13.0) - msgpack (1.3.1) + minitest (5.14.0) + 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.7) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) nokogumbo (2.0.2) nokogiri (~> 1.8, >= 1.8.4) @@ -281,18 +288,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) @@ -316,22 +323,22 @@ GEM omniauth-oauth2 (~> 1.4) openstreetmap-deadlock_retry (1.3.0) parallel (1.19.1) - parser (2.7.0.0) + parser (2.7.0.4) ast (~> 2.4.0) - pg (1.2.0) + pg (1.2.2) poltergeist (1.18.1) capybara (>= 2.1, < 4) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) - popper_js (1.14.5) + popper_js (1.16.0) progress (3.5.2) psych (3.1.0) - public_suffix (4.0.2) - puma (3.12.2) + public_suffix (4.0.3) + puma (3.12.4) quad_tile (1.0.1) r2 (0.2.7) - rack (2.0.8) - rack-cors (1.1.0) + rack (2.2.2) + rack-cors (1.1.1) rack (>= 2.0.0) rack-openid (1.3.1) rack (>= 1.1.0) @@ -377,27 +384,29 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.1) ffi (~> 1.0) - regexp_parser (1.6.0) + 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.78.0) + rubocop (0.80.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.6) + parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) + rexml ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) rubocop-performance (1.5.2) rubocop (>= 0.71.0) - rubocop-rails (2.4.1) + rubocop-rails (2.4.2) rack (>= 1.1) rubocop (>= 0.72.0) ruby-openid (2.9.2) ruby-progressbar (1.10.1) - rubyzip (2.0.0) + rubyzip (2.2.0) safe_yaml (1.0.5) sanitize (5.1.0) crass (~> 1.0.2) @@ -411,7 +420,7 @@ 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) @@ -428,23 +437,25 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - strong_migrations (0.5.1) + strong_migrations (0.6.2) activerecord (>= 5) + sync (0.5.0) term-ansicolor (1.7.1) tins (~> 1.0) thor (1.0.1) thread_safe (0.3.6) tilt (2.0.10) - tins (1.22.2) + tins (1.24.1) + sync tzinfo (1.2.6) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (1.6.0) + unicode-display_width (1.6.1) 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) @@ -453,7 +464,7 @@ GEM websocket-extensions (0.1.4) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.2.2) + zeitwerk (2.3.0) PLATFORMS ruby @@ -489,7 +500,6 @@ DEPENDENCIES faraday ffi-libarchive gd2-ffij (>= 0.4.0) - geoip htmlentities http_accept_language (~> 2.0.0) i18n-js (>= 3.0.0) @@ -502,6 +512,7 @@ DEPENDENCIES libxml-ruby (>= 2.0.5) listen logstasher + maxminddb mimemagic mini_magick minitest (~> 5.1)