aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorRobin Dupret <robin.dupret@gmail.com>2013-11-01 11:41:02 +0100
committerRobin Dupret <robin.dupret@gmail.com>2013-11-01 11:41:02 +0100
commitb79e4223f7b9ddcda1d64ceb8807f91de16e100f (patch)
treee223cd78033791a67bf9500b0d4b21d060088bab /railties/lib
parent2e7ee652d2c1466787b45de59464ca096019e784 (diff)
downloadrails-b79e4223f7b9ddcda1d64ceb8807f91de16e100f.tar.gz
rails-b79e4223f7b9ddcda1d64ceb8807f91de16e100f.tar.bz2
rails-b79e4223f7b9ddcda1d64ceb8807f91de16e100f.zip
Remove "circular require considered harmful" error
rails/generators should not load rails/generators/base since the latter is loading it.
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/generators.rb4
-rw-r--r--railties/lib/rails/generators/base.rb1
2 files changed, 2 insertions, 3 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 6b34db3e3f..1c0952cc55 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -1,6 +1,8 @@
activesupport_path = File.expand_path('../../../../activesupport/lib', __FILE__)
$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
+require 'thor/group'
+
require 'active_support'
require 'active_support/core_ext/object/blank'
require 'active_support/core_ext/kernel/singleton_class'
@@ -9,8 +11,6 @@ require 'active_support/core_ext/hash/deep_merge'
require 'active_support/core_ext/module/attribute_accessors'
require 'active_support/core_ext/string/inflections'
-require 'rails/generators/base'
-
module Rails
module Generators
autoload :Actions, 'rails/generators/actions'
diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb
index 681332a144..a9638ce5ab 100644
--- a/railties/lib/rails/generators/base.rb
+++ b/railties/lib/rails/generators/base.rb
@@ -8,7 +8,6 @@ rescue LoadError
end
require 'rails/generators'
-require 'rails/generators/actions'
module Rails
module Generators