X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/74714c1a21e556b9533174fa39da36953d63dde6..10065abea62eee73eb572be6fd6bcbb4a6f9a6d9:/Gemfile.lock?ds=inline diff --git a/Gemfile.lock b/Gemfile.lock index f61bd6eca..c9a6ee6b0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,6 @@ GEM remote: https://rubygems.org/ specs: - SystemTimer (1.2.3) aasm (5.1.1) concurrent-ruby (~> 1.0) actioncable (6.0.3.4) @@ -52,7 +51,7 @@ GEM activerecord (6.0.3.4) activemodel (= 6.0.3.4) activesupport (= 6.0.3.4) - activerecord-import (1.0.6) + activerecord-import (1.0.7) activerecord (>= 3.2) activestorage (6.0.3.4) actionpack (= 6.0.3.4) @@ -71,25 +70,25 @@ GEM activerecord (>= 3.2, < 7.0) rake (>= 10.4, < 14.0) ast (2.4.1) - autoprefixer-rails (10.0.1.0) + autoprefixer-rails (10.1.0.0) execjs aws-eventstream (1.1.0) - aws-partitions (1.380.0) - aws-sdk-core (3.109.0) + aws-partitions (1.414.0) + aws-sdk-core (3.110.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-kms (1.40.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.83.0) + aws-sdk-s3 (1.87.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.2.2) aws-eventstream (~> 1, >= 1.0.2) - better_errors (2.8.3) + better_errors (2.9.1) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) @@ -102,26 +101,26 @@ GEM 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.4.8) + bootsnap (1.5.1) 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 (4.10.1) + browser (5.2.0) builder (3.2.4) bzip2-ffi (1.0.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.34.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -131,46 +130,39 @@ GEM xpath (~> 3.2) childprocess (3.0.0) coderay (1.1.3) - composite_primary_keys (12.0.2) + composite_primary_keys (12.0.5) activerecord (~> 6.0.0) concurrent-ruby (1.1.7) - config (2.2.1) + config (2.2.3) 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) 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.5) + activerecord (>= 3.0, < 6.2) delayed_job (>= 3.0, < 5) - docile (1.3.2) - dry-configurable (0.11.6) + docile (1.3.4) + dry-configurable (0.12.0) 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.1.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.5.6) concurrent-ruby (~> 1.0) dry-configurable (~> 0.8, >= 0.8.3) dry-core (~> 0.4) @@ -185,7 +177,7 @@ GEM dry-equalizer (~> 0.3) 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) @@ -201,17 +193,20 @@ GEM rainbow rubocop (~> 0.79) smart_properties - erubi (1.9.0) + erubi (1.10.0) execjs (2.7.0) - exifr (1.3.8) + exifr (1.3.9) 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.0.1) + faraday (1.3.0) + faraday-net_http (~> 1.0) multipart-post (>= 1.2, < 3) - ffi (1.13.1) + ruby2_keywords + faraday-net_http (1.0.0) + ffi (1.14.2) ffi-libarchive (1.0.4) ffi (~> 1.0) fspath (3.1.2) @@ -226,9 +221,9 @@ GEM http_accept_language (2.1.1) i18n (1.8.5) concurrent-ruby (~> 1.0) - i18n-js (3.7.1) + i18n-js (3.8.0) i18n (>= 0.6.6) - image_optim (0.27.1) + image_optim (0.28.0) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) image_size (>= 1.5, < 3) @@ -247,21 +242,19 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.3.1) + json (2.5.1) jwt (2.2.2) kgio (2.11.3) kramdown (2.3.0) rexml - libxml-ruby (3.2.0) - listen (3.2.1) + libxml-ruby (3.2.1) + listen (3.4.0) 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.8.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -271,7 +264,7 @@ GEM maxminddb (0.1.22) method_source (1.0.0) mimemagic (0.3.5) - mini_magick (4.10.1) + mini_magick (4.11.0) mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.14.2) @@ -282,7 +275,7 @@ GEM nio4r (2.5.4) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) - nokogumbo (2.0.2) + nokogumbo (2.0.4) nokogiri (~> 1.8, >= 1.8.4) oauth (0.4.7) oauth-plugin (0.5.1) @@ -299,13 +292,14 @@ GEM omniauth (1.9.1) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) - omniauth-facebook (7.0.0) + 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-google-oauth2 (0.8.1) jwt (>= 2.0) + oauth2 (~> 1.1) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.6) omniauth-mediawiki (0.0.4) @@ -324,15 +318,15 @@ GEM multi_json (~> 1.12) omniauth-oauth2 (~> 1.4) openstreetmap-deadlock_retry (1.3.0) - parallel (1.19.2) - parser (2.7.2.0) + parallel (1.20.1) + parser (3.0.0.0) ast (~> 2.4.1) pg (1.2.3) popper_js (1.16.0) progress (3.5.2) - psych (3.2.0) + psych (3.3.0) public_suffix (4.0.6) - puma (5.0.2) + puma (5.1.1) nio4r (~> 2.0) quad_tile (1.0.1) r2 (0.2.7) @@ -379,17 +373,17 @@ GEM rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rainbow (3.0.0) - rake (13.0.1) + rake (13.0.3) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - regexp_parser (1.8.1) + regexp_parser (1.8.2) request_store (1.5.0) rack (>= 1.4) rexml (3.2.4) rinku (2.0.6) rotp (6.2.0) - rubocop (0.93.0) + rubocop (0.93.1) parallel (~> 1.10) parser (>= 2.7.1.5) rainbow (>= 2.2.2, < 4.0) @@ -398,19 +392,20 @@ GEM rubocop-ast (>= 0.6.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (0.7.1) + rubocop-ast (1.3.0) parser (>= 2.7.1.5) - rubocop-minitest (0.10.1) - rubocop (>= 0.87) - rubocop-performance (1.8.1) - rubocop (>= 0.87.0) + rubocop-minitest (0.10.2) + rubocop (>= 0.87, < 2.0) + rubocop-performance (1.9.2) + rubocop (>= 0.90.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.8.1) + rubocop-rails (2.9.1) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.87.0) + rubocop (>= 0.90.0, < 2.0) ruby-openid (2.9.2) - ruby-progressbar (1.10.1) + ruby-progressbar (1.11.0) + ruby2_keywords (0.0.2) rubyzip (2.3.0) sanitize (5.2.1) crass (~> 1.0.2) @@ -428,11 +423,13 @@ GEM selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - simplecov (0.16.1) + simplecov (0.20.0) 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.2) smart_properties (1.15.0) sprockets (4.0.2) concurrent-ruby (~> 1.0) @@ -441,17 +438,12 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - strong_migrations (0.7.1) + strong_migrations (0.7.4) 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.25.0) - sync - tzinfo (1.2.7) + tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) @@ -459,7 +451,7 @@ GEM validates_email_format_of (1.6.3) i18n vendorer (0.2.0) - webmock (3.9.1) + webmock (3.11.0) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -468,13 +460,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 @@ -496,8 +487,8 @@ DEPENDENCIES capybara (>= 2.15) composite_primary_keys (~> 12.0.0) config - coveralls dalli + debug_inspector (< 1.0.0) delayed_job_active_record dynamic_form erb_lint @@ -542,7 +533,7 @@ DEPENDENCIES rails-i18n (~> 6.0.0) rinku (>= 2.0.6) rotp - rubocop + rubocop (~> 0.93) rubocop-minitest rubocop-performance rubocop-rails @@ -550,6 +541,8 @@ DEPENDENCIES sassc-rails secure_headers selenium-webdriver + simplecov + simplecov-lcov strong_migrations uglifier (>= 1.3.0) validates_email_format_of (>= 1.5.1)