X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e057175ca964d7471154e02e5a511ef95523ad45..7a396e9dc9a7f4097218032a882080403e668bf6:/Gemfile.lock?ds=sidebyside diff --git a/Gemfile.lock b/Gemfile.lock index 3cd36d5ad..1cff44151 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,56 +2,59 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) - actioncable (5.0.6) - actionpack (= 5.0.6) - nio4r (>= 1.2, < 3.0) + actioncable (5.1.4) + actionpack (= 5.1.4) + nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.6) - actionpack (= 5.0.6) - actionview (= 5.0.6) - activejob (= 5.0.6) + actionmailer (5.1.4) + actionpack (= 5.1.4) + actionview (= 5.1.4) + activejob (= 5.1.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.6) - actionview (= 5.0.6) - activesupport (= 5.0.6) + actionpack (5.1.4) + actionview (= 5.1.4) + activesupport (= 5.1.4) rack (~> 2.0) - rack-test (~> 0.6.3) + 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.6) - activesupport (= 5.0.6) + actionview (5.1.4) + activesupport (= 5.1.4) builder (~> 3.1) - erubis (~> 2.7.0) + erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.6) - activesupport (= 5.0.6) + activejob (5.1.4) + activesupport (= 5.1.4) globalid (>= 0.3.6) - 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.6) + activemodel (5.1.4) + activesupport (= 5.1.4) + activerecord (5.1.4) + activemodel (= 5.1.4) + activesupport (= 5.1.4) + arel (~> 8.0) + activesupport (5.1.4) 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) - arel (7.1.4) + annotate (2.7.2) + activerecord (>= 3.2, < 6.0) + rake (>= 10.4, < 13.0) + arel (8.0.0) ast (2.3.0) - autoprefixer-rails (7.1.4.1) + autoprefixer-rails (7.1.6) execjs bigdecimal (1.1.0) builder (3.2.3) canonical-rails (0.2.1) rails (>= 4.1, < 5.2) - capybara (2.15.3) + capybara (2.16.1) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) @@ -69,8 +72,8 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - composite_primary_keys (9.0.7) - activerecord (~> 5.0.0) + composite_primary_keys (10.0.1) + activerecord (~> 5.1.0) concurrent-ruby (1.0.5) coveralls (0.8.21) json (>= 1.8, < 3) @@ -80,33 +83,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) - erubis (2.7.0) + erubi (1.7.0) execjs (2.7.0) exifr (1.3.2) - factory_girl (4.8.1) + 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) fspath (3.1.0) geoip (1.6.3) - globalid (0.4.0) + globalid (0.4.1) activesupport (>= 4.2.0) - hashdiff (0.3.6) + hashdiff (0.3.7) hashie (3.5.6) htmlentities (4.3.4) http_accept_language (2.0.5) - i18n (0.8.6) - i18n-js (3.0.1) + i18n (0.9.1) + concurrent-ruby (~> 1.0) + i18n-js (3.0.2) i18n (~> 0.6, >= 0.6.6) - image_optim (0.25.0) + image_optim (0.26.0) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) image_size (~> 1.5) @@ -117,7 +121,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) @@ -141,21 +145,21 @@ GEM 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) 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) + mini_mime (1.0.0) mini_portile2 (2.3.0) minitest (5.10.3) multi_json (1.12.2) @@ -214,37 +218,38 @@ GEM mime-types mimemagic (= 0.3.0) parallel (1.12.0) - parser (2.4.0.0) - ast (~> 2.2) + parser (2.4.0.2) + ast (~> 2.3) pg (0.21.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) + progress (3.4.0) psych (2.2.4) - public_suffix (3.0.0) + public_suffix (3.0.1) + puma (3.11.0) r2 (0.2.7) rack (2.0.3) - rack-cors (1.0.1) + rack-cors (1.0.2) rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - rack-test (0.6.3) - rack (>= 1.0) + rack-test (0.8.2) + rack (>= 1.0, < 3) rack-uri_sanitizer (0.0.2) - 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) + 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) bundler (>= 1.3.0) - railties (= 5.0.6) + railties (= 5.1.4) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.2) actionpack (~> 5.x, >= 5.0.1) @@ -258,15 +263,15 @@ GEM rails-i18n (4.0.2) i18n (~> 0.6) rails (>= 4.0) - railties (5.0.6) - actionpack (= 5.0.6) - activesupport (= 5.0.6) + railties (5.1.4) + actionpack (= 5.1.4) + activesupport (= 5.1.4) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake - rake (12.1.0) + rake (12.3.0) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) @@ -277,7 +282,7 @@ GEM request_store (1.3.2) rinku (2.0.3) rotp (3.3.0) - rubocop (0.50.0) + rubocop (0.51.0) parallel (~> 1.10) parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) @@ -292,18 +297,18 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4.1) - sass (3.5.2) + sass (3.5.3) 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.3) useragent (>= 0.15.0) simplecov (0.14.1) docile (~> 1.1.0) @@ -325,8 +330,8 @@ 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.0) + tzinfo (1.2.4) thread_safe (~> 0.1) uglifier (3.2.0) execjs (>= 0.3.0, < 3) @@ -335,13 +340,13 @@ GEM validates_email_format_of (1.6.3) i18n vendorer (0.1.16) - webmock (3.0.1) + webmock (3.1.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) + websocket-extensions (0.1.3) xpath (2.1.0) nokogiri (~> 1.3) @@ -351,15 +356,17 @@ PLATFORMS DEPENDENCIES SystemTimer (>= 1.1.3) actionpack-page_caching + annotate autoprefixer-rails bigdecimal (~> 1.1.0) canonical-rails + capybara (~> 2.13) coffee-rails (~> 4.2) - composite_primary_keys (~> 9.0.7) + composite_primary_keys (~> 10.0.0) coveralls dalli dynamic_form - factory_girl_rails + factory_bot_rails faraday geoip htmlentities @@ -388,10 +395,11 @@ DEPENDENCIES pg poltergeist psych + puma (~> 3.7) r2 (~> 0.2.7) rack-cors rack-uri_sanitizer - rails (= 5.0.6) + rails (= 5.1.4) rails-controller-testing rails-i18n (~> 4.0.0) record_tag_helper @@ -408,4 +416,4 @@ DEPENDENCIES webmock BUNDLED WITH - 1.13.7 + 1.15.4