X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c96eb7d1813e082418b63825b00f722b056774f8..98e2884f77c4b5ada7fea0e8fddbc4312006bbf4:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 1679c856a..83d9ae473 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,49 +2,49 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (4.2.4) - actionpack (= 4.2.4) - actionview (= 4.2.4) - activejob (= 4.2.4) + actionmailer (4.2.5) + actionpack (= 4.2.5) + actionview (= 4.2.5) + activejob (= 4.2.5) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.4) - actionview (= 4.2.4) - activesupport (= 4.2.4) + actionpack (4.2.5) + actionview (= 4.2.5) + activesupport (= 4.2.5) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) actionpack-page_caching (1.0.2) actionpack (>= 4.0.0, < 5) - actionview (4.2.4) - activesupport (= 4.2.4) + actionview (4.2.5) + activesupport (= 4.2.5) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.4) - activesupport (= 4.2.4) + activejob (4.2.5) + activesupport (= 4.2.5) globalid (>= 0.3.0) - activemodel (4.2.4) - activesupport (= 4.2.4) + activemodel (4.2.5) + activesupport (= 4.2.5) builder (~> 3.1) - activerecord (4.2.4) - activemodel (= 4.2.4) - activesupport (= 4.2.4) + activerecord (4.2.5) + activemodel (= 4.2.5) + activesupport (= 4.2.5) arel (~> 6.0) - activesupport (4.2.4) + activesupport (4.2.5) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.3.8) + addressable (2.4.0) arel (6.0.3) ast (2.1.0) astrolabe (1.3.1) parser (~> 2.2) - autoprefixer-rails (6.1.0.1) + autoprefixer-rails (6.1.2) execjs json bigdecimal (1.1.0) @@ -58,7 +58,7 @@ GEM climate_control (0.0.3) activesupport (>= 3.0) cliver (0.3.2) - cocaine (0.5.7) + cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) coffee-rails (4.1.0) coffee-script (>= 2.2.0) @@ -70,10 +70,11 @@ GEM colorize (0.7.7) composite_primary_keys (8.1.1) activerecord (~> 4.2.0) - coveralls (0.8.9) + concurrent-ruby (1.0.0) + coveralls (0.8.10) json (~> 1.8) rest-client (>= 1.6.8, < 2) - simplecov (~> 0.10.0) + simplecov (~> 0.11.0) term-ansicolor (~> 1.3) thor (~> 0.19.1) tins (~> 1.6.0) @@ -101,6 +102,12 @@ GEM i18n (0.7.0) i18n-js (3.0.0.rc11) i18n (~> 0.6) + image_optim (0.22.0) + exifr (~> 1.2, >= 1.2.2) + fspath (~> 2.1) + image_size (~> 1.3) + in_threads (~> 1.3) + progress (~> 3.0, >= 3.0.1) image_size (1.4.1) in_threads (1.3.1) jquery-rails (4.0.5) @@ -138,16 +145,16 @@ GEM nokogiri (>= 1.5.9) mail (2.6.3) mime-types (>= 1.16, < 3) - mime-types (2.6.2) + mime-types (2.99) mimemagic (0.3.0) - mini_portile (0.6.2) + mini_portile2 (2.0.0) minitest (5.8.3) multi_json (1.11.2) multi_xml (0.5.5) multipart-post (2.0.0) netrc (0.11.0) - nokogiri (1.6.6.4) - mini_portile (~> 0.6.0) + nokogiri (1.6.7) + mini_portile2 (~> 2.0.0.rc2) nokogumbo (1.4.1) nokogiri oauth (0.4.7) @@ -182,12 +189,6 @@ GEM omniauth-windowslive (0.0.9.1) multi_json (>= 1.0.3) omniauth-oauth2 (~> 1.0) - openstreetmap-image_optim (0.21.0.1) - exifr (~> 1.2, >= 1.2.2) - fspath (~> 2.1) - image_size (~> 1.3) - in_threads (~> 1.3) - progress (~> 3.0, >= 3.0.1) paperclip (4.3.2) activemodel (>= 3.2.0) activesupport (>= 3.2.0) @@ -197,7 +198,7 @@ GEM parser (2.2.3.0) ast (>= 1.1, < 3.0) pg (0.18.4) - poltergeist (1.8.0) + poltergeist (1.8.1) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) @@ -205,7 +206,7 @@ GEM powerpack (0.1.1) progress (3.1.0) psych (2.0.15) - r2 (0.2.5) + r2 (0.2.6) rack (1.6.4) rack-cors (0.4.0) rack-openid (1.3.1) @@ -213,16 +214,17 @@ GEM ruby-openid (>= 2.1.8) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.4) - actionmailer (= 4.2.4) - actionpack (= 4.2.4) - actionview (= 4.2.4) - activejob (= 4.2.4) - activemodel (= 4.2.4) - activerecord (= 4.2.4) - activesupport (= 4.2.4) + rack-uri_sanitizer (0.0.2) + rails (4.2.5) + actionmailer (= 4.2.5) + actionpack (= 4.2.5) + actionview (= 4.2.5) + activejob (= 4.2.5) + activemodel (= 4.2.5) + activerecord (= 4.2.5) + activesupport (= 4.2.5) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.4) + railties (= 4.2.5) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -232,12 +234,12 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.2) loofah (~> 2.0) - rails-i18n (4.0.6) + rails-i18n (4.0.7) i18n (~> 0.7) railties (~> 4.0) - railties (4.2.4) - actionpack (= 4.2.4) - activesupport (= 4.2.4) + railties (4.2.5) + actionpack (= 4.2.5) + activesupport (= 4.2.5) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.0.0) @@ -270,13 +272,14 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - simplecov (0.10.0) + simplecov (0.11.1) docile (~> 1.1.0) json (~> 1.8) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) soap4r-ruby1.9 (2.0.5) - sprockets (3.4.0) + sprockets (3.5.1) + concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (2.3.3) actionpack (>= 3.0) @@ -328,6 +331,7 @@ DEPENDENCIES http_accept_language (~> 2.0.0) httpclient i18n-js (>= 3.0.0.rc10) + image_optim (>= 0.22.0) jquery-rails jshint json @@ -343,14 +347,14 @@ DEPENDENCIES omniauth-google-oauth2 (>= 0.2.7) omniauth-openid omniauth-windowslive - openstreetmap-image_optim (>= 0.21.0.1) paperclip (~> 4.0) pg poltergeist psych r2 rack-cors - rails (= 4.2.4) + rack-uri_sanitizer + rails (= 4.2.5) rails-i18n (~> 4.0.0) redcarpet rinku (>= 1.2.2)