From 1a275730b290c1f06d4e8df680d22ae1b41ab585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Tue, 12 Jan 2010 14:11:47 +0100 Subject: Set deprecation warnings for RAILS_ENV and RAILS_DEFAULT_LOGGER. --- railties/builtin/rails_info/rails/info.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/builtin') 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 -- cgit v1.2.3 From c464271e03d7f7554a9c3ade53e445a15d31dbfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Tue, 12 Jan 2010 15:41:10 +0100 Subject: Get rid of old rails_info_controller.rb --- railties/builtin/rails_info/rails_info_controller.rb | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 railties/builtin/rails_info/rails_info_controller.rb (limited to 'railties/builtin') 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 -- cgit v1.2.3