Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity

Upgrade rails to 2.3.11.

This commit is contained in:
benni 2011-05-10 23:29:36 +02:00
parent 46450cebef
commit bea145f33d
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -1,7 +1,7 @@
# A sample Gemfile # A sample Gemfile
source "http://rubygems.org" source "http://rubygems.org"
gem "rails", '2.3.10' gem "rails", '2.3.11'
gem 'mysql' gem 'mysql'
gem "fastercsv" gem "fastercsv"

34
Gemfile.lock
View File

@ -1,16 +1,16 @@
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
actionmailer (2.3.10) actionmailer (2.3.11)
actionpack (= 2.3.10) actionpack (= 2.3.11)
actionpack (2.3.10) actionpack (2.3.11)
activesupport (= 2.3.10) activesupport (= 2.3.11)
rack (~> 1.1.0) rack (~> 1.1.0)
activerecord (2.3.10) activerecord (2.3.11)
activesupport (= 2.3.10) activesupport (= 2.3.11)
activeresource (2.3.10) activeresource (2.3.11)
activesupport (= 2.3.10) activesupport (= 2.3.11)
activesupport (2.3.10) activesupport (2.3.11)
annotate (2.4.0) annotate (2.4.0)
fastercsv (1.5.4) fastercsv (1.5.4)
haml (3.0.25) haml (3.0.25)
@ -26,13 +26,13 @@ GEM
prawn-core prawn-core
prawn-layout (0.3.2) prawn-layout (0.3.2)
prawn-security (0.1.1) prawn-security (0.1.1)
rack (1.1.0) rack (1.1.2)
rails (2.3.10) rails (2.3.11)
actionmailer (= 2.3.10) actionmailer (= 2.3.11)
actionpack (= 2.3.10) actionpack (= 2.3.11)
activerecord (= 2.3.10) activerecord (= 2.3.11)
activeresource (= 2.3.10) activeresource (= 2.3.11)
activesupport (= 2.3.10) activesupport (= 2.3.11)
rake (>= 0.8.3) rake (>= 0.8.3)
rake (0.8.7) rake (0.8.7)
routing-filter (0.0.1) routing-filter (0.0.1)
@ -48,6 +48,6 @@ DEPENDENCIES
hirb hirb
mysql mysql
prawn (<= 0.6.3) prawn (<= 0.6.3)
rails (= 2.3.10) rails (= 2.3.11)
routing-filter (= 0.0.1) routing-filter (= 0.0.1)
sqlite3-ruby sqlite3-ruby

6
config/boot.rb
View File

@ -103,9 +103,9 @@ module Rails
end end
private private
def read_environment_rb def read_environment_rb
File.read("#{RAILS_ROOT}/config/environment.rb") File.read("#{RAILS_ROOT}/config/environment.rb")
end end
end end
end end
end end

2
config/environment.rb
View File

@ -5,7 +5,7 @@
# ENV['RAILS_ENV'] ||= 'production' # ENV['RAILS_ENV'] ||= 'production'
# Specifies gem version of Rails to use when vendor/rails is not present # 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 # Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot') require File.join(File.dirname(__FILE__), 'boot')