Merge branch 'master' of git://github.com/mikel/rails into mail

Conflicts:
	actionmailer/lib/action_mailer.rb

1 files changed, 8 insertions, 12 deletions

diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index c23b67e321..9fb3cd9f94 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -1,13 +1,9 @@
-require "pathname"
+require "rails/core"
 
-require 'rails/initializable'
-require 'rails/application'
-require 'rails/railties_path'
-require 'rails/version'
-require 'rails/rack'
-require 'rails/paths'
-require 'rails/core'
-require 'rails/configuration'
-require 'rails/deprecation'
-require 'rails/initializer'
-require 'rails/plugin'
\ No newline at end of file
+%w(active_model active_record action_controller action_view action_mailer active_resource).each do |framework|
+  begin
+    require framework
+    require "#{framework}/rails"
+  rescue LoadError
+  end
+end
\ No newline at end of file