Explicitly load dependencies for when running with config.threadsafe! (#12097).

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

diff --git a/lib/redmine.rb b/lib/redmine.rb
index 3901b8e5dc8428249a1a270d31321f307c851fba..ef3c718928fe98059a77bc26424ec17d6846a525 100644 (file)
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -1,16 +1,56 @@
+# Redmine - project management software
+# Copyright (C) 2006-2012  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+require 'redmine/core_ext'
+
+require 'redmine/about'
 require 'redmine/access_control'
-require 'redmine/menu_manager'
+require 'redmine/access_keys'
 require 'redmine/activity'
-require 'redmine/search'
+require 'redmine/activity/fetcher'
+require 'redmine/ciphering'
+require 'redmine/codeset_util'
 require 'redmine/custom_field_format'
-require 'redmine/mime_type'
-require 'redmine/core_ext'
-require 'redmine/themes'
 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'
+require 'redmine/version'
 require 'redmine/wiki_formatting'
+
+require 'redmine/default_data/loader'
+require 'redmine/helpers/calendar'
+require 'redmine/helpers/diff'
+require 'redmine/helpers/gantt'
+require 'redmine/helpers/time_report'
 require 'redmine/scm/base'
+require 'redmine/views/other_formats_builder'
+require 'redmine/views/labelled_form_builder'
+require 'redmine/views/builders'
 
 begin
   require 'RMagick' unless Object.const_defined?(:Magick)

diff --git a/lib/redmine/views/builders.rb b/lib/redmine/views/builders.rb
index d966befac14c57da2e31d4d31f18d43f1d95a47a..1df5b79e010d10a4cb0cff40b3dde053af74f4ce 100644 (file)
--- a/lib/redmine/views/builders.rb
+++ b/lib/redmine/views/builders.rb
@@ -15,6 +15,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+require 'redmine/views/builders/json'
+require 'redmine/views/builders/xml'
+
 module Redmine
   module Views
     module Builders

diff --git a/lib/redmine/views/builders/json.rb b/lib/redmine/views/builders/json.rb
index 9ab8f6bfa8672bf15b831ca322be7dd47f04bae5..1485e0d7d7590b2538efcce43539db8dad696405 100644 (file)
--- a/lib/redmine/views/builders/json.rb
+++ b/lib/redmine/views/builders/json.rb
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-require 'blankslate'
+require 'redmine/views/builders/structure'
 
 module Redmine
   module Views