From 81db9b803300d2d0d222f875a19b98ac473e0274 Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Sun, 2 Mar 2014 14:16:26 +0100 Subject: [PATCH] update rails --- Gemfile.lock | 98 +++++++++++++++++++++++++++------------------------- 1 file changed, 50 insertions(+), 48 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0f715f4a..5d82282d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,13 +8,13 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.2.9) - aasm (3.0.25) - actionmailer (3.2.16) - actionpack (= 3.2.16) + aasm (3.1.1) + actionmailer (3.2.17) + actionpack (= 3.2.17) mail (~> 2.5.4) - actionpack (3.2.16) - activemodel (= 3.2.16) - activesupport (= 3.2.16) + actionpack (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -22,40 +22,42 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.16) - activesupport (= 3.2.16) + activemodel (3.2.17) + activesupport (= 3.2.17) builder (~> 3.0.0) - activerecord (3.2.16) - activemodel (= 3.2.16) - activesupport (= 3.2.16) + activerecord (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.16) - activemodel (= 3.2.16) - activesupport (= 3.2.16) - activesupport (3.2.16) + activeresource (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) + activesupport (3.2.17) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - acts_as_list (0.3.0) + acts_as_list (0.4.0) activerecord (>= 3.0) arel (3.0.3) - aruba (0.5.3) + aruba (0.5.4) childprocess (>= 0.3.6) cucumber (>= 1.1.1) rspec-expectations (>= 2.7.0) - bcrypt-ruby (3.1.2) + bcrypt (3.1.7) + bcrypt-ruby (3.1.5) + bcrypt (>= 3.1.3) bluecloth (2.2.0) builder (3.0.4) - bullet (4.7.1) + bullet (4.8.0) activesupport uniform_notifier (>= 1.4.0) - capybara (2.2.0) + capybara (2.2.1) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - childprocess (0.3.9) + childprocess (0.5.1) ffi (~> 1.0, >= 1.0.11) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -63,8 +65,8 @@ GEM coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.6.3) - cucumber (1.3.10) + coffee-script-source (1.7.0) + cucumber (1.3.11) builder (>= 2.1.2) diff-lcs (>= 1.1.3) gherkin (~> 2.12) @@ -77,13 +79,13 @@ GEM rails (>= 3.0.0) database_cleaner (0.9.1) diff-lcs (1.2.5) - docile (1.1.1) + docile (1.1.3) erubis (2.7.0) execjs (2.0.2) - factory_girl (4.2.0) + factory_girl (4.4.0) activesupport (>= 3.0.0) - factory_girl_rails (4.2.1) - factory_girl (~> 4.2.0) + factory_girl_rails (4.4.0) + factory_girl (~> 4.4.0) railties (>= 3.0.0) ffi (1.9.3) formatize (1.1.0) @@ -106,34 +108,34 @@ GEM treetop (~> 1.4.8) mime-types (1.25.1) mini_portile (0.5.2) - multi_json (1.8.2) + multi_json (1.8.4) multi_test (0.0.3) - mysql2 (0.3.14) + mysql2 (0.3.15) nokogiri (1.6.1) mini_portile (~> 0.5.0) - polyglot (0.3.3) + polyglot (0.3.4) rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-mini-profiler (0.1.31) + rack-mini-profiler (0.9.0) rack (>= 1.1.3) rack-ssl (1.3.3) rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.16) - actionmailer (= 3.2.16) - actionpack (= 3.2.16) - activerecord (= 3.2.16) - activeresource (= 3.2.16) - activesupport (= 3.2.16) + rails (3.2.17) + actionmailer (= 3.2.17) + actionpack (= 3.2.17) + activerecord (= 3.2.17) + activeresource (= 3.2.17) + activesupport (= 3.2.17) bundler (~> 1.0) - railties (= 3.2.16) + railties (= 3.2.17) rails_autolink (1.1.5) rails (> 3.1) - railties (3.2.16) - actionpack (= 3.2.16) - activesupport (= 3.2.16) + railties (3.2.17) + actionpack (= 3.2.17) + activesupport (= 3.2.17) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -142,19 +144,19 @@ GEM rdoc (3.12.2) json (~> 1.4) ref (1.0.5) - rspec-expectations (2.14.4) + rspec-expectations (2.14.5) diff-lcs (>= 1.1.3, < 2.0) rubyzip (1.1.0) safe_yaml (0.9.7) - sanitize (2.0.6) + sanitize (2.1.0) nokogiri (>= 1.4.4) - sass (3.2.13) + sass (3.2.14) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.39.0) - childprocess (>= 0.2.5) + selenium-webdriver (2.40.0) + childprocess (>= 0.5.0) multi_json (~> 1.0) rubyzip (~> 1.0) websocket (~> 1.0.4) @@ -168,11 +170,11 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.8) + sqlite3 (1.3.9) swf_fu (2.0.4) coffee-script rails (>= 3.1) - therubyracer (0.12.0) + therubyracer (0.12.1) libv8 (~> 3.16.14.0) ref thor (0.18.1)