From 089865270a00c9db7570178ae0640da12e8b7b13 Mon Sep 17 00:00:00 2001 From: Vokhmin Alexey V Date: Mon, 18 Mar 2013 19:13:43 +0400 Subject: [PATCH] #29: update rails --- Gemfile | 2 +- Gemfile.lock | 58 ++++++++++++++++++++++++++-------------------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Gemfile b/Gemfile index 873d7d56b..983ce838d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '3.2.12' #, :git => 'git://github.com/rails/rails.git' +gem 'rails', '3.2.13.rc2' #, :git => 'git://github.com/rails/rails.git' gem 'pg', '~> 0.14.0' # gem 'silent-postgres', :git => 'git://github.com/dolzenko/silent-postgres.git' #'~> 0.1.1' diff --git a/Gemfile.lock b/Gemfile.lock index eb54e4f9e..8ed744058 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,12 +25,12 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.2.9) - actionmailer (3.2.12) - actionpack (= 3.2.12) - mail (~> 2.4.4) - actionpack (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) + actionmailer (3.2.13.rc2) + actionpack (= 3.2.13.rc2) + mail (~> 2.5.3) + actionpack (3.2.13.rc2) + activemodel (= 3.2.13.rc2) + activesupport (= 3.2.13.rc2) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -38,19 +38,19 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.12) - activesupport (= 3.2.12) + activemodel (3.2.13.rc2) + activesupport (= 3.2.13.rc2) builder (~> 3.0.0) - activerecord (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) + activerecord (3.2.13.rc2) + activemodel (= 3.2.13.rc2) + activesupport (= 3.2.13.rc2) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) - activesupport (3.2.12) - i18n (~> 0.6) + activeresource (3.2.13.rc2) + activemodel (= 3.2.13.rc2) + activesupport (= 3.2.13.rc2) + activesupport (3.2.13.rc2) + i18n (= 0.6.1) multi_json (~> 1.0) airbrake (3.1.8) activesupport @@ -150,7 +150,7 @@ GEM highline (1.6.16) hike (1.2.1) hirb (0.7.1) - i18n (0.6.4) + i18n (0.6.1) jbuilder (0.8.3) activesupport (>= 3.0.0) journey (1.0.4) @@ -162,7 +162,7 @@ GEM libv8 (3.3.10.4) macaddr (1.6.1) systemu (~> 2.5.0) - mail (2.4.4) + mail (2.5.3) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -229,14 +229,14 @@ GEM rack (>= 1.0) rack-throttle (0.3.0) rack (>= 1.0.0) - rails (3.2.12) - actionmailer (= 3.2.12) - actionpack (= 3.2.12) - activerecord (= 3.2.12) - activeresource (= 3.2.12) - activesupport (= 3.2.12) + rails (3.2.13.rc2) + actionmailer (= 3.2.13.rc2) + actionpack (= 3.2.13.rc2) + activerecord (= 3.2.13.rc2) + activeresource (= 3.2.13.rc2) + activesupport (= 3.2.13.rc2) bundler (~> 1.0) - railties (= 3.2.12) + railties (= 3.2.13.rc2) rails-backbone (0.7.2) coffee-script (~> 2.2.0) ejs (~> 1.0.0) @@ -245,9 +245,9 @@ GEM railties (>= 3.0.0) rails3-jquery-autocomplete (1.0.11) rails (~> 3.0) - railties (3.2.12) - actionpack (= 3.2.12) - activesupport (= 3.2.12) + railties (3.2.13.rc2) + actionpack (= 3.2.13.rc2) + activesupport (= 3.2.13.rc2) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -410,7 +410,7 @@ DEPENDENCIES perform_later (~> 1.3.0) pg (~> 0.14.0) rack-throttle - rails (= 3.2.12) + rails (= 3.2.13.rc2) rails-backbone (~> 0.7.2) rails3-generators rails3-jquery-autocomplete (~> 1.0.7)