X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/673b58f96f3acfd0281c62a2a7f080825b6fb28b..0273b00baf147c7d7fd1236bfdc0733e8a7335a8:/Gemfile.lock?ds=inline diff --git a/Gemfile.lock b/Gemfile.lock index 7dd619b61..e4448fddc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,41 +2,41 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) - actioncable (5.1.4) - actionpack (= 5.1.4) + actioncable (5.1.5) + actionpack (= 5.1.5) nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.4) - actionpack (= 5.1.4) - actionview (= 5.1.4) - activejob (= 5.1.4) + actionmailer (5.1.5) + actionpack (= 5.1.5) + actionview (= 5.1.5) + activejob (= 5.1.5) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.4) - actionview (= 5.1.4) - activesupport (= 5.1.4) + actionpack (5.1.5) + actionview (= 5.1.5) + activesupport (= 5.1.5) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) actionpack-page_caching (1.1.0) actionpack (>= 4.0.0, < 6) - actionview (5.1.4) - activesupport (= 5.1.4) + actionview (5.1.5) + activesupport (= 5.1.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.4) - activesupport (= 5.1.4) + activejob (5.1.5) + activesupport (= 5.1.5) globalid (>= 0.3.6) - activemodel (5.1.4) - activesupport (= 5.1.4) - activerecord (5.1.4) - activemodel (= 5.1.4) - activesupport (= 5.1.4) + activemodel (5.1.5) + activesupport (= 5.1.5) + activerecord (5.1.5) + activemodel (= 5.1.5) + activesupport (= 5.1.5) arel (~> 8.0) - activesupport (5.1.4) + activesupport (5.1.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) @@ -47,14 +47,14 @@ GEM activerecord (>= 3.2, < 6.0) rake (>= 10.4, < 13.0) arel (8.0.0) - ast (2.3.0) - autoprefixer-rails (7.2.5) + ast (2.4.0) + autoprefixer-rails (8.2.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.17.0) + capybara (2.18.0) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) @@ -63,8 +63,6 @@ GEM xpath (>= 2.0, < 4.0) climate_control (0.2.0) cliver (0.3.2) - cocaine (0.5.8) - climate_control (>= 0.0.3, < 1.0) coffee-rails (4.2.2) coffee-script (>= 2.2.0) railties (>= 4.0.0) @@ -72,8 +70,8 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - composite_primary_keys (10.0.2) - activerecord (~> 5.1.0, >= 5.1.4) + composite_primary_keys (10.0.3) + activerecord (~> 5.1.0, >= 5.1.5) concurrent-ruby (1.0.5) coveralls (0.8.21) json (>= 1.8, < 3) @@ -87,7 +85,7 @@ GEM dalli (2.7.6) docile (1.1.5) dynamic_form (1.1.4) - erubi (1.7.0) + erubi (1.7.1) execjs (2.7.0) exifr (1.3.3) factory_bot (4.8.2) @@ -97,19 +95,19 @@ GEM railties (>= 3.0.0) faraday (0.12.2) multipart-post (>= 1.2, < 3) - ffi (1.9.18) + ffi (1.9.23) fspath (3.1.0) - geoip (1.6.3) + geoip (1.6.4) globalid (0.4.1) activesupport (>= 4.2.0) hashdiff (0.3.7) hashie (3.5.7) htmlentities (4.3.4) http_accept_language (2.0.5) - i18n (0.9.3) + i18n (0.9.5) concurrent-ruby (~> 1.0) - i18n-js (3.0.3) - i18n (~> 0.6, >= 0.6.6) + i18n-js (3.0.5) + i18n (>= 0.6.6, < 2) image_optim (0.26.1) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) @@ -137,9 +135,9 @@ GEM actionpack jsonify (< 0.4.0) jwt (1.5.6) - kgio (2.11.1) + 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) @@ -149,7 +147,7 @@ GEM activesupport (>= 4.0) logstash-event (~> 1.2.0) request_store - loofah (2.1.1) + loofah (2.2.2) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.0) @@ -161,14 +159,14 @@ GEM mimemagic (0.3.2) mini_mime (1.0.0) mini_portile2 (2.3.0) - minitest (5.11.1) + minitest (5.11.3) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - nio4r (2.2.0) - nokogiri (1.8.1) + nio4r (2.3.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) @@ -190,11 +188,10 @@ 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) @@ -211,15 +208,15 @@ GEM multi_json (~> 1.12) omniauth-oauth2 (~> 1.4) openstreetmap-deadlock_retry (1.3.0) - paperclip (5.2.0) + paperclip (5.3.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) - cocaine (~> 0.5.5) mime-types mimemagic (~> 0.3.0) + terrapin (~> 0.6.0) parallel (1.12.1) - parser (2.4.0.2) - ast (~> 2.3) + parser (2.5.0.5) + ast (~> 2.4.0) pg (0.21.0) poltergeist (1.17.0) capybara (~> 2.1) @@ -228,28 +225,28 @@ GEM powerpack (0.1.1) progress (3.4.0) psych (3.0.2) - public_suffix (3.0.1) - puma (3.11.2) + public_suffix (3.0.2) + puma (3.11.3) r2 (0.2.7) - rack (2.0.3) + 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.8.2) + rack-test (0.8.3) rack (>= 1.0, < 3) rack-uri_sanitizer (0.0.2) - rails (5.1.4) - actioncable (= 5.1.4) - actionmailer (= 5.1.4) - actionpack (= 5.1.4) - actionview (= 5.1.4) - activejob (= 5.1.4) - activemodel (= 5.1.4) - activerecord (= 5.1.4) - activesupport (= 5.1.4) + rails (5.1.5) + actioncable (= 5.1.5) + actionmailer (= 5.1.5) + actionpack (= 5.1.5) + actionview (= 5.1.5) + activejob (= 5.1.5) + activemodel (= 5.1.5) + activerecord (= 5.1.5) + activesupport (= 5.1.5) bundler (>= 1.3.0) - railties (= 5.1.4) + railties (= 5.1.5) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.2) actionpack (~> 5.x, >= 5.0.1) @@ -258,33 +255,33 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) rails-i18n (4.0.2) i18n (~> 0.6) rails (>= 4.0) - railties (5.1.4) - actionpack (= 5.1.4) - activesupport (= 5.1.4) + railties (5.1.5) + actionpack (= 5.1.5) + activesupport (= 5.1.5) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.0.0) - rake (12.3.0) - rb-fsevent (0.10.2) + rake (12.3.1) + rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) record_tag_helper (1.0.0) actionview (~> 5.x) redcarpet (3.4.0) ref (2.0.0) - request_store (1.4.0) + request_store (1.4.1) rack (>= 1.4) rinku (2.0.4) - rotp (3.3.0) - rubocop (0.52.1) + rotp (3.3.1) + rubocop (0.54.0) parallel (~> 1.10) - parser (>= 2.4.0.2, < 3.0) + parser (>= 2.5) powerpack (~> 0.1) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) @@ -293,11 +290,11 @@ GEM ruby-progressbar (1.9.0) ruby_dep (1.5.0) safe_yaml (1.0.4) - sanitize (4.5.0) + sanitize (4.6.4) crass (~> 1.0.2) nokogiri (>= 1.4.4) - nokogumbo (~> 1.4.1) - sass (3.5.5) + nokogumbo (~> 1.4) + sass (3.5.6) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -308,7 +305,7 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - secure_headers (5.0.4) + secure_headers (5.0.5) useragent (>= 0.15.0) simplecov (0.14.1) docile (~> 1.1.0) @@ -324,6 +321,8 @@ GEM sprockets (>= 3.0.0) term-ansicolor (1.6.0) tins (~> 1.0) + terrapin (0.6.0) + climate_control (>= 0.0.3, < 1.0) therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref @@ -331,12 +330,12 @@ GEM thread_safe (0.3.6) tilt (2.0.8) tins (1.16.3) - tzinfo (1.2.4) + tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.4) + uglifier (4.1.8) execjs (>= 0.3.0, < 3) unicode-display_width (1.3.0) - useragent (0.16.9) + useragent (0.16.10) validates_email_format_of (1.6.3) i18n vendorer (0.1.16) @@ -399,7 +398,7 @@ DEPENDENCIES r2 (~> 0.2.7) rack-cors rack-uri_sanitizer - rails (= 5.1.4) + rails (= 5.1.5) rails-controller-testing rails-i18n (~> 4.0.0) record_tag_helper