X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3bb90991ea9742e186f3e053ea0273f867b7f1a1..8c1d561b94b1b19d08286afac82409ac697ab31b:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index d832cf2ae..fb345ac72 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,65 +1,64 @@ GEM remote: https://rubygems.org/ specs: - SystemTimer (1.2.3) - aasm (5.1.1) + aasm (5.2.0) concurrent-ruby (~> 1.0) - actioncable (6.0.3.4) - actionpack (= 6.0.3.4) + actioncable (6.0.3.7) + actionpack (= 6.0.3.7) 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.0.3.7) + actionpack (= 6.0.3.7) + activejob (= 6.0.3.7) + activerecord (= 6.0.3.7) + activestorage (= 6.0.3.7) + activesupport (= 6.0.3.7) 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.0.3.7) + actionpack (= 6.0.3.7) + actionview (= 6.0.3.7) + activejob (= 6.0.3.7) 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) + actionpack (6.0.3.7) + actionview (= 6.0.3.7) + activesupport (= 6.0.3.7) 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.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) + actiontext (6.0.3.7) + actionpack (= 6.0.3.7) + activerecord (= 6.0.3.7) + activestorage (= 6.0.3.7) + activesupport (= 6.0.3.7) nokogiri (>= 1.8.5) - actionview (6.0.3.4) - activesupport (= 6.0.3.4) + actionview (6.0.3.7) + activesupport (= 6.0.3.7) 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.0.3.7) + activesupport (= 6.0.3.7) 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.0.3.7) + activesupport (= 6.0.3.7) + activerecord (6.0.3.7) + activemodel (= 6.0.3.7) + activesupport (= 6.0.3.7) + activerecord-import (1.0.8) 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.0.3.7) + actionpack (= 6.0.3.7) + activejob (= 6.0.3.7) + activerecord (= 6.0.3.7) + marcel (~> 1.0.0) + activesupport (6.0.3.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -70,30 +69,30 @@ GEM annotate (3.1.1) activerecord (>= 3.2, < 7.0) rake (>= 10.4, < 14.0) - ast (2.4.1) - autoprefixer-rails (10.0.1.3) + ast (2.4.2) + autoprefixer-rails (10.2.4.0) execjs - aws-eventstream (1.1.0) - aws-partitions (1.383.0) - aws-sdk-core (3.109.1) + aws-eventstream (1.1.1) + aws-partitions (1.452.0) + aws-sdk-core (3.114.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.39.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-kms (1.43.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.83.1) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-s3 (1.94.1) + aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.2) + aws-sigv4 (1.2.3) aws-eventstream (~> 1, >= 1.0.2) - better_errors (2.9.0) + 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) @@ -101,119 +100,114 @@ GEM html_tokenizer (~> 0.0.6) parser (>= 2.4) smart_properties - bigdecimal (1.1.0) - binding_of_caller (0.8.0) + binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bootsnap (1.5.0) + bootsnap (1.7.5) msgpack (~> 1.0) - bootstrap (4.5.2) + bootstrap (4.5.3) autoprefixer-rails (>= 9.1.0) popper_js (>= 1.14.3, < 2) sassc-rails (>= 2.0.0) bootstrap_form (4.5.0) actionpack (>= 5.2) activemodel (>= 5.2) - brakeman (4.10.0) - browser (5.1.0) + brakeman (5.0.1) + browser (5.3.1) builder (3.2.4) - bzip2-ffi (1.0.0) + bzip2-ffi (1.1.0) ffi (~> 1.0) - cancancan (3.1.0) - canonical-rails (0.2.9) - rails (>= 4.1, < 6.1) - capybara (3.33.0) + cancancan (3.2.1) + canonical-rails (0.2.11) + rails (>= 4.1, < 6.2) + capybara (3.35.3) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) rack (>= 1.6.0) rack-test (>= 0.6.3) - regexp_parser (~> 1.5) + regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) childprocess (3.0.0) coderay (1.1.3) - composite_primary_keys (12.0.2) + composite_primary_keys (12.0.10) activerecord (~> 6.0.0) - concurrent-ruby (1.1.7) - config (2.2.1) + concurrent-ruby (1.1.8) + config (3.1.0) deep_merge (~> 1.2, >= 1.2.1) dry-validation (~> 1.0, >= 1.0.0) - coveralls (0.8.23) - json (>= 1.8, < 3) - simplecov (~> 0.16.1) - term-ansicolor (~> 1.3) - thor (>= 0.19.4, < 2.0) - tins (~> 1.6) - crack (0.4.4) + 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.8) - activesupport (>= 3.0, < 6.1) - delayed_job_active_record (4.1.4) - activerecord (>= 3.0, < 6.1) + delayed_job (4.1.9) + activesupport (>= 3.0, < 6.2) + delayed_job_active_record (4.1.6) + activerecord (>= 3.0, < 6.2) delayed_job (>= 3.0, < 5) - docile (1.3.2) - dry-configurable (0.11.6) + docile (1.3.5) + dry-configurable (0.12.1) concurrent-ruby (~> 1.0) - dry-core (~> 0.4, >= 0.4.7) - dry-equalizer (~> 0.2) + dry-core (~> 0.5, >= 0.5.0) dry-container (0.7.2) concurrent-ruby (~> 1.0) dry-configurable (~> 0.1, >= 0.1.3) - dry-core (0.4.9) + dry-core (0.5.0) concurrent-ruby (~> 1.0) dry-equalizer (0.3.0) dry-inflector (0.2.0) dry-initializer (3.0.4) - dry-logic (1.0.8) + dry-logic (1.2.0) concurrent-ruby (~> 1.0) - dry-core (~> 0.2) - dry-equalizer (~> 0.2) - dry-schema (1.5.4) + dry-core (~> 0.5, >= 0.5) + dry-schema (1.6.2) concurrent-ruby (~> 1.0) dry-configurable (~> 0.8, >= 0.8.3) - dry-core (~> 0.4) - dry-equalizer (~> 0.2) + dry-core (~> 0.5, >= 0.5) dry-initializer (~> 3.0) dry-logic (~> 1.0) - dry-types (~> 1.4) - dry-types (1.4.0) + dry-types (~> 1.5) + dry-types (1.5.1) concurrent-ruby (~> 1.0) dry-container (~> 0.3) - dry-core (~> 0.4, >= 0.4.4) - dry-equalizer (~> 0.3) + dry-core (~> 0.5, >= 0.5) dry-inflector (~> 0.1, >= 0.1.2) dry-logic (~> 1.0, >= 1.0.2) - dry-validation (1.5.6) + dry-validation (1.6.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, >= 1.5.2) - dynamic_form (1.1.4) - erb_lint (0.0.35) + erb_lint (0.0.37) activesupport better_html (~> 1.0.7) html_tokenizer parser (>= 2.7.1.4) rainbow - rubocop (~> 0.79) + rubocop smart_properties - erubi (1.9.0) + erubi (1.10.0) execjs (2.7.0) - exifr (1.3.8) - factory_bot (6.1.0) + exifr (1.3.9) + 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.1.0) + faraday (1.4.1) + faraday-excon (~> 1.1) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) multipart-post (>= 1.2, < 3) - ruby2_keywords - ffi (1.13.1) - ffi-libarchive (1.0.4) + ruby2_keywords (>= 0.0.4) + faraday-excon (1.1.0) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.1.0) + ffi (1.15.0) + ffi-libarchive (1.0.17) ffi (~> 1.0) fspath (3.1.2) gd2-ffij (0.4.0) @@ -225,11 +219,11 @@ GEM html_tokenizer (0.0.7) htmlentities (4.3.4) http_accept_language (2.1.1) - i18n (1.8.5) + i18n (1.8.10) concurrent-ruby (~> 1.0) - i18n-js (3.8.0) + i18n-js (3.8.2) i18n (>= 0.6.6) - image_optim (0.27.1) + image_optim (0.29.0) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) image_size (>= 1.5, < 3) @@ -241,49 +235,46 @@ GEM sprockets image_size (2.1.0) in_threads (1.5.4) - jbuilder (2.10.1) + jbuilder (2.11.2) activesupport (>= 5.0.0) jmespath (1.4.0) jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.3.1) - jwt (2.2.2) + json (2.5.1) + jwt (2.2.3) kgio (2.11.3) - kramdown (2.3.0) + kramdown (2.3.1) rexml - libxml-ruby (3.2.0) - listen (3.2.1) + libxml-ruby (3.2.1) + listen (3.5.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - logstash-event (1.2.02) - logstasher (1.3.0) - activesupport (>= 4.0) - logstash-event (~> 1.2.0) + logstasher (2.1.5) + activesupport (>= 5.2) request_store - loofah (2.7.0) + loofah (2.9.1) 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.10.1) - mini_mime (1.0.2) - mini_portile2 (2.4.0) - minitest (5.14.2) - msgpack (1.3.3) + mini_magick (4.11.0) + mini_mime (1.1.0) + mini_portile2 (2.5.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.10.10) - mini_portile2 (~> 2.4.0) - nokogumbo (2.0.2) + nio4r (2.5.7) + nokogiri (1.11.3) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) + nokogumbo (2.0.5) nokogiri (~> 1.8, >= 1.8.4) oauth (0.4.7) oauth-plugin (0.5.1) @@ -291,75 +282,82 @@ GEM 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.0) + omniauth-github (2.0.0) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.7.1) + omniauth-google-oauth2 (1.0.0) jwt (>= 2.0) - omniauth (>= 1.1.1) - omniauth-oauth2 (>= 1.6) + oauth2 (~> 1.1) + 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-oauth2 (1.7.0) + omniauth (>= 1.0, < 3) + omniauth-oauth2 (1.7.1) oauth2 (~> 1.4) - omniauth (~> 1.9) - omniauth-openid (1.0.1) - omniauth (~> 1.0) - rack-openid (~> 1.3.1) + 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) - parallel (1.19.2) - parser (2.7.2.0) + openstreetmap-deadlock_retry (1.3.1) + parallel (1.20.1) + parser (3.0.1.1) ast (~> 2.4.1) pg (1.2.3) popper_js (1.16.0) - progress (3.5.2) - psych (3.2.0) + progress (3.6.0) public_suffix (4.0.6) - puma (5.0.4) + puma (5.3.0) nio4r (~> 2.0) quad_tile (1.0.1) r2 (0.2.7) + racc (1.5.2) rack (2.2.3) rack-cors (1.1.1) rack (>= 2.0.0) - rack-openid (1.3.1) + 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) + rails (6.0.3.7) + actioncable (= 6.0.3.7) + actionmailbox (= 6.0.3.7) + actionmailer (= 6.0.3.7) + actionpack (= 6.0.3.7) + actiontext (= 6.0.3.7) + actionview (= 6.0.3.7) + activejob (= 6.0.3.7) + activemodel (= 6.0.3.7) + activerecord (= 6.0.3.7) + activestorage (= 6.0.3.7) + activesupport (= 6.0.3.7) bundler (>= 1.3.0) - railties (= 6.0.3.4) + railties (= 6.0.3.7) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -373,48 +371,50 @@ 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.0.3.7) + actionpack (= 6.0.3.7) + activesupport (= 6.0.3.7) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rainbow (3.0.0) - rake (13.0.1) - rb-fsevent (0.10.4) + rake (13.0.3) + rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) - regexp_parser (1.8.2) + 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 (0.93.1) + rubocop (1.14.0) parallel (~> 1.10) - parser (>= 2.7.1.5) + parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8) + regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 0.6.0) + rubocop-ast (>= 1.5.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) - 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) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.5.0) + parser (>= 3.0.1.1) + rubocop-minitest (0.12.1) + rubocop (>= 0.90, < 2.0) + rubocop-performance (1.11.3) + rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.8.1) + rubocop-rails (2.10.1) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.87.0) + rubocop (>= 1.7.0, < 2.0) + rubocop-rake (0.5.1) + rubocop ruby-openid (2.9.2) - ruby-progressbar (1.10.1) - ruby2_keywords (0.0.2) + ruby-progressbar (1.11.0) + ruby2_keywords (0.0.4) rubyzip (2.3.0) - sanitize (5.2.1) + sanitize (5.2.3) crass (~> 1.0.2) nokogiri (>= 1.8.0) nokogumbo (~> 2.0) @@ -426,15 +426,17 @@ 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) - simplecov (0.16.1) + simplecov (0.21.2) docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov-lcov (0.8.0) + simplecov_json_formatter (0.1.3) smart_properties (1.15.0) sprockets (4.0.2) concurrent-ruby (~> 1.0) @@ -443,25 +445,20 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - strong_migrations (0.7.2) + strong_migrations (0.7.6) activerecord (>= 5) - sync (0.5.0) - term-ansicolor (1.7.1) - tins (~> 1.0) - thor (1.0.1) + thor (1.1.0) thread_safe (0.3.6) tilt (2.0.10) - tins (1.25.0) - sync - tzinfo (1.2.7) + tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (1.7.0) + unicode-display_width (2.0.0) validates_email_format_of (1.6.3) i18n vendorer (0.2.0) - webmock (3.9.4) + webmock (3.12.2) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -470,13 +467,12 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.4.0) + zeitwerk (2.4.2) PLATFORMS ruby DEPENDENCIES - SystemTimer (>= 1.1.3) aasm actionpack-page_caching (>= 1.2.0) active_record_union @@ -485,7 +481,6 @@ DEPENDENCIES autoprefixer-rails aws-sdk-s3 better_errors - bigdecimal (~> 1.1.0) binding_of_caller bootsnap (>= 1.4.2) bootstrap (~> 4.5.0) @@ -498,10 +493,9 @@ DEPENDENCIES capybara (>= 2.15) composite_primary_keys (~> 12.0.0) config - coveralls dalli + debug_inspector delayed_job_active_record - dynamic_form erb_lint factory_bot_rails faraday @@ -519,27 +513,27 @@ 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 - psych puma (~> 5.0) quad_tile (~> 1.0.1) r2 (~> 0.2.7) rack-cors rack-uri_sanitizer - rails (= 6.0.3.4) + rails (= 6.0.3.7) rails-controller-testing rails-i18n (~> 6.0.0) rinku (>= 2.0.6) @@ -548,10 +542,13 @@ DEPENDENCIES rubocop-minitest rubocop-performance rubocop-rails + rubocop-rake sanitize sassc-rails secure_headers selenium-webdriver + simplecov + simplecov-lcov strong_migrations uglifier (>= 1.3.0) validates_email_format_of (>= 1.5.1) @@ -559,4 +556,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.1.4 + 2.2.16