From 0aa7d045a7c27c83717c3448b7594c3d56ab18e4 Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Sun, 28 Jul 2013 14:04:33 +0200 Subject: [PATCH] update to Rails 3.2.14 --- Gemfile.lock | 88 +++++++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 43 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a0fa614b..450fbef8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,12 +9,12 @@ GEM specs: RedCloth (4.2.9) aasm (3.0.19) - actionmailer (3.2.13) - actionpack (= 3.2.13) - mail (~> 2.5.3) - actionpack (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) + actionmailer (3.2.14) + actionpack (= 3.2.14) + mail (~> 2.5.4) + actionpack (3.2.14) + activemodel (= 3.2.14) + activesupport (= 3.2.14) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -22,19 +22,19 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.13) - activesupport (= 3.2.13) + activemodel (3.2.14) + activesupport (= 3.2.14) builder (~> 3.0.0) - activerecord (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) + activerecord (3.2.14) + activemodel (= 3.2.14) + activesupport (= 3.2.14) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - activesupport (3.2.13) - i18n (= 0.6.1) + activeresource (3.2.14) + activemodel (= 3.2.14) + activesupport (= 3.2.14) + activesupport (3.2.14) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) acts_as_list (0.2.0) activerecord (>= 3.0) @@ -43,7 +43,7 @@ GEM childprocess (>= 0.3.6) cucumber (>= 1.1.1) rspec-expectations (>= 2.7.0) - bcrypt-ruby (3.0.1) + bcrypt-ruby (3.1.1) bluecloth (2.2.0) builder (3.0.4) bullet (4.6.0) @@ -62,12 +62,13 @@ GEM coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.6.2) - cucumber (1.3.2) + coffee-script-source (1.6.3) + cucumber (1.3.5) builder (>= 2.1.2) diff-lcs (>= 1.1.3) gherkin (~> 2.12.0) - multi_json (~> 1.3) + multi_json (~> 1.7.5) + multi_test (>= 0.0.2) cucumber-rails (1.3.1) capybara (>= 1.1.2) cucumber (>= 1.2.0) @@ -92,7 +93,7 @@ GEM multi_json (~> 1.3) hike (1.2.3) htmlentities (4.3.1) - i18n (0.6.1) + i18n (0.6.4) journey (1.0.4) jquery-rails (2.3.0) railties (>= 3.0, < 5.0) @@ -103,49 +104,50 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.23) - mini_portile (0.5.0) + mini_portile (0.5.1) multi_json (1.7.7) - mysql2 (0.3.11) + multi_test (0.0.2) + mysql2 (0.3.13) nokogiri (1.6.0) mini_portile (~> 0.5.0) polyglot (0.3.3) rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-mini-profiler (0.1.26) + rack-mini-profiler (0.1.27) rack (>= 1.1.3) rack-ssl (1.3.3) rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.13) - actionmailer (= 3.2.13) - actionpack (= 3.2.13) - activerecord (= 3.2.13) - activeresource (= 3.2.13) - activesupport (= 3.2.13) + rails (3.2.14) + actionmailer (= 3.2.14) + actionpack (= 3.2.14) + activerecord (= 3.2.14) + activeresource (= 3.2.14) + activesupport (= 3.2.14) bundler (~> 1.0) - railties (= 3.2.13) + railties (= 3.2.14) rails_autolink (1.1.0) rails (> 3.1) - railties (3.2.13) - actionpack (= 3.2.13) - activesupport (= 3.2.13) + railties (3.2.14) + actionpack (= 3.2.14) + activesupport (= 3.2.14) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.0.4) + rake (10.1.0) rdoc (3.12.2) json (~> 1.4) ref (1.0.5) - rspec-expectations (2.13.0) + rspec-expectations (2.14.0) diff-lcs (>= 1.1.3, < 2.0) rubyzip (0.9.9) - safe_yaml (0.9.3) - sanitize (2.0.4) - nokogiri (~> 1.6.0) - sass (3.2.9) + safe_yaml (0.9.4) + sanitize (2.0.6) + nokogiri (>= 1.4.4) + sass (3.2.10) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) @@ -173,8 +175,8 @@ GEM ref thor (0.18.1) tilt (1.4.1) - timecop (0.6.1) - tolk (1.3.9) + timecop (0.6.2.2) + tolk (1.3.11) safe_yaml (~> 0.8) will_paginate treetop (1.4.14) @@ -189,7 +191,7 @@ GEM will_paginate (3.0.4) xpath (2.0.0) nokogiri (~> 1.3) - yard (0.8.6.1) + yard (0.8.7) PLATFORMS ruby