X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3bb80bc5229a6bd02c2a9dc60b5af0b39caf3310..b5d903c603f4daa984f5a8d85aacd313beaaeebf:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index f2fc4146c..f9a0af7d4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) - aasm (5.0.3) + aasm (5.0.5) concurrent-ruby (~> 1.0) actioncable (5.2.3) actionpack (= 5.2.3) @@ -40,7 +40,7 @@ GEM activemodel (= 5.2.3) activesupport (= 5.2.3) arel (>= 9.0) - activerecord-import (1.0.1) + activerecord-import (1.0.2) activerecord (>= 3.2) activestorage (5.2.3) actionpack (= 5.2.3) @@ -79,6 +79,8 @@ 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) rails (>= 4.1, < 6.1) @@ -107,11 +109,11 @@ GEM activesupport (>= 3.0) deep_merge (~> 1.2.1) dry-validation (>= 0.12.2) - coveralls (0.8.22) + coveralls (0.8.23) json (>= 1.8, < 3) simplecov (~> 0.16.1) term-ansicolor (~> 1.3) - thor (~> 0.19.4) + thor (>= 0.19.4, < 2.0) tins (~> 1.6) crack (0.4.3) safe_yaml (~> 1.0.0) @@ -125,7 +127,7 @@ GEM activerecord (>= 3.0, < 5.3) delayed_job (>= 3.0, < 5) docile (1.3.1) - dry-configurable (0.8.2) + dry-configurable (0.8.3) concurrent-ruby (~> 1.0) dry-core (~> 0.4, >= 0.4.7) dry-container (0.7.0) @@ -146,7 +148,7 @@ GEM dry-equalizer (~> 0.2) dry-inflector (~> 0.1, >= 0.1.2) dry-logic (~> 0.5, >= 0.5) - dry-validation (0.13.1) + dry-validation (0.13.3) concurrent-ruby (~> 1.0) dry-configurable (~> 0.1, >= 0.1.3) dry-core (~> 0.2, >= 0.2.1) @@ -173,37 +175,39 @@ GEM factory_bot_rails (5.0.2) factory_bot (~> 5.0.2) railties (>= 4.2.0) - fakefs (0.20.0) + fakefs (0.20.1) faraday (0.15.4) multipart-post (>= 1.2, < 3) - ffi (1.10.0) - fspath (3.1.0) - gd2-ffij (0.3.0) + ffi (1.11.1) + ffi-libarchive (0.4.6) + ffi (~> 1.0) + fspath (3.1.1) + gd2-ffij (0.4.0) ffi (>= 1.0.0) geoip (1.6.4) globalid (0.4.2) activesupport (>= 4.2.0) - hashdiff (0.3.9) + hashdiff (0.4.0) hashie (3.6.0) html_tokenizer (0.0.7) htmlentities (4.3.4) http_accept_language (2.0.5) i18n (0.9.5) concurrent-ruby (~> 1.0) - i18n-js (3.2.1) + i18n-js (3.2.3) i18n (>= 0.6.6) - image_optim (0.26.3) + image_optim (0.26.4) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) image_size (>= 1.5, < 3) in_threads (~> 1.3) progress (~> 3.0, >= 3.0.1) - image_optim_rails (0.4.1) + image_optim_rails (0.4.2) image_optim (~> 0.24) rails sprockets - image_size (2.0.0) - in_threads (1.5.1) + image_size (2.0.1) + in_threads (1.5.2) jaro_winkler (1.5.2) jquery-rails (4.3.3) rails-dom-testing (>= 1, < 3) @@ -215,7 +219,7 @@ GEM jsonify-rails (0.3.2) actionpack jsonify (< 0.4.0) - jwt (2.1.0) + jwt (2.2.1) kgio (2.11.2) kramdown (2.1.0) libv8 (3.16.14.19) @@ -247,7 +251,7 @@ GEM msgpack (1.2.10) multi_json (1.13.1) multi_xml (0.6.0) - multipart-post (2.0.0) + multipart-post (2.1.1) nio4r (2.3.1) nokogiri (1.10.3) mini_portile2 (~> 2.4.0) @@ -273,7 +277,7 @@ GEM omniauth-github (1.3.0) omniauth (~> 1.5) omniauth-oauth2 (>= 1.4.0, < 2.0) - omniauth-google-oauth2 (0.6.1) + omniauth-google-oauth2 (0.7.0) jwt (>= 2.0) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.5) @@ -300,16 +304,16 @@ GEM mimemagic (~> 0.3.0) terrapin (~> 0.6.0) parallel (1.17.0) - parser (2.6.2.1) + parser (2.6.3.0) ast (~> 2.4.0) pg (1.1.4) poltergeist (1.18.1) capybara (>= 2.1, < 4) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) - progress (3.5.0) + progress (3.5.1) psych (3.1.0) - public_suffix (3.0.3) + public_suffix (3.1.0) puma (3.12.1) quad_tile (1.0.1) r2 (0.2.7) @@ -363,20 +367,22 @@ GEM request_store (1.4.1) rack (>= 1.4) rinku (2.0.6) - rotp (4.1.0) + rotp (5.0.0) addressable (~> 2.5) - rubocop (0.67.2) + rubocop (0.71.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.5, != 2.5.1.1) - psych (>= 3.1.0) + parser (>= 2.6) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.6) - rubocop-performance (1.1.0) - rubocop (>= 0.67.0) + 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 (>= 0.70.0) ruby-openid (2.7.0) - ruby-progressbar (1.10.0) + ruby-progressbar (1.10.1) ruby_dep (1.5.0) safe_yaml (1.0.5) sanitize (5.0.0) @@ -398,7 +404,7 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - smart_properties (1.13.1) + smart_properties (1.14.0) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -406,6 +412,8 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) + strong_migrations (0.4.0) + activerecord (>= 5) term-ansicolor (1.7.1) tins (~> 1.0) terrapin (0.6.0) @@ -413,22 +421,22 @@ GEM therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref - thor (0.19.4) + thor (0.20.3) thread_safe (0.3.6) tilt (2.0.9) - tins (1.20.2) + tins (1.20.3) tzinfo (1.2.5) thread_safe (~> 0.1) uglifier (4.1.20) execjs (>= 0.3.0, < 3) - unicode-display_width (1.5.0) + unicode-display_width (1.6.0) validates_email_format_of (1.6.3) i18n vendorer (0.2.0) - webmock (3.5.1) + webmock (3.6.0) addressable (>= 2.3.6) crack (>= 0.3.2) - hashdiff + hashdiff (>= 0.4.0, < 2.0.0) websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) @@ -451,6 +459,7 @@ DEPENDENCIES binding_of_caller bootsnap (>= 1.1.0) browser + bzip2-ffi cancancan canonical-rails capybara (~> 2.13) @@ -467,7 +476,8 @@ DEPENDENCIES factory_bot_rails fakefs faraday - gd2-ffij + ffi-libarchive + gd2-ffij (>= 0.4.0) geoip htmlentities http_accept_language (~> 2.0.0) @@ -481,6 +491,7 @@ DEPENDENCIES libxml-ruby (>= 2.0.5) listen logstasher + mimemagic minitest (~> 5.1) oauth-plugin (>= 0.5.1) omniauth @@ -508,9 +519,11 @@ DEPENDENCIES rotp rubocop rubocop-performance + rubocop-rails sanitize sassc-rails secure_headers + strong_migrations therubyracer uglifier (>= 1.3.0) validates_email_format_of (>= 1.5.1)