summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-12-02 18:32:29 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-12-02 18:32:29 +0000
commitdef118b42a82dea119c7449919ec994808169031 (patch)
tree2edfdf015a4a23321925d2ecdb276de361f87cba
parent9507b448b2589ce821e8f215c57a1d5434f7d2e2 (diff)
downloadredmine-def118b42a82dea119c7449919ec994808169031.tar.gz
redmine-def118b42a82dea119c7449919ec994808169031.zip
Fixed dependency loading for when running in dev mode (#12097).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10912 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--lib/redmine.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/redmine.rb b/lib/redmine.rb
index ef3c71892..8f4627e95 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -25,17 +25,14 @@ require 'redmine/activity/fetcher'
require 'redmine/ciphering'
require 'redmine/codeset_util'
require 'redmine/custom_field_format'
-require 'redmine/hook'
require 'redmine/i18n'
require 'redmine/menu_manager'
require 'redmine/notifiable'
require 'redmine/platform'
-require 'redmine/plugin'
require 'redmine/mime_type'
require 'redmine/notifiable'
require 'redmine/search'
require 'redmine/syntax_highlighting'
-require 'redmine/themes'
require 'redmine/thumbnail'
require 'redmine/unified_diff'
require 'redmine/utils'
@@ -52,6 +49,10 @@ require 'redmine/views/other_formats_builder'
require 'redmine/views/labelled_form_builder'
require 'redmine/views/builders'
+require 'redmine/themes'
+require 'redmine/hook'
+require 'redmine/plugin'
+
begin
require 'RMagick' unless Object.const_defined?(:Magick)
rescue LoadError