X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2b8d2bcb9f66e881b1b820908d6c017bf86d7608..62ecf15975f4285ce7b68383860168b221cb594f:/Gemfile.lock?ds=inline diff --git a/Gemfile.lock b/Gemfile.lock index a84b9a497..2fb65a668 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,98 +1,102 @@ GEM remote: https://rubygems.org/ specs: - aasm (5.1.1) + aasm (5.2.0) concurrent-ruby (~> 1.0) - actioncable (6.0.3.4) - actionpack (= 6.0.3.4) + actioncable (6.1.4) + actionpack (= 6.1.4) + activesupport (= 6.1.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - 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) + actionmailbox (6.1.4) + actionpack (= 6.1.4) + activejob (= 6.1.4) + activerecord (= 6.1.4) + activestorage (= 6.1.4) + activesupport (= 6.1.4) mail (>= 2.7.1) - actionmailer (6.0.3.4) - actionpack (= 6.0.3.4) - actionview (= 6.0.3.4) - activejob (= 6.0.3.4) + actionmailer (6.1.4) + actionpack (= 6.1.4) + actionview (= 6.1.4) + activejob (= 6.1.4) + activesupport (= 6.1.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.4) - actionview (= 6.0.3.4) - activesupport (= 6.0.3.4) - rack (~> 2.0, >= 2.0.8) + actionpack (6.1.4) + actionview (= 6.1.4) + activesupport (= 6.1.4) + rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionpack-page_caching (1.2.3) - actionpack (>= 5.0.0) - 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) + actionpack-page_caching (1.2.4) + actionpack (>= 4.0.0) + actiontext (6.1.4) + actionpack (= 6.1.4) + activerecord (= 6.1.4) + activestorage (= 6.1.4) + activesupport (= 6.1.4) nokogiri (>= 1.8.5) - actionview (6.0.3.4) - activesupport (= 6.0.3.4) + actionview (6.1.4) + activesupport (= 6.1.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.4) - activesupport (= 6.0.3.4) + activejob (6.1.4) + activesupport (= 6.1.4) globalid (>= 0.3.6) - 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) + activemodel (6.1.4) + activesupport (= 6.1.4) + activerecord (6.1.4) + activemodel (= 6.1.4) + activesupport (= 6.1.4) + activerecord-import (1.2.0) activerecord (>= 3.2) - 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.4) + activestorage (6.1.4) + actionpack (= 6.1.4) + activejob (= 6.1.4) + activerecord (= 6.1.4) + activesupport (= 6.1.4) + marcel (~> 1.0.0) + mini_mime (>= 1.1.0) + activesupport (6.1.4) 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) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) annotate (3.1.1) activerecord (>= 3.2, < 7.0) rake (>= 10.4, < 14.0) ast (2.4.2) - autoprefixer-rails (10.2.0.0) - execjs - aws-eventstream (1.1.0) - aws-partitions (1.419.0) - aws-sdk-core (3.111.2) + autoprefixer-rails (10.3.1.0) + execjs (~> 2) + aws-eventstream (1.1.1) + aws-partitions (1.484.0) + aws-sdk-core (3.119.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.41.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-kms (1.46.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.87.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-s3 (1.98.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.2) + aws-sigv4 (1.2.4) aws-eventstream (~> 1, >= 1.0.2) better_errors (2.9.1) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) - better_html (1.0.15) + better_html (1.0.16) actionview (>= 4.0) activesupport (>= 4.0) ast (~> 2.0) @@ -102,7 +106,7 @@ GEM smart_properties binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bootsnap (1.5.1) + bootsnap (1.7.7) msgpack (~> 1.0) bootstrap (4.5.3) autoprefixer-rails (>= 9.1.0) @@ -111,15 +115,15 @@ GEM bootstrap_form (4.5.0) actionpack (>= 5.2) activemodel (>= 5.2) - brakeman (4.10.1) - browser (5.3.0) + brakeman (5.1.1) + browser (5.3.1) builder (3.2.4) - bzip2-ffi (1.0.0) + bzip2-ffi (1.1.0) ffi (~> 1.0) - cancancan (3.2.1) + cancancan (3.3.0) canonical-rails (0.2.11) rails (>= 4.1, < 6.2) - capybara (3.35.1) + capybara (3.35.3) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -129,46 +133,50 @@ GEM xpath (~> 3.2) childprocess (3.0.0) coderay (1.1.3) - composite_primary_keys (12.0.6) - activerecord (~> 6.0.0) - concurrent-ruby (1.1.8) - config (2.2.3) + composite_primary_keys (13.0.0) + activerecord (~> 6.1.0) + concurrent-ruby (1.1.9) + config (3.1.0) deep_merge (~> 1.2, >= 1.2.1) dry-validation (~> 1.0, >= 1.0.0) crack (0.4.5) rexml crass (1.0.6) dalli (2.7.11) - debug_inspector (0.0.3) + debug_inspector (1.1.0) deep_merge (1.2.1) delayed_job (4.1.9) activesupport (>= 3.0, < 6.2) - delayed_job_active_record (4.1.5) + delayed_job_active_record (4.1.6) activerecord (>= 3.0, < 6.2) delayed_job (>= 3.0, < 5) - docile (1.3.5) - dry-configurable (0.12.0) + docile (1.4.0) + doorkeeper (5.5.2) + railties (>= 5) + doorkeeper-i18n (5.2.2) + doorkeeper (>= 5.2) + dry-configurable (0.12.1) concurrent-ruby (~> 1.0) dry-core (~> 0.5, >= 0.5.0) - dry-container (0.7.2) + dry-container (0.8.0) concurrent-ruby (~> 1.0) dry-configurable (~> 0.1, >= 0.1.3) - dry-core (0.5.0) + dry-core (0.7.1) concurrent-ruby (~> 1.0) dry-equalizer (0.3.0) - dry-inflector (0.2.0) + dry-inflector (0.2.1) dry-initializer (3.0.4) - dry-logic (1.1.0) + dry-logic (1.2.0) concurrent-ruby (~> 1.0) dry-core (~> 0.5, >= 0.5) - dry-schema (1.6.0) + dry-schema (1.7.0) concurrent-ruby (~> 1.0) dry-configurable (~> 0.8, >= 0.8.3) dry-core (~> 0.5, >= 0.5) dry-initializer (~> 3.0) dry-logic (~> 1.0) dry-types (~> 1.5) - dry-types (1.5.0) + dry-types (1.5.1) concurrent-ruby (~> 1.0) dry-container (~> 0.3) dry-core (~> 0.5, >= 0.5) @@ -181,8 +189,7 @@ GEM dry-equalizer (~> 0.2) dry-initializer (~> 3.0) dry-schema (~> 1.5, >= 1.5.2) - dynamic_form (1.1.4) - erb_lint (0.0.37) + erb_lint (0.1.1) activesupport better_html (~> 1.0.7) html_tokenizer @@ -191,36 +198,50 @@ GEM rubocop smart_properties erubi (1.10.0) - execjs (2.7.0) + execjs (2.8.1) exifr (1.3.9) - factory_bot (6.1.0) + factory_bot (6.2.0) activesupport (>= 5.0.0) - factory_bot_rails (6.1.0) - factory_bot (~> 6.1.0) + factory_bot_rails (6.2.0) + factory_bot (~> 6.2.0) railties (>= 5.0.0) - faraday (1.3.0) + faraday (1.7.0) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0.1) faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) multipart-post (>= 1.2, < 3) - ruby2_keywords + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) faraday-net_http (1.0.1) - ffi (1.14.2) - ffi-libarchive (1.0.4) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + ffi (1.15.3) + ffi-libarchive (1.0.17) 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.5.2) + activesupport (>= 5.0) hashdiff (1.0.1) hashie (4.1.0) html_tokenizer (0.0.7) htmlentities (4.3.4) http_accept_language (2.1.1) - i18n (1.8.7) + i18n (1.8.10) concurrent-ruby (~> 1.0) - i18n-js (3.8.0) + i18n-js (3.9.0) i18n (>= 0.6.6) - image_optim (0.28.0) + image_optim (0.30.0) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) image_size (>= 1.5, < 3) @@ -230,9 +251,12 @@ GEM image_optim (~> 0.24) rails sprockets - image_size (2.1.0) + image_processing (1.12.1) + mini_magick (>= 4.9.5, < 5) + ruby-vips (>= 2.0.17, < 3) + image_size (2.1.1) in_threads (1.5.4) - jbuilder (2.11.1) + jbuilder (2.11.2) activesupport (>= 5.0.0) jmespath (1.4.0) jquery-rails (4.4.0) @@ -240,90 +264,90 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (2.5.1) - jwt (2.2.2) - kgio (2.11.3) - kramdown (2.3.0) + jwt (2.2.3) + kgio (2.11.4) + kramdown (2.3.1) rexml libxml-ruby (3.2.1) - listen (3.4.1) + listen (3.6.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) logstasher (2.1.5) activesupport (>= 5.2) request_store - loofah (2.9.0) + loofah (2.11.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) + marcel (1.0.1) maxminddb (0.1.22) method_source (1.0.0) - mimemagic (0.3.5) mini_magick (4.11.0) - mini_mime (1.0.2) - mini_portile2 (2.5.0) - minitest (5.14.3) - msgpack (1.3.3) + mini_mime (1.1.0) + mini_portile2 (2.6.1) + minitest (5.14.4) + msgpack (1.4.2) multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) - nio4r (2.5.4) - nokogiri (1.11.1) - mini_portile2 (~> 2.5.0) + nio4r (2.5.8) + nokogiri (1.12.2) + mini_portile2 (~> 2.6.1) racc (~> 1.4) - nokogumbo (2.0.4) - nokogiri (~> 1.8, >= 1.8.4) oauth (0.4.7) oauth-plugin (0.5.1) multi_json oauth (~> 0.4.4) oauth2 (>= 0.5.0) rack - oauth2 (1.4.4) + oauth2 (1.4.7) 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.1) + omniauth (2.0.4) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) + rack-protection omniauth-facebook (8.0.0) omniauth-oauth2 (~> 1.2) - omniauth-github (1.4.0) - omniauth (~> 1.5) - omniauth-oauth2 (>= 1.4.0, < 2.0) - omniauth-google-oauth2 (0.8.1) + omniauth-github (2.0.0) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.7.1) + omniauth-google-oauth2 (1.0.0) jwt (>= 2.0) oauth2 (~> 1.1) - omniauth (>= 1.1.1) - omniauth-oauth2 (>= 1.6) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.7.1) omniauth-mediawiki (0.0.4) jwt (~> 2.0) omniauth-oauth (~> 1.0) - omniauth-oauth (1.1.0) + omniauth-oauth (1.2.0) oauth - omniauth (~> 1.0) + omniauth (>= 1.0, < 3) omniauth-oauth2 (1.7.1) oauth2 (~> 1.4) omniauth (>= 1.9, < 3) omniauth-openid (2.0.1) omniauth (>= 1.0, < 3.0) rack-openid (~> 1.4.0) + omniauth-rails_csrf_protection (1.0.0) + actionpack (>= 4.2) + omniauth (~> 2.0) omniauth-windowslive (0.0.12) multi_json (~> 1.12) omniauth-oauth2 (~> 1.4) - openstreetmap-deadlock_retry (1.3.0) + openstreetmap-deadlock_retry (1.3.1) parallel (1.20.1) - parser (3.0.0.0) + parser (3.0.2.0) ast (~> 2.4.1) pg (1.2.3) popper_js (1.16.0) - progress (3.5.2) + progress (3.6.0) public_suffix (4.0.6) - puma (5.1.1) + puma (5.4.0) nio4r (~> 2.0) quad_tile (1.0.1) r2 (0.2.7) @@ -334,23 +358,25 @@ GEM rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) + rack-protection (2.1.0) + rack rack-test (1.1.0) rack (>= 1.0, < 3) rack-uri_sanitizer (0.0.2) - 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.4) + rails (6.1.4) + actioncable (= 6.1.4) + actionmailbox (= 6.1.4) + actionmailer (= 6.1.4) + actionpack (= 6.1.4) + actiontext (= 6.1.4) + actionview (= 6.1.4) + activejob (= 6.1.4) + activemodel (= 6.1.4) + activerecord (= 6.1.4) + activestorage (= 6.1.4) + activesupport (= 6.1.4) + bundler (>= 1.15.0) + railties (= 6.1.4) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -364,51 +390,54 @@ GEM 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) + railties (6.1.4) + actionpack (= 6.1.4) + activesupport (= 6.1.4) method_source - rake (>= 0.8.7) - thor (>= 0.20.3, < 2.0) + rake (>= 0.13) + thor (~> 1.0) rainbow (3.0.0) - rake (13.0.3) - rb-fsevent (0.10.4) + rake (13.0.6) + rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) - regexp_parser (2.0.3) + regexp_parser (2.1.1) request_store (1.5.0) rack (>= 1.4) - rexml (3.2.4) + rexml (3.2.5) rinku (2.0.6) rotp (6.2.0) - rubocop (1.8.1) + rubocop (1.18.4) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.2.0, < 2.0) + rubocop-ast (>= 1.8.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.4.1) - parser (>= 2.7.1.5) - rubocop-minitest (0.10.3) - rubocop (>= 0.87, < 2.0) - rubocop-performance (1.9.2) - rubocop (>= 0.90.0, < 2.0) + rubocop-ast (1.9.0) + parser (>= 3.0.1.1) + rubocop-minitest (0.15.0) + rubocop (>= 0.90, < 2.0) + rubocop-performance (1.11.4) + rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.9.1) + rubocop-rails (2.11.3) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.90.0, < 2.0) + rubocop (>= 1.7.0, < 2.0) + rubocop-rake (0.6.0) + rubocop (~> 1.0) ruby-openid (2.9.2) ruby-progressbar (1.11.0) - ruby2_keywords (0.0.4) - rubyzip (2.3.0) - sanitize (5.2.3) + ruby-vips (2.1.2) + ffi (~> 1.12) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) + sanitize (6.0.0) crass (~> 1.0.2) - nokogiri (>= 1.8.0) - nokogumbo (~> 2.0) + nokogiri (>= 1.12.0) sassc (2.4.0) ffi (~> 1.9) sassc-rails (2.1.2) @@ -417,7 +446,7 @@ GEM sprockets (> 3.0) sprockets-rails tilt - secure_headers (6.3.1) + secure_headers (6.3.2) selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) @@ -427,7 +456,7 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov-lcov (0.8.0) - simplecov_json_formatter (0.1.2) + simplecov_json_formatter (0.1.3) smart_properties (1.15.0) sprockets (4.0.2) concurrent-ruby (~> 1.0) @@ -436,24 +465,23 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - strong_migrations (0.7.6) + strong_migrations (0.7.8) activerecord (>= 5) + terser (1.1.5) + execjs (>= 0.3.0, < 3) thor (1.1.0) - thread_safe (0.3.6) tilt (2.0.10) - tzinfo (1.2.9) - thread_safe (~> 0.1) - uglifier (4.2.0) - execjs (>= 0.3.0, < 3) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) unicode-display_width (2.0.0) validates_email_format_of (1.6.3) i18n vendorer (0.2.0) - webmock (3.11.1) - addressable (>= 2.3.6) + webmock (3.14.0) + addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - websocket-driver (0.7.3) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) @@ -482,12 +510,13 @@ DEPENDENCIES cancancan canonical-rails capybara (>= 2.15) - composite_primary_keys (~> 12.0.0) + composite_primary_keys (~> 13.0.0) config dalli - debug_inspector (< 1.0.0) + debug_inspector delayed_job_active_record - dynamic_form + doorkeeper + doorkeeper-i18n erb_lint factory_bot_rails faraday @@ -497,6 +526,7 @@ DEPENDENCIES http_accept_language (~> 2.1.1) i18n-js (>= 3.0.0) image_optim_rails + image_processing jbuilder (~> 2.7) jquery-rails json @@ -505,26 +535,26 @@ DEPENDENCIES libxml-ruby (>= 2.0.5) listen logstasher + marcel maxminddb - mimemagic - mini_magick minitest (~> 5.1) oauth-plugin (>= 0.5.1) - omniauth + omniauth (~> 2.0.2) omniauth-facebook omniauth-github omniauth-google-oauth2 (>= 0.6.0) omniauth-mediawiki (>= 0.0.4) omniauth-openid + omniauth-rails_csrf_protection (~> 1.0) omniauth-windowslive - openstreetmap-deadlock_retry (>= 1.3.0) + openstreetmap-deadlock_retry (>= 1.3.1) pg - puma (~> 5.0) + puma (~> 5.3) quad_tile (~> 1.0.1) r2 (~> 0.2.7) rack-cors rack-uri_sanitizer - rails (= 6.0.3.4) + rails (= 6.1.4) rails-controller-testing rails-i18n (~> 6.0.0) rinku (>= 2.0.6) @@ -533,6 +563,7 @@ DEPENDENCIES rubocop-minitest rubocop-performance rubocop-rails + rubocop-rake sanitize sassc-rails secure_headers @@ -540,10 +571,10 @@ DEPENDENCIES simplecov simplecov-lcov strong_migrations - uglifier (>= 1.3.0) + terser validates_email_format_of (>= 1.5.1) vendorer webmock BUNDLED WITH - 2.1.4 + 2.2.16