From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 16 Jun 2011 01:52:45 +0000 (+0000)
Subject: replace RAILS_ROOT to Rails.root in setting model.
X-Git-Tag: 1.3.0~1815
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c3b4722c2ac871153a69b6e325fd059ead6a694a;p=redmine.git

replace RAILS_ROOT to Rails.root in setting model.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6076 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/models/setting.rb b/app/models/setting.rb
index 80e084e9c..12b186fe8 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -75,7 +75,7 @@ class Setting < ActiveRecord::Base
                   TIS-620)
 
   cattr_accessor :available_settings
-  @@available_settings = YAML::load(File.open("#{RAILS_ROOT}/config/settings.yml"))
+  @@available_settings = YAML::load(File.open("#{Rails.root}/config/settings.yml"))
   Redmine::Plugin.all.each do |plugin|
     next unless plugin.settings
     @@available_settings["plugin_#{plugin.id}"] = {'default' => plugin.settings[:default], 'serialized' => true}