Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Remove "circular require considered harmful" error

rails/generators should not load rails/generators/base since the
latter is loading it.
  • Loading branch information...
commit b79e4223f7b9ddcda1d64ceb8807f91de16e100f 1 parent 2e7ee65
@robin850 robin850 authored
View
4 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/module/attribute_accessors'
require 'active_support/core_ext/string/inflections'
-require 'rails/generators/base'
-
module Rails
module Generators
autoload :Actions, 'rails/generators/actions'
View
1  railties/lib/rails/generators/base.rb
@@ -8,7 +8,6 @@
end
require 'rails/generators'
-require 'rails/generators/actions'
module Rails
module Generators
Please sign in to comment.
Something went wrong with that request. Please try again.