aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-08-24 16:47:01 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-08-24 16:47:01 -0700
commitb907271b4baae8966e8cd133931e5bc9c557219e (patch)
tree60c3486e4d2b6a7aef5b14b6e37e98894f246180
parentbac5da3ccc43785d83628bc1147b3300f1cb5f95 (diff)
downloadrails-b907271b4baae8966e8cd133931e5bc9c557219e.tar.gz
rails-b907271b4baae8966e8cd133931e5bc9c557219e.tar.bz2
rails-b907271b4baae8966e8cd133931e5bc9c557219e.zip
stop circular require warnings
-rw-r--r--actionpack/lib/action_dispatch/railtie.rb1
-rw-r--r--activesupport/lib/active_support/i18n_railtie.rb1
-rw-r--r--activesupport/lib/active_support/railtie.rb1
3 files changed, 0 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/railtie.rb b/actionpack/lib/action_dispatch/railtie.rb
index fbda1f8442..1af89858d1 100644
--- a/actionpack/lib/action_dispatch/railtie.rb
+++ b/actionpack/lib/action_dispatch/railtie.rb
@@ -1,5 +1,4 @@
require "action_dispatch"
-require "rails"
module ActionDispatch
class Railtie < Rails::Railtie
diff --git a/activesupport/lib/active_support/i18n_railtie.rb b/activesupport/lib/active_support/i18n_railtie.rb
index 4402897f10..4c59fe9ac9 100644
--- a/activesupport/lib/active_support/i18n_railtie.rb
+++ b/activesupport/lib/active_support/i18n_railtie.rb
@@ -1,5 +1,4 @@
require "active_support"
-require "rails"
require "active_support/file_update_checker"
require "active_support/core_ext/array/wrap"
diff --git a/activesupport/lib/active_support/railtie.rb b/activesupport/lib/active_support/railtie.rb
index 04df2ea562..1638512af0 100644
--- a/activesupport/lib/active_support/railtie.rb
+++ b/activesupport/lib/active_support/railtie.rb
@@ -1,5 +1,4 @@
require "active_support"
-require "rails"
require "active_support/i18n_railtie"
module ActiveSupport