X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0d936de9c90f0bf7ab9fe672c3ca8c7397d9ac85..84faaaf7950e61b5f87019398aeda0ead8d41c2c:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index de5157c04..5733e759c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -79,8 +79,10 @@ GEM msgpack (~> 1.0) browser (2.5.3) builder (3.2.3) + bzip2-ffi (1.0.0) + ffi (~> 1.0) cancancan (3.0.1) - canonical-rails (0.2.5) + canonical-rails (0.2.6) rails (>= 4.1, < 6.1) capybara (2.18.0) addressable @@ -99,14 +101,13 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - colorize (0.8.1) composite_primary_keys (11.1.0) activerecord (~> 5.2.1) concurrent-ruby (1.1.5) - config (1.7.1) - activesupport (>= 3.0) - deep_merge (~> 1.2.1) - dry-validation (>= 0.12.2) + config (2.0.0) + activesupport (>= 4.2) + deep_merge (~> 1.2, >= 1.2.1) + dry-schema (~> 1.0) coveralls (0.8.23) json (>= 1.8, < 3) simplecov (~> 0.16.1) @@ -119,40 +120,42 @@ GEM dalli (2.7.10) debug_inspector (0.0.3) deep_merge (1.2.1) - delayed_job (4.1.5) + delayed_job (4.1.7) activesupport (>= 3.0, < 5.3) delayed_job_active_record (4.1.3) activerecord (>= 3.0, < 5.3) delayed_job (>= 3.0, < 5) - docile (1.3.1) + docile (1.3.2) dry-configurable (0.8.3) concurrent-ruby (~> 1.0) dry-core (~> 0.4, >= 0.4.7) - dry-container (0.7.0) + dry-container (0.7.1) concurrent-ruby (~> 1.0) dry-configurable (~> 0.1, >= 0.1.3) - dry-core (0.4.7) + dry-core (0.4.8) concurrent-ruby (~> 1.0) dry-equalizer (0.2.2) dry-inflector (0.1.2) - dry-logic (0.6.1) + dry-initializer (3.0.1) + dry-logic (1.0.2) concurrent-ruby (~> 1.0) dry-core (~> 0.2) dry-equalizer (~> 0.2) - dry-types (0.14.1) + dry-schema (1.2.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.0) + dry-types (1.0.1) concurrent-ruby (~> 1.0) dry-container (~> 0.3) dry-core (~> 0.4, >= 0.4.4) - dry-equalizer (~> 0.2) + dry-equalizer (~> 0.2, >= 0.2.2) dry-inflector (~> 0.1, >= 0.1.2) - dry-logic (~> 0.5, >= 0.5) - dry-validation (0.13.3) - concurrent-ruby (~> 1.0) - dry-configurable (~> 0.1, >= 0.1.3) - dry-core (~> 0.2, >= 0.2.1) - dry-equalizer (~> 0.2) - dry-logic (~> 0.5, >= 0.5.0) - dry-types (~> 0.14.0) + dry-logic (~> 1.0) dynamic_form (1.1.4) erb_lint (0.0.28) activesupport @@ -162,10 +165,6 @@ GEM rubocop (~> 0.51) smart_properties erubi (1.8.0) - eslint-rails-ee (1.0.2) - colorize - execjs - railties (>= 3.2) execjs (2.7.0) exifr (1.3.6) factory_bot (5.0.2) @@ -177,8 +176,10 @@ GEM faraday (0.15.4) multipart-post (>= 1.2, < 3) ffi (1.11.1) + ffi-libarchive (0.4.10) + ffi (~> 1.0) fspath (3.1.1) - gd2-ffij (0.3.0) + gd2-ffij (0.4.0) ffi (>= 1.0.0) geoip (1.6.4) globalid (0.4.2) @@ -190,7 +191,7 @@ GEM http_accept_language (2.0.5) i18n (0.9.5) concurrent-ruby (~> 1.0) - i18n-js (3.2.3) + i18n-js (3.3.0) i18n (>= 0.6.6) image_optim (0.26.4) exifr (~> 1.2, >= 1.2.2) @@ -204,8 +205,8 @@ GEM sprockets image_size (2.0.1) in_threads (1.5.2) - jaro_winkler (1.5.2) - jquery-rails (4.3.3) + jaro_winkler (1.5.3) + jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -218,7 +219,6 @@ GEM jwt (2.2.1) kgio (2.11.2) kramdown (2.1.0) - libv8 (3.16.14.19) libxml-ruby (3.1.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) @@ -244,7 +244,7 @@ GEM mini_mime (1.0.1) mini_portile2 (2.4.0) minitest (5.11.3) - msgpack (1.2.10) + msgpack (1.3.0) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.1.1) @@ -359,7 +359,6 @@ GEM ffi (~> 1.0) record_tag_helper (1.0.0) actionview (~> 5.x) - ref (2.0.0) request_store (1.4.1) rack (>= 1.4) rinku (2.0.6) @@ -372,10 +371,10 @@ GEM rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-performance (1.3.0) - rubocop (>= 0.68.0) - rubocop-rails (2.0.0) - rack (>= 2.0) + rubocop-performance (1.4.0) + rubocop (>= 0.71.0) + rubocop-rails (2.0.1) + rack (>= 1.1) rubocop (>= 0.70.0) ruby-openid (2.7.0) ruby-progressbar (1.10.1) @@ -388,7 +387,7 @@ GEM sassc (2.0.1) ffi (~> 1.9) rake - sassc-rails (2.1.1) + sassc-rails (2.1.2) railties (>= 4.0.0) sassc (>= 2.0) sprockets (> 3.0) @@ -414,9 +413,6 @@ GEM tins (~> 1.0) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) - therubyracer (0.12.3) - libv8 (~> 3.16.14.15) - ref thor (0.20.3) thread_safe (0.3.6) tilt (2.0.9) @@ -433,9 +429,9 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - websocket-driver (0.7.0) + websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) + websocket-extensions (0.1.4) xpath (3.2.0) nokogiri (~> 1.8) @@ -455,6 +451,7 @@ DEPENDENCIES binding_of_caller bootsnap (>= 1.1.0) browser + bzip2-ffi cancancan canonical-rails capybara (~> 2.13) @@ -466,12 +463,11 @@ DEPENDENCIES delayed_job_active_record dynamic_form erb_lint - eslint-rails-ee - execjs factory_bot_rails fakefs faraday - gd2-ffij + ffi-libarchive + gd2-ffij (>= 0.4.0) geoip htmlentities http_accept_language (~> 2.0.0) @@ -485,6 +481,7 @@ DEPENDENCIES libxml-ruby (>= 2.0.5) listen logstasher + mimemagic minitest (~> 5.1) oauth-plugin (>= 0.5.1) omniauth @@ -517,7 +514,6 @@ DEPENDENCIES sassc-rails secure_headers strong_migrations - therubyracer uglifier (>= 1.3.0) validates_email_format_of (>= 1.5.1) vendorer