X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/96e1665c01b7add06459d22b3e3491fe4e8e536b..6b9e70573bd21631f0e320c3aadecc7e0be70aa0:/Gemfile.lock?ds=inline diff --git a/Gemfile.lock b/Gemfile.lock index 9861294bd..fee72773e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,40 +2,49 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (4.1.6) - actionpack (= 4.1.6) - actionview (= 4.1.6) + actionmailer (4.2.0) + actionpack (= 4.2.0) + actionview (= 4.2.0) + activejob (= 4.2.0) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.6) - actionview (= 4.1.6) - activesupport (= 4.1.6) - rack (~> 1.5.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.0) + actionview (= 4.2.0) + activesupport (= 4.2.0) + rack (~> 1.6.0) rack-test (~> 0.6.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.1) actionpack-page_caching (1.0.2) actionpack (>= 4.0.0, < 5) - actionview (4.1.6) - activesupport (= 4.1.6) + actionview (4.2.0) + activesupport (= 4.2.0) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.6) - activesupport (= 4.1.6) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.1) + activejob (4.2.0) + activesupport (= 4.2.0) + globalid (>= 0.3.0) + activemodel (4.2.0) + activesupport (= 4.2.0) builder (~> 3.1) - activerecord (4.1.6) - activemodel (= 4.1.6) - activesupport (= 4.1.6) - arel (~> 5.0.0) - activesupport (4.1.6) - i18n (~> 0.6, >= 0.6.9) + activerecord (4.2.0) + activemodel (= 4.2.0) + activesupport (= 4.2.0) + arel (~> 6.0) + activesupport (4.2.0) + i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) - thread_safe (~> 0.1) + thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - arel (5.0.1.20140414130214) - autoprefixer-rails (3.1.0.20140911) + arel (6.0.0) + autoprefixer-rails (4.0.2.2) execjs bigdecimal (1.1.0) builder (3.2.2) - capybara (2.4.3) + capybara (2.4.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -44,61 +53,66 @@ GEM climate_control (0.0.3) activesupport (>= 3.0) cliver (0.3.2) - cocaine (0.5.4) + cocaine (0.5.5) climate_control (>= 0.0.3, < 1.0) - coffee-rails (4.0.1) + coffee-rails (4.1.0) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) coffee-script (2.3.0) coffee-script-source execjs coffee-script-source (1.8.0) - colorize (0.7.3) - composite_primary_keys (7.0.10) - activerecord (~> 4.1.4) - crass (0.2.1) + colorize (0.7.5) + composite_primary_keys (8.0.0) + activerecord (~> 4.2.0) + crass (1.0.1) dalli (2.7.2) deadlock_retry (1.2.0) dynamic_form (1.1.4) erubis (2.7.0) - execjs (2.2.1) - faraday (0.9.0) + execjs (2.2.2) + faraday (0.9.1) multipart-post (>= 1.2, < 3) + globalid (0.3.0) + activesupport (>= 4.1.0) hike (1.2.3) - htmlentities (4.3.2) + htmlentities (4.3.3) http_accept_language (2.0.2) - httpclient (2.4.0) - i18n (0.6.11) + httpclient (2.6.0.1) + i18n (0.7.0) iconv (0.1) - jquery-rails (3.1.2) - railties (>= 3.0, < 5.0) + jquery-rails (4.0.3) + rails-dom-testing (~> 1.0) + railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.1) + json (1.8.2) jsonify (0.3.1) multi_json (~> 1.0) jsonify-rails (0.3.2) actionpack jsonify (< 0.4.0) - jwt (1.0.0) + jwt (1.2.0) kgio (2.9.2) - konacha (3.2.4) + konacha (3.3.0) actionpack (>= 3.1, < 5) capybara colorize railties (>= 3.1, < 5) sprockets - libxml-ruby (2.7.0) - mail (2.6.1) + libxml-ruby (2.8.0) + loofah (2.0.1) + nokogiri (>= 1.5.9) + mail (2.6.3) mime-types (>= 1.16, < 3) - mime-types (2.3) - mini_portile (0.6.0) - minitest (5.4.2) + mime-types (2.4.3) + mini_portile (0.6.2) + minitest (5.5.1) multi_json (1.10.1) multi_xml (0.5.5) multipart-post (2.0.0) - nokogiri (1.6.3.1) - mini_portile (= 0.6.0) - nokogumbo (1.1.12) + nokogiri (1.6.5) + mini_portile (~> 0.6.0) + nokogumbo (1.2.0) nokogiri oauth (0.4.7) oauth-plugin (0.5.1) @@ -116,81 +130,93 @@ GEM rack-openid (~> 1.3) openstreetmap-i18n-js (3.0.0.rc5.3) i18n - paperclip (4.2.0) + paperclip (4.2.1) activemodel (>= 3.0.0) activesupport (>= 3.0.0) cocaine (~> 0.5.3) mime-types - pg (0.17.1) + pg (0.18.1) poltergeist (1.5.1) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) - psych (2.0.6) + psych (2.0.9) r2 (0.2.5) - rack (1.5.2) - rack-cors (0.2.9) + rack (1.6.0) + rack-cors (0.3.1) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) - rails (4.1.6) - actionmailer (= 4.1.6) - actionpack (= 4.1.6) - actionview (= 4.1.6) - activemodel (= 4.1.6) - activerecord (= 4.1.6) - activesupport (= 4.1.6) + rails (4.2.0) + actionmailer (= 4.2.0) + actionpack (= 4.2.0) + actionview (= 4.2.0) + activejob (= 4.2.0) + activemodel (= 4.2.0) + activerecord (= 4.2.0) + activesupport (= 4.2.0) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.6) - sprockets-rails (~> 2.0) + railties (= 4.2.0) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.5) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.1) + loofah (~> 2.0) rails-i18n (4.0.3) i18n (~> 0.6) railties (~> 4.0) - railties (4.1.6) - actionpack (= 4.1.6) - activesupport (= 4.1.6) + railties (4.2.0) + actionpack (= 4.2.0) + activesupport (= 4.2.0) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.3.2) - redcarpet (3.1.2) + rake (10.4.2) + redcarpet (3.2.2) rinku (1.7.3) - ruby-openid (2.5.0) - sanitize (3.0.2) - crass (~> 0.2.0) + ruby-openid (2.6.0) + sanitize (3.1.0) + crass (~> 1.0.1) nokogiri (>= 1.4.4) - nokogumbo (= 1.1.12) - sass (3.2.19) - sass-rails (4.0.3) + nokogumbo (= 1.2.0) + sass (3.4.9) + sass-rails (5.0.1) railties (>= 4.0.0, < 5.0) - sass (~> 3.2.0) - sprockets (~> 2.8, <= 2.11.0) - sprockets-rails (~> 2.0) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (~> 1.1) soap4r-ruby1.9 (2.0.5) - sprockets (2.11.0) + sprockets (2.12.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.1.4) + sprockets-rails (2.2.2) actionpack (>= 3.0) activesupport (>= 3.0) - sprockets (~> 2.8) + sprockets (>= 2.8, < 4.0) thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) timecop (0.7.1) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.5.3) + uglifier (2.7.0) execjs (>= 0.3.0) json (>= 1.8.0) validates_email_format_of (1.6.1) i18n vendorer (0.1.16) - websocket-driver (0.3.4) + websocket-driver (0.5.1) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.1) xpath (2.0.0) nokogiri (~> 1.3) @@ -202,8 +228,8 @@ DEPENDENCIES actionpack-page_caching autoprefixer-rails bigdecimal (~> 1.1.0) - coffee-rails (~> 4.0.0) - composite_primary_keys (~> 7.0.10) + coffee-rails (~> 4.1.0) + composite_primary_keys (~> 8.0.0) dalli deadlock_retry (>= 1.2.0) dynamic_form @@ -227,13 +253,13 @@ DEPENDENCIES psych r2 rack-cors - rails (= 4.1.6) + rails (= 4.2.0) rails-i18n (~> 4.0.0) redcarpet rinku (>= 1.2.2) ruby-openid (>= 2.2.0) sanitize - sass-rails (~> 4.0.3) + sass-rails (~> 5.0) soap4r-ruby1.9 timecop uglifier (>= 1.3.0)