diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
| commit | 2d1866d966d94c688f9cb87c5bf3f096dffac844 (patch) | |
| tree | 7a733c1cc51448ab69b3f892285305dbfb0ae15e /config/environment.rb | |
| parent | a6ec78a4dc658e3517ed682792016b6530458696 (diff) | |
| download | redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.tar.gz redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.zip | |
Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config/environment.rb')
| -rw-r--r-- | config/environment.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/environment.rb b/config/environment.rb index 1d9a39669..705e4ecd7 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -1,4 +1,4 @@ -# Load the rails application +# Load the Rails application require File.expand_path('../application', __FILE__) # Make sure there's no plugin in vendor/plugin before starting @@ -10,5 +10,5 @@ if Dir.glob(File.join(vendor_plugins_dir, "*")).any? exit 1 end -# Initialize the rails application -RedmineApp::Application.initialize! +# Initialize the Rails application +Rails.application.initialize! |