X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/28bfaa9fb6aeefb3264ebcb0e032c047f0288904..07c0462000b1f7cccdc2fc33499940ee6e899c3e:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 9b79e9ca1..3cd36d5ad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,58 +2,58 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) - actioncable (5.0.4) - actionpack (= 5.0.4) + actioncable (5.0.6) + actionpack (= 5.0.6) nio4r (>= 1.2, < 3.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.4) - actionpack (= 5.0.4) - actionview (= 5.0.4) - activejob (= 5.0.4) + actionmailer (5.0.6) + actionpack (= 5.0.6) + actionview (= 5.0.6) + activejob (= 5.0.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.4) - actionview (= 5.0.4) - activesupport (= 5.0.4) + actionpack (5.0.6) + actionview (= 5.0.6) + activesupport (= 5.0.6) 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.0.4) - activesupport (= 5.0.4) + actionview (5.0.6) + activesupport (= 5.0.6) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.4) - activesupport (= 5.0.4) + activejob (5.0.6) + activesupport (= 5.0.6) globalid (>= 0.3.6) - activemodel (5.0.4) - activesupport (= 5.0.4) - activerecord (5.0.4) - activemodel (= 5.0.4) - activesupport (= 5.0.4) + activemodel (5.0.6) + activesupport (= 5.0.6) + activerecord (5.0.6) + activemodel (= 5.0.6) + activesupport (= 5.0.6) arel (~> 7.0) - activesupport (5.0.4) + activesupport (5.0.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) arel (7.1.4) ast (2.3.0) - autoprefixer-rails (7.1.1.2) + autoprefixer-rails (7.1.4.1) execjs bigdecimal (1.1.0) builder (3.2.3) - canonical-rails (0.2.0) + canonical-rails (0.2.1) rails (>= 4.1, < 5.2) - capybara (2.14.3) + capybara (2.15.3) addressable - mime-types (>= 1.16) + mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) @@ -82,39 +82,38 @@ GEM safe_yaml (~> 1.0.0) crass (1.0.2) dalli (2.7.6) - deadlock_retry (1.2.0) docile (1.1.5) dynamic_form (1.1.4) erubis (2.7.0) execjs (2.7.0) - exifr (1.2.5) - factory_girl (4.8.0) + exifr (1.3.2) + factory_girl (4.8.1) activesupport (>= 3.0.0) factory_girl_rails (4.8.0) factory_girl (~> 4.8.0) railties (>= 3.0.0) - faraday (0.12.1) + faraday (0.12.2) multipart-post (>= 1.2, < 3) ffi (1.9.18) fspath (3.1.0) geoip (1.6.3) globalid (0.4.0) activesupport (>= 4.2.0) - hashdiff (0.3.4) - hashie (3.5.5) + hashdiff (0.3.6) + hashie (3.5.6) htmlentities (4.3.4) http_accept_language (2.0.5) - i18n (0.8.4) - i18n-js (3.0.0) + i18n (0.8.6) + i18n-js (3.0.1) i18n (~> 0.6, >= 0.6.6) - image_optim (0.24.3) + image_optim (0.25.0) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) image_size (~> 1.5) in_threads (~> 1.3) progress (~> 3.0, >= 3.0.1) - image_optim_rails (0.4.0) - image_optim (~> 0.24.0) + image_optim_rails (0.4.1) + image_optim (~> 0.24) rails sprockets image_size (1.5.0) @@ -146,23 +145,25 @@ GEM activesupport (>= 4.0) logstash-event (~> 1.2.0) request_store - loofah (2.0.3) + loofah (2.1.1) + crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.6.6) mime-types (>= 1.16, < 4) - method_source (0.8.2) + 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_portile2 (2.2.0) - minitest (5.10.2) - multi_json (1.12.1) + mini_mime (0.1.4) + mini_portile2 (2.3.0) + minitest (5.10.3) + multi_json (1.12.2) multi_xml (0.6.0) multipart-post (2.0.0) nio4r (2.1.0) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) nokogumbo (1.4.13) nokogiri oauth (0.4.7) @@ -177,7 +178,7 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - omniauth (1.6.1) + omniauth (1.7.1) hashie (>= 3.4.6, < 3.6.0) rack (>= 1.6.2, < 3) omniauth-facebook (4.0.0) @@ -185,7 +186,7 @@ GEM omniauth-github (1.3.0) omniauth (~> 1.5) omniauth-oauth2 (>= 1.4.0, < 2.0) - omniauth-google-oauth2 (0.5.0) + omniauth-google-oauth2 (0.5.2) jwt (~> 1.5) multi_json (~> 1.3) omniauth (>= 1.1.1) @@ -205,44 +206,45 @@ GEM omniauth-windowslive (0.0.12) 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) mime-types mimemagic (= 0.3.0) - parallel (1.11.2) + parallel (1.12.0) parser (2.4.0.0) ast (~> 2.2) pg (0.21.0) - poltergeist (1.15.0) + poltergeist (1.16.0) capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) powerpack (0.1.1) progress (3.3.1) psych (2.2.4) - public_suffix (2.0.5) - r2 (0.2.6) + public_suffix (3.0.0) + r2 (0.2.7) rack (2.0.3) - rack-cors (0.4.1) + rack-cors (1.0.1) rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (0.6.3) rack (>= 1.0) rack-uri_sanitizer (0.0.2) - rails (5.0.4) - actioncable (= 5.0.4) - actionmailer (= 5.0.4) - actionpack (= 5.0.4) - actionview (= 5.0.4) - activejob (= 5.0.4) - activemodel (= 5.0.4) - activerecord (= 5.0.4) - activesupport (= 5.0.4) - bundler (>= 1.3.0, < 2.0) - railties (= 5.0.4) + rails (5.0.6) + actioncable (= 5.0.6) + actionmailer (= 5.0.6) + actionpack (= 5.0.6) + actionview (= 5.0.6) + activejob (= 5.0.6) + activemodel (= 5.0.6) + activerecord (= 5.0.6) + activesupport (= 5.0.6) + bundler (>= 1.3.0) + railties (= 5.0.6) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.2) actionpack (~> 5.x, >= 5.0.1) @@ -256,16 +258,16 @@ GEM rails-i18n (4.0.2) i18n (~> 0.6) rails (>= 4.0) - railties (5.0.4) - actionpack (= 5.0.4) - activesupport (= 5.0.4) + railties (5.0.6) + actionpack (= 5.0.6) + activesupport (= 5.0.6) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake - rake (12.0.0) - rb-fsevent (0.9.8) + rake (12.1.0) + rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) record_tag_helper (1.0.0) @@ -273,41 +275,45 @@ GEM redcarpet (3.4.0) ref (2.0.0) request_store (1.3.2) - rinku (2.0.2) + rinku (2.0.3) rotp (3.3.0) - rubocop (0.49.1) + rubocop (0.50.0) parallel (~> 1.10) parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) + rainbow (>= 2.2.2, < 3.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-openid (2.7.0) - ruby-progressbar (1.8.1) + ruby-progressbar (1.9.0) ruby_dep (1.5.0) safe_yaml (1.0.4) sanitize (4.5.0) crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4.1) - sass (3.4.24) + sass (3.5.2) + 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) 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 (3.6.5) - useragent + secure_headers (4.0.1) + useragent (>= 0.15.0) simplecov (0.14.1) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.1) + simplecov-html (0.10.2) sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -318,8 +324,8 @@ GEM ref thor (0.19.4) thread_safe (0.3.6) - tilt (2.0.7) - tins (1.14.0) + tilt (2.0.8) + tins (1.15.0) tzinfo (1.2.3) thread_safe (~> 0.1) uglifier (3.2.0) @@ -352,7 +358,6 @@ DEPENDENCIES composite_primary_keys (~> 9.0.7) coveralls dalli - deadlock_retry (>= 1.2.0) dynamic_form factory_girl_rails faraday @@ -378,14 +383,15 @@ DEPENDENCIES omniauth-mediawiki (>= 0.0.3) omniauth-openid omniauth-windowslive + openstreetmap-deadlock_retry (>= 1.3.0) paperclip (~> 4.0) pg poltergeist psych - r2 + r2 (~> 0.2.7) rack-cors rack-uri_sanitizer - rails (= 5.0.4) + rails (= 5.0.6) rails-controller-testing rails-i18n (~> 4.0.0) record_tag_helper