From 49647c1df7035a6e8a70631765b3fc7612268e27 Mon Sep 17 00:00:00 2001 From: Franco Catena Date: Mon, 21 Nov 2011 15:28:17 -0300 Subject: [PATCH] =?UTF-8?q?Actualizaci=C3=B3n=20a=20Rails=203.1.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 2 +- Gemfile.lock | 56 ++++++++++++++++++++++++++-------------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Gemfile b/Gemfile index 5f38369..da1a68c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '3.1.2' +gem 'rails', '3.1.3' gem 'pg' gem 'authlogic' diff --git a/Gemfile.lock b/Gemfile.lock index 16ad433..6c1c711 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,12 +2,12 @@ GEM remote: http://rubygems.org/ specs: RedCloth (4.2.8) - actionmailer (3.1.2) - actionpack (= 3.1.2) + actionmailer (3.1.3) + actionpack (= 3.1.3) mail (~> 2.3.0) - actionpack (3.1.2) - activemodel (= 3.1.2) - activesupport (= 3.1.2) + actionpack (3.1.3) + activemodel (= 3.1.3) + activesupport (= 3.1.3) builder (~> 3.0.0) erubis (~> 2.7.0) i18n (~> 0.6) @@ -15,20 +15,20 @@ GEM rack-cache (~> 1.1) rack-mount (~> 0.8.2) rack-test (~> 0.6.1) - sprockets (~> 2.1.0) - activemodel (3.1.2) - activesupport (= 3.1.2) + sprockets (~> 2.0.3) + activemodel (3.1.3) + activesupport (= 3.1.3) builder (~> 3.0.0) i18n (~> 0.6) - activerecord (3.1.2) - activemodel (= 3.1.2) - activesupport (= 3.1.2) + activerecord (3.1.3) + activemodel (= 3.1.3) + activesupport (= 3.1.3) arel (~> 2.2.1) tzinfo (~> 0.3.29) - activeresource (3.1.2) - activemodel (= 3.1.2) - activesupport (= 3.1.2) - activesupport (3.1.2) + activeresource (3.1.3) + activemodel (= 3.1.3) + activesupport (= 3.1.3) + activesupport (3.1.3) multi_json (~> 1.0) ansi (1.4.1) archive-tar-minitar (0.5.2) @@ -61,7 +61,7 @@ GEM highline (1.6.8) hike (1.2.1) i18n (0.6.0) - jquery-rails (1.0.17) + jquery-rails (1.0.18) railties (~> 3.0) thor (~> 0.14) json (1.6.1) @@ -104,17 +104,17 @@ GEM rack rack-test (0.6.1) rack (>= 1.0) - rails (3.1.2) - actionmailer (= 3.1.2) - actionpack (= 3.1.2) - activerecord (= 3.1.2) - activeresource (= 3.1.2) - activesupport (= 3.1.2) + rails (3.1.3) + actionmailer (= 3.1.3) + actionpack (= 3.1.3) + activerecord (= 3.1.3) + activeresource (= 3.1.3) + activesupport (= 3.1.3) bundler (~> 1.0) - railties (= 3.1.2) - railties (3.1.2) - actionpack (= 3.1.2) - activesupport (= 3.1.2) + railties (= 3.1.3) + railties (3.1.3) + actionpack (= 3.1.3) + activesupport (= 3.1.3) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -138,7 +138,7 @@ GEM railties (~> 3.1.0) sass (~> 3.1.10) tilt (~> 1.3.2) - sprockets (2.1.0) + sprockets (2.0.3) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) @@ -173,7 +173,7 @@ DEPENDENCIES paper_trail paperclip pg - rails (= 3.1.2) + rails (= 3.1.3) ruby-debug19 sass-rails therubyracer