From 5c30f134a1db726c138f2c15b7006a92f6ec7e0d Mon Sep 17 00:00:00 2001 From: Travis Grathwell Date: Tue, 19 Mar 2013 00:55:48 -0700 Subject: [PATCH] Upgrading Rails to 3.2.13 --- Gemfile | 4 ++-- Gemfile.lock | 64 ++++++++++++++++++++++++++-------------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Gemfile b/Gemfile index 42ade40e4..705a1c2b4 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '3.2.12' +gem 'rails', '3.2.13' gem 'devise', '~> 2.2.3' gem 'thin' gem 'jquery-rails' @@ -48,4 +48,4 @@ group :test do gem "database_cleaner" gem 'shoulda-matchers' gem "faker" -end \ No newline at end of file +end diff --git a/Gemfile.lock b/Gemfile.lock index c03be0698..0a61eaf4e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: http://rubygems.org/ specs: - 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) + actionpack (= 3.2.13) + mail (~> 2.5.3) + actionpack (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -16,19 +16,19 @@ GEM sprockets (~> 2.2.1) active_hash (0.9.13) activesupport (>= 2.2.2) - activemodel (3.2.12) - activesupport (= 3.2.12) + activemodel (3.2.13) + activesupport (= 3.2.13) builder (~> 3.0.0) - activerecord (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) + activerecord (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) 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) + activemodel (= 3.2.13) + activesupport (= 3.2.13) + activesupport (3.2.13) + i18n (= 0.6.1) multi_json (~> 1.0) addressable (2.3.3) arel (3.0.2) @@ -96,7 +96,7 @@ GEM hike (1.2.1) http_parser.rb (0.5.3) httpauth (0.2.0) - i18n (0.6.4) + i18n (0.6.1) journey (1.0.4) jquery-datatables-rails (1.11.2) jquery-rails @@ -113,7 +113,7 @@ GEM addressable (~> 2.3) listen (0.7.3) lumberjack (1.0.2) - mail (2.4.4) + mail (2.5.3) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -125,7 +125,7 @@ GEM modernizr_rails (2.5.3) railties (~> 3.0) thor (~> 0.14) - multi_json (1.7.0) + multi_json (1.7.1) multipart-post (1.2.0) nested_form (0.3.1) nokogiri (1.5.6) @@ -166,17 +166,17 @@ GEM rack rack-test (0.6.2) rack (>= 1.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) + actionmailer (= 3.2.13) + actionpack (= 3.2.13) + activerecord (= 3.2.13) + activeresource (= 3.2.13) + activesupport (= 3.2.13) bundler (~> 1.0) - railties (= 3.2.12) - railties (3.2.12) - actionpack (= 3.2.12) - activesupport (= 3.2.12) + railties (= 3.2.13) + railties (3.2.13) + actionpack (= 3.2.13) + activesupport (= 3.2.13) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -236,11 +236,11 @@ GEM eventmachine (>= 0.12.6) rack (>= 1.0.0) thor (0.17.0) - tilt (1.3.5) + tilt (1.3.6) treetop (1.4.12) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.36) + tzinfo (0.3.37) uglifier (1.3.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) @@ -278,7 +278,7 @@ DEPENDENCIES pg poltergeist quiet_assets - rails (= 3.2.12) + rails (= 3.2.13) rb-fsevent rspec-rails sanitize