X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b126f02df9ee89ec7f9172bf005a3126112e67bd..aee222551ad5f23ba6d2f88e780a347d725f9a05:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 551523c7a..6ee99f7c7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,53 +2,55 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) - actioncable (5.1.5) - actionpack (= 5.1.5) + aasm (4.12.3) + concurrent-ruby (~> 1.0) + actioncable (5.1.6) + actionpack (= 5.1.6) nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.5) - actionpack (= 5.1.5) - actionview (= 5.1.5) - activejob (= 5.1.5) + actionmailer (5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.5) - actionview (= 5.1.5) - activesupport (= 5.1.5) + actionpack (5.1.6) + actionview (= 5.1.6) + activesupport (= 5.1.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.1.5) - activesupport (= 5.1.5) + actionview (5.1.6) + activesupport (= 5.1.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.5) - activesupport (= 5.1.5) + activejob (5.1.6) + activesupport (= 5.1.6) globalid (>= 0.3.6) - activemodel (5.1.5) - activesupport (= 5.1.5) - activerecord (5.1.5) - activemodel (= 5.1.5) - activesupport (= 5.1.5) + activemodel (5.1.6) + activesupport (= 5.1.6) + activerecord (5.1.6) + activemodel (= 5.1.6) + activesupport (= 5.1.6) arel (~> 8.0) - activesupport (5.1.5) + activesupport (5.1.6) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) + i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) - annotate (2.7.3) + annotate (2.7.4) activerecord (>= 3.2, < 6.0) rake (>= 10.4, < 13.0) arel (8.0.0) ast (2.4.0) - autoprefixer-rails (8.5.0) + autoprefixer-rails (8.6.2) execjs better_errors (2.4.0) coderay (>= 1.0.0) @@ -77,8 +79,8 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - composite_primary_keys (10.0.3) - activerecord (~> 5.1.0, >= 5.1.5) + composite_primary_keys (10.0.4) + activerecord (~> 5.1.0, >= 5.1.6) concurrent-ruby (1.0.5) coveralls (0.8.21) json (>= 1.8, < 3) @@ -96,14 +98,14 @@ GEM erubi (1.7.1) execjs (2.7.0) exifr (1.3.4) - factory_bot (4.8.2) + 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.23) + ffi (1.9.25) fspath (3.1.0) geoip (1.6.4) globalid (0.4.1) @@ -114,7 +116,7 @@ GEM http_accept_language (2.0.5) i18n (0.9.5) concurrent-ruby (~> 1.0) - i18n-js (3.0.5) + i18n-js (3.0.8) i18n (>= 0.6.6, < 2) image_optim (0.26.1) exifr (~> 1.2, >= 1.2.2) @@ -128,6 +130,7 @@ GEM sprockets image_size (1.5.0) in_threads (1.5.0) + jaro_winkler (1.5.1) jquery-rails (4.3.3) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) @@ -147,7 +150,9 @@ GEM libv8 (3.16.14.19) 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.2) activesupport (>= 4.0) @@ -170,7 +175,7 @@ GEM multi_xml (0.6.0) multipart-post (2.0.0) nio4r (2.3.1) - nokogiri (1.8.2) + nokogiri (1.8.3) mini_portile2 (~> 2.3.0) nokogumbo (1.5.0) nokogiri @@ -224,15 +229,16 @@ GEM parser (2.5.1.0) ast (~> 2.4.0) pg (0.21.0) - poltergeist (1.18.0) + poltergeist (1.18.1) capybara (>= 2.1, < 4) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) - powerpack (0.1.1) + powerpack (0.1.2) progress (3.4.0) psych (3.0.2) public_suffix (3.0.2) puma (3.11.4) + quad_tile (1.0.1) r2 (0.2.7) rack (2.0.5) rack-cors (1.0.2) @@ -242,17 +248,17 @@ GEM rack-test (1.0.0) rack (>= 1.0, < 3) rack-uri_sanitizer (0.0.2) - 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) + rails (5.1.6) + actioncable (= 5.1.6) + actionmailer (= 5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) + activemodel (= 5.1.6) + activerecord (= 5.1.6) + activesupport (= 5.1.6) bundler (>= 1.3.0) - railties (= 5.1.5) + railties (= 5.1.6) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.2) actionpack (~> 5.x, >= 5.0.1) @@ -266,9 +272,9 @@ GEM rails-i18n (4.0.2) i18n (~> 0.6) rails (>= 4.0) - railties (5.1.5) - actionpack (= 5.1.5) - activesupport (= 5.1.5) + railties (5.1.6) + actionpack (= 5.1.6) + activesupport (= 5.1.6) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -285,7 +291,8 @@ GEM rack (>= 1.4) rinku (2.0.4) rotp (3.3.1) - rubocop (0.56.0) + rubocop (0.57.2) + jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5) powerpack (~> 0.1) @@ -294,6 +301,7 @@ GEM 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.6.5) crass (~> 1.0.2) @@ -336,20 +344,20 @@ GEM tins (1.16.3) tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.10) + uglifier (4.1.11) execjs (>= 0.3.0, < 3) - unicode-display_width (1.3.2) + unicode-display_width (1.4.0) validates_email_format_of (1.6.3) i18n vendorer (0.1.16) - webmock (3.4.1) + webmock (3.4.2) 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 (3.0.0) + xpath (3.1.0) nokogiri (~> 1.8) PLATFORMS @@ -357,6 +365,7 @@ PLATFORMS DEPENDENCIES SystemTimer (>= 1.1.3) + aasm actionpack-page_caching annotate autoprefixer-rails @@ -366,7 +375,7 @@ DEPENDENCIES canonical-rails capybara (~> 2.13) coffee-rails (~> 4.2) - composite_primary_keys (~> 10.0.0) + composite_primary_keys (~> 10.0.4) coveralls dalli dynamic_form @@ -400,10 +409,11 @@ DEPENDENCIES poltergeist psych puma (~> 3.7) + quad_tile (~> 1.0.1) r2 (~> 0.2.7) rack-cors rack-uri_sanitizer - rails (= 5.1.5) + rails (= 5.1.6) rails-controller-testing rails-i18n (~> 4.0.0) record_tag_helper @@ -420,4 +430,4 @@ DEPENDENCIES webmock BUNDLED WITH - 1.16.1 + 1.16.2