diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-17 03:20:30 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-17 03:20:30 +0530 |
| commit | b04230e3bbf912d60601e9e7b797c4cd43581d51 (patch) | |
| tree | 97a2f784a2ec2bfae4f960af56a9280dad6f7774 /railties/builtin | |
| parent | 867829b187969607aa12f2b0457f25da9c204db0 (diff) | |
| parent | 6e3bee6cf1f0d2684152292db0a8b757249824fd (diff) | |
| download | rails-b04230e3bbf912d60601e9e7b797c4cd43581d51.tar.gz rails-b04230e3bbf912d60601e9e7b797c4cd43581d51.tar.bz2 rails-b04230e3bbf912d60601e9e7b797c4cd43581d51.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/metal/flash.rb
Diffstat (limited to 'railties/builtin')
| -rw-r--r-- | railties/builtin/rails_info/rails/info.rb | 4 | ||||
| -rw-r--r-- | railties/builtin/rails_info/rails_info_controller.rb | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/railties/builtin/rails_info/rails/info.rb b/railties/builtin/rails_info/rails/info.rb index c3784cff32..269fe488b0 100644 --- a/railties/builtin/rails_info/rails/info.rb +++ b/railties/builtin/rails_info/rails/info.rb @@ -129,12 +129,12 @@ module Rails # The current Rails environment (development, test, or production). property 'Environment' do - RAILS_ENV + Rails.env end # The name of the database adapter for the current environment. property 'Database adapter' do - ActiveRecord::Base.configurations[RAILS_ENV]['adapter'] + ActiveRecord::Base.configurations[Rails.env]['adapter'] end property 'Database schema version' do diff --git a/railties/builtin/rails_info/rails_info_controller.rb b/railties/builtin/rails_info/rails_info_controller.rb deleted file mode 100644 index 2009eb3a99..0000000000 --- a/railties/builtin/rails_info/rails_info_controller.rb +++ /dev/null @@ -1,2 +0,0 @@ -# Alias to ensure old public.html still works. -RailsInfoController = Rails::InfoController |