X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7ce77006fad5205dc85206d5841657967c6f16c3..31c80f66463a143c12b3d6e1395a034d11a812ba:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index dc7b3d74e..3d7502e23 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,38 +2,38 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (4.2.3) - actionpack (= 4.2.3) - actionview (= 4.2.3) - activejob (= 4.2.3) + actionmailer (4.2.4) + actionpack (= 4.2.4) + actionview (= 4.2.4) + activejob (= 4.2.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.3) - actionview (= 4.2.3) - activesupport (= 4.2.3) + actionpack (4.2.4) + actionview (= 4.2.4) + activesupport (= 4.2.4) 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.3) - activesupport (= 4.2.3) + actionview (4.2.4) + activesupport (= 4.2.4) 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.3) - activesupport (= 4.2.3) + activejob (4.2.4) + activesupport (= 4.2.4) globalid (>= 0.3.0) - activemodel (4.2.3) - activesupport (= 4.2.3) + activemodel (4.2.4) + activesupport (= 4.2.4) builder (~> 3.1) - activerecord (4.2.3) - activemodel (= 4.2.3) - activesupport (= 4.2.3) + activerecord (4.2.4) + activemodel (= 4.2.4) + activesupport (= 4.2.4) arel (~> 6.0) - activesupport (4.2.3) + activesupport (4.2.4) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -43,12 +43,12 @@ GEM ast (2.1.0) astrolabe (1.3.1) parser (~> 2.2) - autoprefixer-rails (5.2.1.2) + autoprefixer-rails (6.0.3) execjs json bigdecimal (1.1.0) builder (3.2.2) - capybara (2.4.4) + capybara (2.5.0) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -84,12 +84,13 @@ GEM dynamic_form (1.1.4) erubis (2.7.0) execjs (2.6.0) + exifr (1.2.3.1) faraday (0.9.1) multipart-post (>= 1.2, < 3) + fspath (2.1.1) globalid (0.3.6) activesupport (>= 4.1.0) hashie (3.4.2) - hike (1.2.3) htmlentities (4.3.4) http-cookie (1.0.2) domain_name (~> 0.5) @@ -98,7 +99,15 @@ GEM i18n (0.7.0) i18n-js (3.0.0.rc11) i18n (~> 0.6) - jquery-rails (4.0.4) + image_optim (0.21.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) rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -113,8 +122,8 @@ GEM actionpack jsonify (< 0.4.0) jwt (1.5.1) - kgio (2.9.3) - konacha (3.5.1) + kgio (2.10.0) + konacha (3.7.0) actionpack (>= 3.1, < 5) capybara colorize @@ -131,7 +140,7 @@ GEM nokogiri (>= 1.5.9) mail (2.6.3) mime-types (>= 1.16, < 3) - mime-types (2.6.1) + mime-types (2.6.2) mimemagic (0.3.0) mini_portile (0.6.2) minitest (5.8.0) @@ -174,7 +183,7 @@ GEM multi_json (~> 1.3) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.1.1) - paperclip (4.3.0) + paperclip (4.3.1) activemodel (>= 3.2.0) activesupport (>= 3.2.0) cocaine (~> 0.5.5) @@ -182,14 +191,15 @@ GEM mimemagic (= 0.3.0) parser (2.2.2.6) ast (>= 1.1, < 3.0) - pg (0.18.2) + pg (0.18.3) poltergeist (1.6.0) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) powerpack (0.1.1) - psych (2.0.13) + progress (3.1.0) + psych (2.0.15) r2 (0.2.5) rack (1.6.4) rack-cors (0.4.0) @@ -198,16 +208,16 @@ GEM ruby-openid (>= 2.1.8) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.3) - actionmailer (= 4.2.3) - actionpack (= 4.2.3) - actionview (= 4.2.3) - activejob (= 4.2.3) - activemodel (= 4.2.3) - activerecord (= 4.2.3) - activesupport (= 4.2.3) + 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) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.3) + railties (= 4.2.4) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -217,12 +227,12 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.2) loofah (~> 2.0) - rails-i18n (4.0.4) + rails-i18n (4.0.5) i18n (~> 0.6) railties (~> 4.0) - railties (4.2.3) - actionpack (= 4.2.3) - activesupport (= 4.2.3) + railties (4.2.4) + actionpack (= 4.2.4) + activesupport (= 4.2.4) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.0.0) @@ -235,7 +245,7 @@ GEM mime-types (>= 1.16, < 3.0) netrc (~> 0.7) rinku (1.7.3) - rubocop (0.33.0) + rubocop (0.34.1) astrolabe (~> 1.3) parser (>= 2.2.2.5, < 3.0) powerpack (~> 0.1) @@ -247,25 +257,22 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (= 1.4.1) - sass (3.4.16) - sass-rails (5.0.3) + sass (3.4.18) + sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) - tilt (~> 1.1) + tilt (>= 1.1, < 3) simplecov (0.10.0) docile (~> 1.1.0) json (~> 1.8) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) soap4r-ruby1.9 (2.0.5) - sprockets (2.12.4) - hike (~> 1.2) - multi_json (~> 1.0) + sprockets (3.3.4) rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.3.2) + sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) @@ -276,12 +283,12 @@ GEM ref thor (0.19.1) thread_safe (0.3.5) - tilt (1.4.1) + tilt (2.0.1) timecop (0.8.0) tins (1.6.0) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.7.1) + uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) unf (0.1.4) @@ -315,6 +322,7 @@ DEPENDENCIES http_accept_language (~> 2.0.0) httpclient i18n-js (>= 3.0.0.rc10) + image_optim jquery-rails jshint json @@ -336,7 +344,7 @@ DEPENDENCIES psych r2 rack-cors - rails (= 4.2.3) + rails (= 4.2.4) rails-i18n (~> 4.0.0) redcarpet rinku (>= 1.2.2) @@ -344,7 +352,6 @@ DEPENDENCIES sanitize sass-rails (~> 5.0) soap4r-ruby1.9 - sprockets (~> 2.12.3) timecop uglifier (>= 1.3.0) validates_email_format_of (>= 1.5.1)