diff --git a/Gemfile b/Gemfile index 30bf6f31..2bf05686 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ # A sample Gemfile source "http://rubygems.org" -gem "rails", '2.3.10' +gem "rails", '2.3.11' gem 'mysql' gem "fastercsv" diff --git a/Gemfile.lock b/Gemfile.lock index 837dc12e..0a86c296 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,16 +1,16 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (2.3.10) - actionpack (= 2.3.10) - actionpack (2.3.10) - activesupport (= 2.3.10) + actionmailer (2.3.11) + actionpack (= 2.3.11) + actionpack (2.3.11) + activesupport (= 2.3.11) rack (~> 1.1.0) - activerecord (2.3.10) - activesupport (= 2.3.10) - activeresource (2.3.10) - activesupport (= 2.3.10) - activesupport (2.3.10) + activerecord (2.3.11) + activesupport (= 2.3.11) + activeresource (2.3.11) + activesupport (= 2.3.11) + activesupport (2.3.11) annotate (2.4.0) fastercsv (1.5.4) haml (3.0.25) @@ -26,13 +26,13 @@ GEM prawn-core prawn-layout (0.3.2) prawn-security (0.1.1) - rack (1.1.0) - rails (2.3.10) - actionmailer (= 2.3.10) - actionpack (= 2.3.10) - activerecord (= 2.3.10) - activeresource (= 2.3.10) - activesupport (= 2.3.10) + rack (1.1.2) + rails (2.3.11) + actionmailer (= 2.3.11) + actionpack (= 2.3.11) + activerecord (= 2.3.11) + activeresource (= 2.3.11) + activesupport (= 2.3.11) rake (>= 0.8.3) rake (0.8.7) routing-filter (0.0.1) @@ -48,6 +48,6 @@ DEPENDENCIES hirb mysql prawn (<= 0.6.3) - rails (= 2.3.10) + rails (= 2.3.11) routing-filter (= 0.0.1) sqlite3-ruby diff --git a/config/boot.rb b/config/boot.rb index 97edd24d..d4242094 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -103,9 +103,9 @@ module Rails end private - def read_environment_rb - File.read("#{RAILS_ROOT}/config/environment.rb") - end + def read_environment_rb + File.read("#{RAILS_ROOT}/config/environment.rb") + end end end end diff --git a/config/environment.rb b/config/environment.rb index 404ce60f..b5d15ab0 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -5,7 +5,7 @@ # ENV['RAILS_ENV'] ||= 'production' # Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.3.10' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.3.11' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot')