From 433d2278e0a9228ba8142dfb6b69df900654158d Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 14 Nov 2012 13:14:46 +0200 Subject: [PATCH] Rails up to 3.2.9 --- Gemfile | 2 +- Gemfile.lock | 67 ++++++++++++++++++++++++++++++------------------------------ 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/Gemfile b/Gemfile index 475b6e8e1..047555a04 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ def linux_only(require_as) RUBY_PLATFORM.include?('linux') && require_as end -gem "rails", "3.2.8" +gem "rails", "3.2.9" # Supported DBs gem "sqlite3", group: :sqlite diff --git a/Gemfile.lock b/Gemfile.lock index b67f5856e..cc6a13beb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,31 +51,31 @@ GIT GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.8) - actionpack (= 3.2.8) + actionmailer (3.2.9) + actionpack (= 3.2.9) mail (~> 2.4.4) - actionpack (3.2.8) - activemodel (= 3.2.8) - activesupport (= 3.2.8) + actionpack (3.2.9) + activemodel (= 3.2.9) + activesupport (= 3.2.9) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) rack (~> 1.4.0) 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.9) + activesupport (= 3.2.9) builder (~> 3.0.0) - activerecord (3.2.8) - activemodel (= 3.2.8) - activesupport (= 3.2.8) + activerecord (3.2.9) + activemodel (= 3.2.9) + activesupport (= 3.2.9) 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.9) + activemodel (= 3.2.9) + activesupport (= 3.2.9) + activesupport (3.2.9) i18n (~> 0.6) multi_json (~> 1.0) acts-as-taggable-on (2.3.1) @@ -86,7 +86,7 @@ GEM bcrypt-ruby (3.0.1) blankslate (2.1.2.4) bootstrap-sass (2.0.4.0) - builder (3.0.2) + builder (3.0.4) capybara (1.1.2) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -227,7 +227,7 @@ GEM mime-types (1.19) modernizr (2.5.3) sprockets (~> 2.0) - multi_json (1.3.6) + multi_json (1.3.7) multi_xml (0.5.1) multipart-post (1.1.5) mysql2 (0.3.11) @@ -283,28 +283,28 @@ GEM rack rack-ssl (1.3.2) rack - rack-test (0.6.1) + 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.9) + actionmailer (= 3.2.9) + actionpack (= 3.2.9) + activerecord (= 3.2.9) + activeresource (= 3.2.9) + activesupport (= 3.2.9) bundler (~> 1.0) - railties (= 3.2.8) + railties (= 3.2.9) rails-dev-tweaks (0.6.1) actionpack (~> 3.1) railties (~> 3.1) - railties (3.2.8) - actionpack (= 3.2.8) - activesupport (= 3.2.8) + railties (3.2.9) + actionpack (= 3.2.9) + activesupport (= 3.2.9) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) raindrops (0.9.0) - rake (0.9.2.2) + rake (10.0.0) raphael-rails (1.5.2) rb-fsevent (0.9.1) rb-inotify (0.8.8) @@ -375,8 +375,9 @@ GEM capybara (~> 1) railties (>= 3) spinach (>= 0.4) - sprockets (2.1.3) + sprockets (2.2.1) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.6) @@ -390,10 +391,10 @@ GEM rack (>= 1.0.0) thor (0.16.0) tilt (1.3.3) - treetop (1.4.10) + treetop (1.4.12) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.33) + tzinfo (0.3.35) uglifier (1.0.3) execjs (>= 0.3.0) multi_json (>= 1.0.2) @@ -468,7 +469,7 @@ DEPENDENCIES pygments.rb (= 0.3.1) quiet_assets (= 1.0.1) rack-mini-profiler - rails (= 3.2.8) + rails (= 3.2.9) rails-dev-tweaks raphael-rails (= 1.5.2) rb-fsevent -- 2.11.0