X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2ef803b9dfa0490d23984c326087c3a757c723e7..e4b94f4e5ef195dd5743ab3a510caecb7525a3b7:/Gemfile.lock?ds=sidebyside diff --git a/Gemfile.lock b/Gemfile.lock index 1cff44151..8634f8df8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,69 +2,74 @@ 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) tzinfo (~> 1.1) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) - annotate (2.7.2) + annotate (2.7.3) activerecord (>= 3.2, < 6.0) rake (>= 10.4, < 13.0) arel (8.0.0) - ast (2.3.0) - autoprefixer-rails (7.1.6) + ast (2.4.0) + autoprefixer-rails (8.5.1) execjs + better_errors (2.4.0) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) bigdecimal (1.1.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) builder (3.2.3) - canonical-rails (0.2.1) - rails (>= 4.1, < 5.2) - capybara (2.16.1) + canonical-rails (0.2.3) + rails (>= 4.1, < 5.3) + 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) - climate_control (>= 0.0.3, < 1.0) + coderay (1.1.2) coffee-rails (4.2.2) coffee-script (>= 2.2.0) railties (>= 4.0.0) @@ -72,8 +77,8 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - composite_primary_keys (10.0.1) - activerecord (~> 5.1.0) + 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) @@ -83,34 +88,35 @@ GEM tins (~> 1.6) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.3) - dalli (2.7.6) + crass (1.0.4) + dalli (2.7.8) + debug_inspector (0.0.3) docile (1.1.5) dynamic_form (1.1.4) - erubi (1.7.0) + erubi (1.7.1) execjs (2.7.0) - exifr (1.3.2) - factory_bot (4.8.2) + exifr (1.3.4) + factory_bot (4.10.0) activesupport (>= 3.0.0) - factory_bot_rails (4.8.2) - factory_bot (~> 4.8.2) + factory_bot_rails (4.10.0) + factory_bot (~> 4.10.0) 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.6) + hashie (3.5.7) htmlentities (4.3.4) http_accept_language (2.0.5) - i18n (0.9.1) + i18n (0.9.5) concurrent-ruby (~> 1.0) - i18n-js (3.0.2) - i18n (~> 0.6, >= 0.6.6) - image_optim (0.26.0) + i18n-js (3.0.5) + i18n (>= 0.6.6, < 2) + image_optim (0.26.1) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) image_size (~> 1.5) @@ -122,7 +128,7 @@ GEM sprockets image_size (1.5.0) in_threads (1.5.0) - jquery-rails (4.3.1) + jquery-rails (4.3.3) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -137,9 +143,9 @@ 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) @@ -149,7 +155,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) @@ -158,17 +164,17 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mimemagic (0.3.0) + 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.3.1) + 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) @@ -182,27 +188,26 @@ 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) + omniauth-facebook (5.0.0) omniauth-oauth2 (~> 1.2) 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) @@ -211,45 +216,45 @@ 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) - cocaine (~> 0.5.5) + paperclip (5.3.0) + activemodel (>= 4.2.0) + activesupport (>= 4.2.0) mime-types - mimemagic (= 0.3.0) - parallel (1.12.0) - parser (2.4.0.2) - ast (~> 2.3) + mimemagic (~> 0.3.0) + terrapin (~> 0.6.0) + parallel (1.12.1) + parser (2.5.1.0) + ast (~> 2.4.0) pg (0.21.0) - poltergeist (1.16.0) - capybara (~> 2.1) + poltergeist (1.18.1) + capybara (>= 2.1, < 4) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) powerpack (0.1.1) progress (3.4.0) - psych (2.2.4) - public_suffix (3.0.1) - puma (3.11.0) + psych (3.0.2) + public_suffix (3.0.2) + puma (3.11.4) r2 (0.2.7) - rack (2.0.3) + rack (2.0.5) 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 (1.0.0) 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,46 +263,46 @@ 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 (2.2.2) - rake - rake (12.3.0) - rb-fsevent (0.10.2) + rainbow (3.0.0) + 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.3.2) - rinku (2.0.3) - rotp (3.3.0) - rubocop (0.51.0) + request_store (1.4.1) + rack (>= 1.4) + rinku (2.0.4) + rotp (3.3.1) + rubocop (0.56.0) parallel (~> 1.10) - parser (>= 2.3.3.1, < 3.0) + parser (>= 2.5) 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.5) crass (~> 1.0.2) nokogiri (>= 1.4.4) - nokogumbo (~> 1.4.1) - sass (3.5.3) + 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,8 +313,7 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - secure_headers (5.0.3) - useragent (>= 0.15.0) + secure_headers (6.0.0) simplecov (0.14.1) docile (~> 1.1.0) json (>= 1.8, < 3) @@ -324,31 +328,32 @@ 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 thor (0.19.4) thread_safe (0.3.6) tilt (2.0.8) - tins (1.16.0) - tzinfo (1.2.4) + tins (1.16.3) + tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (3.2.0) + uglifier (4.1.10) execjs (>= 0.3.0, < 3) - unicode-display_width (1.3.0) - useragent (0.16.8) + unicode-display_width (1.3.2) validates_email_format_of (1.6.3) i18n vendorer (0.1.16) - webmock (3.1.1) + webmock (3.4.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) - xpath (2.1.0) - nokogiri (~> 1.3) + xpath (3.1.0) + nokogiri (~> 1.8) PLATFORMS ruby @@ -358,7 +363,9 @@ DEPENDENCIES actionpack-page_caching annotate autoprefixer-rails + better_errors bigdecimal (~> 1.1.0) + binding_of_caller canonical-rails capybara (~> 2.13) coffee-rails (~> 4.2) @@ -391,15 +398,15 @@ 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 - rails (= 5.1.4) + rails (= 5.1.5) rails-controller-testing rails-i18n (~> 4.0.0) record_tag_helper @@ -416,4 +423,4 @@ DEPENDENCIES webmock BUNDLED WITH - 1.15.4 + 1.16.2