X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/38640e0253e8984974d275f2c232eb057ba86c84..424b6ef1cf760c4a3e27ac1e6f612ae42a9cd493:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 653098e8e..601477824 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,6 +2,7 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) + aasm (4.1.0) actioncable (5.1.4) actionpack (= 5.1.4) nio4r (~> 2.0) @@ -47,20 +48,20 @@ GEM activerecord (>= 3.2, < 6.0) rake (>= 10.4, < 13.0) arel (8.0.0) - ast (2.3.0) - autoprefixer-rails (7.1.5) + ast (2.4.0) + autoprefixer-rails (8.0.0) execjs bigdecimal (1.1.0) builder (3.2.3) - canonical-rails (0.2.1) + canonical-rails (0.2.2) rails (>= 4.1, < 5.2) - capybara (2.15.4) + capybara (2.18.0) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - xpath (~> 2.0) + xpath (>= 2.0, < 4.0) climate_control (0.2.0) cliver (0.3.2) cocaine (0.5.8) @@ -72,8 +73,8 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - composite_primary_keys (10.0.0) - activerecord (~> 5.1.0) + composite_primary_keys (10.0.2) + activerecord (~> 5.1.0, >= 5.1.4) concurrent-ruby (1.0.5) coveralls (0.8.21) json (>= 1.8, < 3) @@ -83,33 +84,34 @@ GEM tins (~> 1.6) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.2) + crass (1.0.3) dalli (2.7.6) docile (1.1.5) dynamic_form (1.1.4) - erubi (1.6.1) + erubi (1.7.0) execjs (2.7.0) - exifr (1.3.2) - factory_girl (4.8.1) + exifr (1.3.3) + factory_bot (4.8.2) activesupport (>= 3.0.0) - factory_girl_rails (4.8.0) - factory_girl (~> 4.8.0) + factory_bot_rails (4.8.2) + factory_bot (~> 4.8.2) railties (>= 3.0.0) faraday (0.12.2) multipart-post (>= 1.2, < 3) - ffi (1.9.18) + ffi (1.9.21) fspath (3.1.0) geoip (1.6.3) - globalid (0.4.0) + globalid (0.4.1) activesupport (>= 4.2.0) hashdiff (0.3.7) - hashie (3.5.6) + hashie (3.5.7) htmlentities (4.3.4) http_accept_language (2.0.5) - i18n (0.8.6) - i18n-js (3.0.1) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + i18n-js (3.0.4) i18n (~> 0.6, >= 0.6.6) - image_optim (0.25.0) + image_optim (0.26.1) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) image_size (~> 1.5) @@ -120,7 +122,7 @@ GEM rails sprockets image_size (1.5.0) - in_threads (1.4.0) + in_threads (1.5.0) jquery-rails (4.3.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) @@ -136,38 +138,38 @@ GEM actionpack jsonify (< 0.4.0) jwt (1.5.6) - kgio (2.11.0) + kgio (2.11.2) libv8 (3.16.14.19) - libxml-ruby (3.0.0) + libxml-ruby (3.1.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) logstash-event (1.2.02) - logstasher (1.2.1) + logstasher (1.2.2) activesupport (>= 4.0) logstash-event (~> 1.2.0) request_store - loofah (2.1.1) + loofah (2.2.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) + mail (2.7.0) + mini_mime (>= 0.1.1) method_source (0.9.0) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mimemagic (0.3.0) - mini_mime (0.1.4) + mimemagic (0.3.2) + mini_mime (1.0.0) mini_portile2 (2.3.0) - minitest (5.10.3) - multi_json (1.12.2) + minitest (5.11.3) + multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - nio4r (2.1.0) - nokogiri (1.8.1) + nio4r (2.2.0) + nokogiri (1.8.2) mini_portile2 (~> 2.3.0) - nokogumbo (1.4.13) + nokogumbo (1.5.0) nokogiri oauth (0.4.7) oauth-plugin (0.5.1) @@ -181,7 +183,7 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - omniauth (1.7.1) + omniauth (1.8.1) hashie (>= 3.4.6, < 3.6.0) rack (>= 1.6.2, < 3) omniauth-facebook (4.0.0) @@ -189,19 +191,18 @@ GEM omniauth-github (1.3.0) omniauth (~> 1.5) omniauth-oauth2 (>= 1.4.0, < 2.0) - omniauth-google-oauth2 (0.5.2) - jwt (~> 1.5) - multi_json (~> 1.3) + omniauth-google-oauth2 (0.5.3) + jwt (>= 1.5) omniauth (>= 1.1.1) - omniauth-oauth2 (>= 1.3.1) + omniauth-oauth2 (>= 1.5) omniauth-mediawiki (0.0.3) jwt (~> 1.0) omniauth-oauth (~> 1.0) omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.4.0) - oauth2 (~> 1.0) + omniauth-oauth2 (1.5.0) + oauth2 (~> 1.1) omniauth (~> 1.2) omniauth-openid (1.0.1) omniauth (~> 1.0) @@ -210,31 +211,32 @@ GEM multi_json (~> 1.12) omniauth-oauth2 (~> 1.4) openstreetmap-deadlock_retry (1.3.0) - paperclip (4.3.7) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) + paperclip (5.2.1) + activemodel (>= 4.2.0) + activesupport (>= 4.2.0) cocaine (~> 0.5.5) mime-types - mimemagic (= 0.3.0) - parallel (1.12.0) - parser (2.4.0.0) - ast (~> 2.2) + mimemagic (~> 0.3.0) + parallel (1.12.1) + parser (2.4.0.2) + ast (~> 2.3) pg (0.21.0) - poltergeist (1.16.0) + poltergeist (1.17.0) capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) powerpack (0.1.1) - progress (3.3.2) - psych (2.2.4) - public_suffix (3.0.0) + progress (3.4.0) + psych (3.0.2) + public_suffix (3.0.2) + puma (3.11.2) r2 (0.2.7) - rack (2.0.3) - rack-cors (1.0.1) + rack (2.0.4) + rack-cors (1.0.2) rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - rack-test (0.7.0) + rack-test (0.8.2) rack (>= 1.0, < 3) rack-uri_sanitizer (0.0.2) rails (5.1.4) @@ -267,9 +269,8 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.2.2) - rake - rake (12.1.0) + rainbow (3.0.0) + rake (12.3.0) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) @@ -277,36 +278,37 @@ GEM actionview (~> 5.x) redcarpet (3.4.0) ref (2.0.0) - request_store (1.3.2) - rinku (2.0.3) + request_store (1.4.0) + rack (>= 1.4) + rinku (2.0.4) rotp (3.3.0) - rubocop (0.50.0) + rubocop (0.52.1) parallel (~> 1.10) - parser (>= 2.3.3.1, < 3.0) + parser (>= 2.4.0.2, < 3.0) powerpack (~> 0.1) - rainbow (>= 2.2.2, < 3.0) + rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-openid (2.7.0) ruby-progressbar (1.9.0) ruby_dep (1.5.0) safe_yaml (1.0.4) - sanitize (4.5.0) + sanitize (4.6.0) crass (~> 1.0.2) nokogiri (>= 1.4.4) - nokogumbo (~> 1.4.1) - sass (3.5.2) + nokogumbo (~> 1.4) + sass (3.5.5) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.6) + sass-rails (5.0.7) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - secure_headers (4.0.1) + secure_headers (5.0.5) useragent (>= 0.15.0) simplecov (0.14.1) docile (~> 1.1.0) @@ -328,42 +330,44 @@ GEM thor (0.19.4) thread_safe (0.3.6) tilt (2.0.8) - tins (1.15.0) - tzinfo (1.2.3) + tins (1.16.3) + tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (3.2.0) + uglifier (4.1.6) execjs (>= 0.3.0, < 3) unicode-display_width (1.3.0) - useragent (0.16.8) + useragent (0.16.10) validates_email_format_of (1.6.3) i18n vendorer (0.1.16) - webmock (3.1.0) + webmock (3.3.0) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - xpath (2.1.0) - nokogiri (~> 1.3) + websocket-extensions (0.1.3) + xpath (3.0.0) + nokogiri (~> 1.8) PLATFORMS ruby DEPENDENCIES SystemTimer (>= 1.1.3) + aasm actionpack-page_caching annotate autoprefixer-rails bigdecimal (~> 1.1.0) canonical-rails + capybara (~> 2.13) coffee-rails (~> 4.2) composite_primary_keys (~> 10.0.0) coveralls dalli dynamic_form - factory_girl_rails + factory_bot_rails faraday geoip htmlentities @@ -388,10 +392,11 @@ DEPENDENCIES omniauth-openid omniauth-windowslive openstreetmap-deadlock_retry (>= 1.3.0) - paperclip (~> 4.0) - pg + paperclip (~> 5.2) + pg (~> 0.18) poltergeist psych + puma (~> 3.7) r2 (~> 0.2.7) rack-cors rack-uri_sanitizer