From: Tom Hughes Date: Mon, 11 Feb 2013 21:02:26 +0000 (+0000) Subject: Update to rails 3.2.12 X-Git-Tag: live~5104 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/42cab8d852e2a9107c2ceb2d8b81eaf5ad877c63 Update to rails 3.2.12 --- diff --git a/Gemfile b/Gemfile index fee9abb2d..e395e64fa 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'http://rubygems.org' # Require rails -gem 'rails', '3.2.11' +gem 'rails', '3.2.12' # Require things which have moved to gems in ruby 1.9 gem 'bigdecimal', :platforms => :ruby_19 diff --git a/Gemfile.lock b/Gemfile.lock index 37129758d..a9102e5a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,37 +2,40 @@ GEM remote: http://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (3.2.11) - actionpack (= 3.2.11) + actionmailer (3.2.12) + actionpack (= 3.2.12) mail (~> 2.4.4) - actionpack (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) + 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.2.1) - activemodel (3.2.11) - activesupport (= 3.2.11) + activemodel (3.2.12) + activesupport (= 3.2.12) builder (~> 3.0.0) - activerecord (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) + activerecord (3.2.12) + activemodel (= 3.2.12) + activesupport (= 3.2.12) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) - activesupport (3.2.11) + 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.4) - cocaine (0.4.2) + 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) @@ -40,7 +43,7 @@ GEM coffee-script-source execjs coffee-script-source (1.4.0) - composite_primary_keys (5.0.10) + composite_primary_keys (5.0.12) activerecord (~> 3.2.0, >= 3.2.9) deadlock_retry (1.2.0) dynamic_form (1.1.4) @@ -48,7 +51,7 @@ GEM erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) - faraday (0.8.4) + faraday (0.8.5) multipart-post (~> 1.1) hike (1.2.1) htmlentities (4.3.1) @@ -60,22 +63,23 @@ GEM i18n iconv (0.1) journey (1.0.4) - jquery-rails (2.1.4) + jquery-rails (2.2.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.7.6) + json (1.7.7) jwt (0.1.5) multi_json (>= 1.0) libv8 (3.3.10.4) - libxml-ruby (2.4.0) + libxml-ruby (2.5.0) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) memcached (1.5.0) - mime-types (1.19) - minitest (4.4.0) - multi_json (1.5.0) + mime-types (1.21) + minitest (4.6.0) + multi_json (1.5.1) + multi_xml (0.5.3) multipart-post (1.1.5) nokogiri (1.5.6) oauth (0.4.7) @@ -84,11 +88,12 @@ GEM oauth (~> 0.4.4) oauth2 (>= 0.5.0) rack - oauth2 (0.8.0) + oauth2 (0.9.0) 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) @@ -100,7 +105,7 @@ GEM pg (0.14.1) polyglot (0.3.3) r2 (0.0.3) - rack (1.4.3) + rack (1.4.5) rack-cache (1.2) rack (>= 0.4) rack-cors (0.2.7) @@ -108,29 +113,29 @@ GEM 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.11) - actionmailer (= 3.2.11) - actionpack (= 3.2.11) - activerecord (= 3.2.11) - activeresource (= 3.2.11) - activesupport (= 3.2.11) + 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.11) + railties (= 3.2.12) rails-i18n (0.7.2) i18n (~> 0.5) - railties (3.2.11) - actionpack (= 3.2.11) - activesupport (= 3.2.11) + 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 (10.0.3) - rdoc (3.12) + rdoc (3.12.1) json (~> 1.4) redcarpet (2.2.2) rinku (1.7.2) @@ -138,7 +143,7 @@ GEM sanitize (2.0.3) nokogiri (>= 1.4.4, < 1.6) sass (3.2.5) - sass-rails (3.2.5) + sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) @@ -149,9 +154,9 @@ GEM tilt (~> 1.1, != 1.3.0) therubyracer (0.10.2) libv8 (~> 3.3.10) - thor (0.16.0) + thor (0.17.0) tilt (1.3.3) - timecop (0.5.7) + timecop (0.5.9.2) treetop (1.4.12) polyglot polyglot (>= 0.3.1) @@ -187,7 +192,7 @@ DEPENDENCIES pg r2 rack-cors - rails (= 3.2.11) + rails (= 3.2.12) rails-i18n (>= 0.6.3) redcarpet rinku (>= 1.2.2)