X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8b588ee1f9eef3ee1ae7deddf05a3914185c8d5c..c8e21c409c9bec446f0caa2526d5b07861bb3299:/Gemfile.lock?ds=inline diff --git a/Gemfile.lock b/Gemfile.lock index 71edffcd0..ec67d9b9c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,64 +2,64 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) - aasm (5.0.8) + aasm (5.1.1) concurrent-ruby (~> 1.0) - actioncable (6.0.3) - actionpack (= 6.0.3) + actioncable (6.0.3.4) + actionpack (= 6.0.3.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3) - actionpack (= 6.0.3) - activejob (= 6.0.3) - activerecord (= 6.0.3) - activestorage (= 6.0.3) - activesupport (= 6.0.3) + actionmailbox (6.0.3.4) + actionpack (= 6.0.3.4) + activejob (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) mail (>= 2.7.1) - actionmailer (6.0.3) - actionpack (= 6.0.3) - actionview (= 6.0.3) - activejob (= 6.0.3) + actionmailer (6.0.3.4) + actionpack (= 6.0.3.4) + actionview (= 6.0.3.4) + activejob (= 6.0.3.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3) - actionview (= 6.0.3) - activesupport (= 6.0.3) + actionpack (6.0.3.4) + actionview (= 6.0.3.4) + activesupport (= 6.0.3.4) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionpack-page_caching (1.2.2) + actionpack-page_caching (1.2.3) actionpack (>= 5.0.0) - actiontext (6.0.3) - actionpack (= 6.0.3) - activerecord (= 6.0.3) - activestorage (= 6.0.3) - activesupport (= 6.0.3) + actiontext (6.0.3.4) + actionpack (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) nokogiri (>= 1.8.5) - actionview (6.0.3) - activesupport (= 6.0.3) + actionview (6.0.3.4) + activesupport (= 6.0.3.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) active_record_union (1.3.0) activerecord (>= 4.0) - activejob (6.0.3) - activesupport (= 6.0.3) + activejob (6.0.3.4) + activesupport (= 6.0.3.4) globalid (>= 0.3.6) - activemodel (6.0.3) - activesupport (= 6.0.3) - activerecord (6.0.3) - activemodel (= 6.0.3) - activesupport (= 6.0.3) - activerecord-import (1.0.4) + activemodel (6.0.3.4) + activesupport (= 6.0.3.4) + activerecord (6.0.3.4) + activemodel (= 6.0.3.4) + activesupport (= 6.0.3.4) + activerecord-import (1.0.7) activerecord (>= 3.2) - activestorage (6.0.3) - actionpack (= 6.0.3) - activejob (= 6.0.3) - activerecord (= 6.0.3) + activestorage (6.0.3.4) + actionpack (= 6.0.3.4) + activejob (= 6.0.3.4) + activerecord (= 6.0.3.4) marcel (~> 0.3.1) - activesupport (6.0.3) + activesupport (6.0.3.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -70,30 +70,30 @@ GEM annotate (3.1.1) activerecord (>= 3.2, < 7.0) rake (>= 10.4, < 14.0) - ast (2.4.0) - autoprefixer-rails (9.7.6) + ast (2.4.1) + autoprefixer-rails (10.0.1.0) execjs aws-eventstream (1.1.0) - aws-partitions (1.310.0) - aws-sdk-core (3.94.1) + aws-partitions (1.383.0) + aws-sdk-core (3.109.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.30.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-kms (1.39.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.63.1) - aws-sdk-core (~> 3, >= 3.83.0) + aws-sdk-s3 (1.83.1) + aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sigv4 (1.1.3) - aws-eventstream (~> 1.0, >= 1.0.2) - better_errors (2.7.0) + aws-sigv4 (1.2.2) + aws-eventstream (~> 1, >= 1.0.2) + better_errors (2.8.3) 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) @@ -104,20 +104,24 @@ GEM bigdecimal (1.1.0) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bootsnap (1.4.6) + bootsnap (1.4.9) msgpack (~> 1.0) - bootstrap (4.3.1) + bootstrap (4.5.2) autoprefixer-rails (>= 9.1.0) popper_js (>= 1.14.3, < 2) sassc-rails (>= 2.0.0) - browser (4.0.0) + bootstrap_form (4.5.0) + actionpack (>= 5.2) + activemodel (>= 5.2) + brakeman (4.10.0) + browser (5.1.0) builder (3.2.4) bzip2-ffi (1.0.0) ffi (~> 1.0) cancancan (3.1.0) - canonical-rails (0.2.8) + canonical-rails (0.2.9) rails (>= 4.1, < 6.1) - capybara (3.32.1) + capybara (3.33.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -126,10 +130,10 @@ GEM regexp_parser (~> 1.5) xpath (~> 3.2) childprocess (3.0.0) - coderay (1.1.2) - composite_primary_keys (12.0.1) + coderay (1.1.3) + composite_primary_keys (12.0.2) activerecord (~> 6.0.0) - concurrent-ruby (1.1.6) + concurrent-ruby (1.1.7) config (2.2.1) deep_merge (~> 1.2, >= 1.2.1) dry-validation (~> 1.0, >= 1.0.0) @@ -139,10 +143,9 @@ GEM term-ansicolor (~> 1.3) thor (>= 0.19.4, < 2.0) tins (~> 1.6) - crack (0.4.3) - safe_yaml (~> 1.0.0) + crack (0.4.4) crass (1.0.6) - dalli (2.7.10) + dalli (2.7.11) debug_inspector (0.0.3) deep_merge (1.2.1) delayed_job (4.1.8) @@ -151,7 +154,7 @@ GEM activerecord (>= 3.0, < 6.1) delayed_job (>= 3.0, < 5) docile (1.3.2) - dry-configurable (0.11.5) + dry-configurable (0.11.6) concurrent-ruby (~> 1.0) dry-core (~> 0.4, >= 0.4.7) dry-equalizer (~> 0.2) @@ -162,12 +165,12 @@ GEM concurrent-ruby (~> 1.0) dry-equalizer (0.3.0) dry-inflector (0.2.0) - dry-initializer (3.0.3) - dry-logic (1.0.6) + dry-initializer (3.0.4) + dry-logic (1.0.8) concurrent-ruby (~> 1.0) dry-core (~> 0.2) dry-equalizer (~> 0.2) - dry-schema (1.5.0) + dry-schema (1.5.4) concurrent-ruby (~> 1.0) dry-configurable (~> 0.8, >= 0.8.3) dry-core (~> 0.4) @@ -182,33 +185,35 @@ GEM dry-equalizer (~> 0.3) dry-inflector (~> 0.1, >= 0.1.2) dry-logic (~> 1.0, >= 1.0.2) - dry-validation (1.5.0) + dry-validation (1.5.6) 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) + dry-schema (~> 1.5, >= 1.5.2) dynamic_form (1.1.4) - erb_lint (0.0.32) + erb_lint (0.0.35) activesupport better_html (~> 1.0.7) html_tokenizer + parser (>= 2.7.1.4) rainbow rubocop (~> 0.79) smart_properties erubi (1.9.0) execjs (2.7.0) - exifr (1.3.6) - factory_bot (5.2.0) - activesupport (>= 4.2.0) - factory_bot_rails (5.2.0) - factory_bot (~> 5.2.0) - railties (>= 4.2.0) - faraday (1.0.1) + exifr (1.3.8) + factory_bot (6.1.0) + activesupport (>= 5.0.0) + factory_bot_rails (6.1.0) + factory_bot (~> 6.1.0) + railties (>= 5.0.0) + faraday (1.1.0) multipart-post (>= 1.2, < 3) - ffi (1.12.2) - ffi-libarchive (1.0.0) + ruby2_keywords + ffi (1.13.1) + ffi-libarchive (1.0.4) ffi (~> 1.0) fspath (3.1.2) gd2-ffij (0.4.0) @@ -219,12 +224,12 @@ GEM hashie (4.1.0) html_tokenizer (0.0.7) htmlentities (4.3.4) - http_accept_language (2.0.5) - i18n (0.9.5) + http_accept_language (2.1.1) + i18n (1.8.5) concurrent-ruby (~> 1.0) - i18n-js (3.6.0) + i18n-js (3.8.0) i18n (>= 0.6.6) - image_optim (0.26.5) + image_optim (0.27.1) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) image_size (>= 1.5, < 3) @@ -234,22 +239,21 @@ GEM image_optim (~> 0.24) rails sprockets - image_size (2.0.2) + image_size (2.1.0) in_threads (1.5.4) - jaro_winkler (1.5.4) - jbuilder (2.10.0) + jbuilder (2.10.1) 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.3.0) - jwt (2.2.1) + json (2.3.1) + jwt (2.2.2) kgio (2.11.3) - kramdown (2.2.1) + kramdown (2.3.0) rexml - libxml-ruby (3.1.0) + libxml-ruby (3.2.0) listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -258,7 +262,7 @@ GEM activesupport (>= 4.0) logstash-event (~> 1.2.0) request_store - loofah (2.5.0) + loofah (2.7.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -271,13 +275,13 @@ GEM mini_magick (4.10.1) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.14.0) + minitest (5.14.2) msgpack (1.3.3) - multi_json (1.14.1) + multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) - nio4r (2.5.2) - nokogiri (1.10.9) + nio4r (2.5.4) + nokogiri (1.10.10) mini_portile2 (~> 2.4.0) nokogumbo (2.0.2) nokogiri (~> 1.8, >= 1.8.4) @@ -296,7 +300,7 @@ GEM omniauth (1.9.1) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) - omniauth-facebook (6.0.0) + omniauth-facebook (8.0.0) omniauth-oauth2 (~> 1.2) omniauth-github (1.4.0) omniauth (~> 1.5) @@ -311,8 +315,8 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.6.0) - oauth2 (~> 1.1) + omniauth-oauth2 (1.7.0) + oauth2 (~> 1.4) omniauth (~> 1.9) omniauth-openid (1.0.1) omniauth (~> 1.0) @@ -321,18 +325,19 @@ GEM multi_json (~> 1.12) omniauth-oauth2 (~> 1.4) openstreetmap-deadlock_retry (1.3.0) - parallel (1.19.1) - parser (2.7.1.2) - ast (~> 2.4.0) + parallel (1.19.2) + parser (2.7.2.0) + ast (~> 2.4.1) pg (1.2.3) popper_js (1.16.0) progress (3.5.2) - psych (3.1.0) - public_suffix (4.0.4) - puma (3.12.4) + psych (3.2.0) + public_suffix (4.0.6) + puma (5.0.4) + nio4r (~> 2.0) quad_tile (1.0.1) r2 (0.2.7) - rack (2.2.2) + rack (2.2.3) rack-cors (1.1.1) rack (>= 2.0.0) rack-openid (1.3.1) @@ -341,36 +346,36 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rack-uri_sanitizer (0.0.2) - rails (6.0.3) - actioncable (= 6.0.3) - actionmailbox (= 6.0.3) - actionmailer (= 6.0.3) - actionpack (= 6.0.3) - actiontext (= 6.0.3) - actionview (= 6.0.3) - activejob (= 6.0.3) - activemodel (= 6.0.3) - activerecord (= 6.0.3) - activestorage (= 6.0.3) - activesupport (= 6.0.3) + rails (6.0.3.4) + actioncable (= 6.0.3.4) + actionmailbox (= 6.0.3.4) + actionmailer (= 6.0.3.4) + actionpack (= 6.0.3.4) + actiontext (= 6.0.3.4) + actionview (= 6.0.3.4) + activejob (= 6.0.3.4) + activemodel (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) bundler (>= 1.3.0) - railties (= 6.0.3) + railties (= 6.0.3.4) 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-html-sanitizer (1.3.0) loofah (~> 2.3) - rails-i18n (4.0.2) - i18n (~> 0.6) - rails (>= 4.0) - railties (6.0.3) - actionpack (= 6.0.3) - activesupport (= 6.0.3) + rails-i18n (6.0.0) + i18n (>= 0.7, < 2) + railties (>= 6.0.0, < 7) + railties (6.0.3.4) + actionpack (= 6.0.3.4) + activesupport (= 6.0.3.4) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -379,38 +384,41 @@ GEM rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - regexp_parser (1.7.0) + regexp_parser (1.8.2) request_store (1.5.0) rack (>= 1.4) rexml (3.2.4) rinku (2.0.6) - rotp (6.0.0) - addressable (~> 2.7) - rubocop (0.82.0) - jaro_winkler (~> 1.5.1) + rotp (6.2.0) + rubocop (0.93.1) parallel (~> 1.10) - parser (>= 2.7.0.1) + parser (>= 2.7.1.5) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8) rexml + rubocop-ast (>= 0.6.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-minitest (0.9.0) - rubocop (>= 0.74) - rubocop-performance (1.5.2) - rubocop (>= 0.71.0) - rubocop-rails (2.5.2) - activesupport + rubocop-ast (0.8.0) + parser (>= 2.7.1.5) + rubocop-minitest (0.10.1) + rubocop (>= 0.87) + rubocop-performance (1.8.1) + rubocop (>= 0.87.0) + rubocop-ast (>= 0.4.0) + rubocop-rails (2.8.1) + activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.72.0) + rubocop (>= 0.87.0) ruby-openid (2.9.2) ruby-progressbar (1.10.1) + ruby2_keywords (0.0.2) rubyzip (2.3.0) - safe_yaml (1.0.5) - sanitize (5.1.0) + sanitize (5.2.1) crass (~> 1.0.2) nokogiri (>= 1.8.0) nokogumbo (~> 2.0) - sassc (2.3.0) + sassc (2.4.0) ffi (~> 1.9) sassc-rails (2.1.2) railties (>= 4.0.0) @@ -418,7 +426,7 @@ GEM sprockets (> 3.0) sprockets-rails tilt - secure_headers (6.3.0) + secure_headers (6.3.1) selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) @@ -428,14 +436,14 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.2) smart_properties (1.15.0) - sprockets (4.0.0) + sprockets (4.0.2) 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) - strong_migrations (0.6.4) + strong_migrations (0.7.2) activerecord (>= 5) sync (0.5.0) term-ansicolor (1.7.1) @@ -443,7 +451,7 @@ GEM thor (1.0.1) thread_safe (0.3.6) tilt (2.0.10) - tins (1.24.1) + tins (1.25.0) sync tzinfo (1.2.7) thread_safe (~> 0.1) @@ -453,16 +461,16 @@ GEM validates_email_format_of (1.6.3) i18n vendorer (0.2.0) - webmock (3.8.3) + webmock (3.9.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.3) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.4) + websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.3.0) + zeitwerk (2.4.0) PLATFORMS ruby @@ -480,7 +488,9 @@ DEPENDENCIES bigdecimal (~> 1.1.0) binding_of_caller bootsnap (>= 1.4.2) - bootstrap (~> 4.3.1) + bootstrap (~> 4.5.0) + bootstrap_form (~> 4.0) + brakeman browser bzip2-ffi cancancan @@ -498,7 +508,7 @@ DEPENDENCIES ffi-libarchive gd2-ffij (>= 0.4.0) htmlentities - http_accept_language (~> 2.0.0) + http_accept_language (~> 2.1.1) i18n-js (>= 3.0.0) image_optim_rails jbuilder (~> 2.7) @@ -524,14 +534,14 @@ DEPENDENCIES openstreetmap-deadlock_retry (>= 1.3.0) pg psych - puma (~> 3.11) + puma (~> 5.0) quad_tile (~> 1.0.1) r2 (~> 0.2.7) rack-cors rack-uri_sanitizer - rails (= 6.0.3) + rails (= 6.0.3.4) rails-controller-testing - rails-i18n (~> 4.0.0) + rails-i18n (~> 6.0.0) rinku (>= 2.0.6) rotp rubocop @@ -549,4 +559,4 @@ DEPENDENCIES webmock BUNDLED WITH - 1.17.2 + 2.1.4