mirror of
https://github.com/meineerde/redmine.git
synced 2026-03-14 13:08:14 +00:00
Dependencies moved to ActiveSupport::Dependencies
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/work@2065 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
5b23eb7d6f
commit
859c89ccb6
@ -5,7 +5,7 @@
|
||||
# ENV['RAILS_ENV'] ||= 'production'
|
||||
|
||||
# Specifies gem version of Rails to use when vendor/rails is not present
|
||||
RAILS_GEM_VERSION = '2.1.0' unless defined? RAILS_GEM_VERSION
|
||||
RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION
|
||||
|
||||
# Bootstrap the Rails environment, frameworks, and default configuration
|
||||
require File.join(File.dirname(__FILE__), 'boot')
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
require 'action_web_service'
|
||||
|
||||
# These need to be in the load path for action_web_service to work
|
||||
Dependencies.load_paths += ["#{RAILS_ROOT}/app/apis"]
|
||||
ActiveSupport::Dependencies.load_paths += ["#{RAILS_ROOT}/app/apis"]
|
||||
|
||||
# AWS Test helpers
|
||||
require 'action_web_service/test_invoke' if ENV['RAILS_ENV'] && ENV['RAILS_ENV'] =~ /^test/
|
||||
|
||||
@ -26,7 +26,7 @@ unless defined?(ActiveRecord)
|
||||
|
||||
%w(action_pack active_record action_controller active_record/fixtures action_controller/test_process).each {|f| require f}
|
||||
|
||||
Dependencies.load_paths.unshift "#{plugin_root}/lib"
|
||||
ActiveSupport::Dependencies.load_paths.unshift "#{plugin_root}/lib"
|
||||
end
|
||||
|
||||
# Define the connector
|
||||
|
||||
@ -140,4 +140,4 @@ module Engines::RailsExtensions::Dependencies
|
||||
end
|
||||
end
|
||||
|
||||
Dependencies.send :include, Engines::RailsExtensions::Dependencies
|
||||
ActiveSupport::Dependencies.send :include, Engines::RailsExtensions::Dependencies
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user