X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/00375024263970a43ea7d39e3c65dfd0f32e8869..5cf10fb13ba166f62a481a89b382ed5b964d6d9c:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 23eeceb19..5a7a2bba8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,98 +2,103 @@ GEM remote: http://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (3.2.8) - actionpack (= 3.2.8) + actionmailer (3.2.12) + actionpack (= 3.2.12) mail (~> 2.4.4) - actionpack (3.2.8) - activemodel (= 3.2.8) - activesupport (= 3.2.8) + actionpack (3.2.12) + activemodel (= 3.2.12) + activesupport (= 3.2.12) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) - rack (~> 1.4.0) + rack (~> 1.4.5) rack-cache (~> 1.2) rack-test (~> 0.6.1) - sprockets (~> 2.1.3) - activemodel (3.2.8) - activesupport (= 3.2.8) + sprockets (~> 2.2.1) + activemodel (3.2.12) + activesupport (= 3.2.12) builder (~> 3.0.0) - activerecord (3.2.8) - activemodel (= 3.2.8) - activesupport (= 3.2.8) + activerecord (3.2.12) + activemodel (= 3.2.12) + activesupport (= 3.2.12) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.8) - activemodel (= 3.2.8) - activesupport (= 3.2.8) - activesupport (3.2.8) + activeresource (3.2.12) + activemodel (= 3.2.12) + activesupport (= 3.2.12) + activesupport (3.2.12) i18n (~> 0.6) multi_json (~> 1.0) arel (3.0.2) bigdecimal (1.1.0) - builder (3.0.3) - cocaine (0.4.0) + builder (3.0.4) + climate_control (0.0.3) + activesupport (>= 3.0) + cocaine (0.5.1) + climate_control (>= 0.0.3, < 1.0) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.3.3) - composite_primary_keys (5.0.9) - activerecord (~> 3.2.0, >= 3.2.8) + coffee-script-source (1.6.2) + composite_primary_keys (5.0.12) + activerecord (~> 3.2.0, >= 3.2.9) deadlock_retry (1.2.0) dynamic_form (1.1.4) ejs (1.1.1) erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) - faraday (0.8.4) + faraday (0.8.7) multipart-post (~> 1.1) hike (1.2.1) htmlentities (4.3.1) http_accept_language (1.0.2) httpauth (0.2.0) - httpclient (2.3.0.1) - i18n (0.6.1) - i18n-js (3.0.0.rc2) + httpclient (2.3.3) + i18n (0.6.4) + i18n-js (3.0.0.rc5) i18n iconv (0.1) journey (1.0.4) - jquery-rails (2.1.3) - railties (>= 3.1.0, < 5.0) - thor (~> 0.14) - json (1.7.5) + jquery-rails (2.2.1) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.7.7) jsonify (0.3.1) multi_json (~> 1.0) jsonify-rails (0.3.2) actionpack jsonify (< 0.4.0) - jwt (0.1.5) - multi_json (>= 1.0) + jwt (0.1.8) + multi_json (>= 1.5) libv8 (3.3.10.4) - libxml-ruby (2.3.3) + libxml-ruby (2.6.0) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - memcached (1.4.6) - mime-types (1.19) - minitest (4.1.0) - multi_json (1.3.6) - multipart-post (1.1.5) - nokogiri (1.5.5) + memcached (1.5.0) + mime-types (1.22) + minitest (4.7.0) + multi_json (1.7.2) + multi_xml (0.5.3) + multipart-post (1.2.0) + nokogiri (1.5.9) oauth (0.4.7) oauth-plugin (0.4.1) multi_json oauth (~> 0.4.4) oauth2 (>= 0.5.0) rack - oauth2 (0.8.0) + oauth2 (0.9.1) faraday (~> 0.8) httpauth (~> 0.1) jwt (~> 0.1.4) multi_json (~> 1.0) + multi_xml (~> 0.5) rack (~> 1.2) open_id_authentication (1.1.0) rack-openid (~> 1.3) @@ -102,61 +107,65 @@ GEM activesupport (>= 2.3.2) cocaine (>= 0.0.2) mime-types - pg (0.14.1) + pg (0.15.0) polyglot (0.3.3) - rack (1.4.1) + r2 (0.1.0) + rack (1.4.5) rack-cache (1.2) rack (>= 0.4) + rack-cors (0.2.7) + rack rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - rack-ssl (1.3.2) + rack-ssl (1.3.3) rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.8) - actionmailer (= 3.2.8) - actionpack (= 3.2.8) - activerecord (= 3.2.8) - activeresource (= 3.2.8) - activesupport (= 3.2.8) + rails (3.2.12) + actionmailer (= 3.2.12) + actionpack (= 3.2.12) + activerecord (= 3.2.12) + activeresource (= 3.2.12) + activesupport (= 3.2.12) bundler (~> 1.0) - railties (= 3.2.8) - rails-i18n (0.6.6) + railties (= 3.2.12) + rails-i18n (0.7.3) i18n (~> 0.5) - railties (3.2.8) - actionpack (= 3.2.8) - activesupport (= 3.2.8) + railties (3.2.12) + actionpack (= 3.2.12) + activesupport (= 3.2.12) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (0.9.2.2) - rdoc (3.12) + rake (10.0.4) + rdoc (3.12.2) json (~> 1.4) - redcarpet (2.2.1) + redcarpet (2.2.2) rinku (1.7.2) - ruby-openid (2.2.1) + ruby-openid (2.2.3) sanitize (2.0.3) nokogiri (>= 1.4.4, < 1.6) - sass (3.2.1) - sass-rails (3.2.5) + sass (3.2.7) + sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - sprockets (2.1.3) + sprockets (2.2.2) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) therubyracer (0.10.2) libv8 (~> 3.3.10) - thor (0.16.0) - tilt (1.3.3) - timecop (0.5.2) - treetop (1.4.11) + thor (0.18.1) + tilt (1.3.6) + timecop (0.6.1) + treetop (1.4.12) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.33) + tzinfo (0.3.37) uglifier (1.3.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) @@ -169,7 +178,7 @@ DEPENDENCIES SystemTimer (>= 1.1.3) bigdecimal coffee-rails (~> 3.2.1) - composite_primary_keys (>= 5.0.9) + composite_primary_keys (>= 5.0.10) deadlock_retry (>= 1.2.0) dynamic_form ejs @@ -177,7 +186,7 @@ DEPENDENCIES http_accept_language (>= 1.0.2) httpclient i18n-js (>= 3.0.0.rc2) - iconv + iconv (= 0.1) jquery-rails jsonify-rails libxml-ruby (>= 2.0.5) @@ -187,14 +196,16 @@ DEPENDENCIES open_id_authentication (>= 1.1.0) paperclip (~> 2.0) pg - rails (= 3.2.8) + r2 + rack-cors + rails (= 3.2.12) rails-i18n (>= 0.6.3) redcarpet rinku (>= 1.2.2) ruby-openid (>= 2.2.0) sanitize sass-rails (~> 3.2.3) - therubyracer + therubyracer (~> 0.10.2) timecop uglifier (>= 1.0.3) validates_email_format_of (>= 1.5.1)