From f28003a481effc2a0e215563a99d996a33c3a657 Mon Sep 17 00:00:00 2001 From: Hiro Asari Date: Thu, 14 Feb 2013 10:10:02 -0500 Subject: [PATCH] Update to Rails 3.2.12, and explicity require rack 1.4.5 (which is not strictly required) --- Gemfile | 3 ++- Gemfile.lock | 68 +++++++++++++++++++++++------------------------ public/index.html | 2 +- 3 files changed, 37 insertions(+), 36 deletions(-) diff --git a/Gemfile b/Gemfile index 606bebc2..320cdd2b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,7 @@ source 'http://rubygems.org' -gem 'rails', '3.2.11' +gem 'rails', '3.2.12' +gem 'rack', '>= 1.4.5' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' diff --git a/Gemfile.lock b/Gemfile.lock index 6b203fe0..6efd0582 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,31 +1,31 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.11) - actionpack (= 3.2.11) + actionmailer (3.2.12) + actionpack (= 3.2.12) mail (~> 2.4.4) - actionpack (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) + actionpack (3.2.12) + activemodel (= 3.2.12) + activesupport (= 3.2.12) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) - rack (~> 1.4.0) + rack (~> 1.4.5) rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.11) - activesupport (= 3.2.11) + activemodel (3.2.12) + activesupport (= 3.2.12) builder (~> 3.0.0) - activerecord (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) + activerecord (3.2.12) + activemodel (= 3.2.12) + activesupport (= 3.2.12) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) - activesupport (3.2.11) + activeresource (3.2.12) + activemodel (= 3.2.12) + activesupport (= 3.2.12) + activesupport (3.2.12) i18n (~> 0.6) multi_json (~> 1.0) arel (3.0.2) @@ -43,43 +43,43 @@ GEM hike (1.2.1) i18n (0.6.1) journey (1.0.4) - jquery-rails (2.1.4) + jquery-rails (2.2.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.7.6) + json (1.7.7) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.19) - minitest (4.4.0) - multi_json (1.5.0) + mime-types (1.21) + minitest (4.6.0) + multi_json (1.6.0) mysql2 (0.3.11) polyglot (0.3.3) - rack (1.4.4) + rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-ssl (1.3.2) + rack-ssl (1.3.3) rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.11) - actionmailer (= 3.2.11) - actionpack (= 3.2.11) - activerecord (= 3.2.11) - activeresource (= 3.2.11) - activesupport (= 3.2.11) + rails (3.2.12) + actionmailer (= 3.2.12) + actionpack (= 3.2.12) + activerecord (= 3.2.12) + activeresource (= 3.2.12) + activesupport (= 3.2.12) bundler (~> 1.0) - railties (= 3.2.11) - railties (3.2.11) - actionpack (= 3.2.11) - activesupport (= 3.2.11) + railties (= 3.2.12) + railties (3.2.12) + actionpack (= 3.2.12) + activesupport (= 3.2.12) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) rake (10.0.3) - rdoc (3.12) + rdoc (3.12.1) json (~> 1.4) sass (3.2.5) sass-rails (3.2.6) @@ -110,7 +110,7 @@ DEPENDENCIES jquery-rails minitest mysql2 - rails (= 3.2.11) + rails (= 3.2.12) sass-rails (~> 3.2.3) sqlite3 thor (= 0.14.6) diff --git a/public/index.html b/public/index.html index c494010d..393bf1cf 100644 --- a/public/index.html +++ b/public/index.html @@ -3,7 +3,7 @@ - OpenShift - Rails 3.2.10 + OpenShift - Rails 3.2.12