1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Rationalize railtie dependencies: AC uses AV; AR uses AMo; and Rails always uses AS.

This commit is contained in:
Jeremy Kemper 2010-02-04 09:29:18 -08:00
parent 5c07c33ab4
commit 23ad1eff0d
4 changed files with 7 additions and 7 deletions

View file

@ -22,4 +22,4 @@ module ActionMailer
ActionMailer::Base.send(:include, ActionController::UrlFor) if defined?(ActionController) ActionMailer::Base.send(:include, ActionController::UrlFor) if defined?(ActionController)
end end
end end
end end

View file

@ -1,5 +1,6 @@
require "action_controller" require "action_controller"
require "rails" require "rails"
require "action_view/railtie"
module ActionController module ActionController
class Railtie < Rails::Railtie class Railtie < Rails::Railtie

View file

@ -1,10 +1,12 @@
require "active_record"
require "rails"
require "active_model/railtie"
# For now, action_controller must always be present with # For now, action_controller must always be present with
# rails, so let's make sure that it gets required before # rails, so let's make sure that it gets required before
# here. This is needed for correctly setting up the middleware. # here. This is needed for correctly setting up the middleware.
# In the future, this might become an optional require. # In the future, this might become an optional require.
require "active_record"
require "action_controller/railtie" require "action_controller/railtie"
require "rails"
module ActiveRecord module ActiveRecord
class Railtie < Rails::Railtie class Railtie < Rails::Railtie

View file

@ -1,11 +1,8 @@
require "rails" require "rails"
%w( %w(
active_support
active_model
active_record active_record
action_controller action_controller
action_view
action_mailer action_mailer
active_resource active_resource
rails/test_unit rails/test_unit
@ -14,4 +11,4 @@ require "rails"
require "#{framework}/railtie" require "#{framework}/railtie"
rescue LoadError rescue LoadError
end end
end end