diff options
| author | José Valim <jose.valim@gmail.com> | 2009-11-23 22:40:55 -0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-11-23 22:40:55 -0200 |
| commit | 16cf25e717c9b13e402fda33fe859684e1d8a154 (patch) | |
| tree | b08aba6b7d517c60908d8527289d6306a423ec13 | |
| parent | 4ff66b6b85d1351e447f18c027f1dba6bcf23a7b (diff) | |
| parent | eeb1f472a5561e769b7e6df923f4c91a7d72379d (diff) | |
| download | rails-16cf25e717c9b13e402fda33fe859684e1d8a154.tar.gz rails-16cf25e717c9b13e402fda33fe859684e1d8a154.tar.bz2 rails-16cf25e717c9b13e402fda33fe859684e1d8a154.zip | |
Merge branch 'master' of git://github.com/rails/rails
| -rw-r--r-- | actionpack/actionpack.gemspec | 2 | ||||
| -rw-r--r-- | railties/lib/rails/initializer.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec index 78286f6747..ccf6bf1e83 100644 --- a/actionpack/actionpack.gemspec +++ b/actionpack/actionpack.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |s| s.add_dependency('activemodel', '= 3.0.pre') s.add_dependency('rack', '~> 1.0.1') s.add_dependency('rack-test', '~> 0.5.0') - s.add_dependency('rack-mount', '~> 0.2') + s.add_dependency('rack-mount', '~> 0.2.2') s.add_dependency('erubis', '~> 2.6.5') s.require_path = 'lib' diff --git a/railties/lib/rails/initializer.rb b/railties/lib/rails/initializer.rb index 44d04688c8..44101dcc94 100644 --- a/railties/lib/rails/initializer.rb +++ b/railties/lib/rails/initializer.rb @@ -1,6 +1,6 @@ require "rails" # In case people require this file directly -RAILS_ENV = (ENV['RAILS_ENV'] || 'development').dup unless defined?(RAILS_ENV) +RAILS_ENV = (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development').dup unless defined?(RAILS_ENV) module Rails class Initializer @@ -14,4 +14,4 @@ module Rails end end end -end
\ No newline at end of file +end |