diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-11-01 08:23:06 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-11-01 08:23:06 -0700 |
| commit | 9616a7ee1a18f259dd249e6df6fafcb8b8af9b10 (patch) | |
| tree | 21bdf33e7fc62b8c2f61cb9587af33f54011b0b9 /railties/lib | |
| parent | f8483dd48bc538cdab03ac5b7a393cd8571dc0f9 (diff) | |
| parent | bca36b080b77089cb8b2e8269c6be3b975171216 (diff) | |
| download | rails-9616a7ee1a18f259dd249e6df6fafcb8b8af9b10.tar.gz rails-9616a7ee1a18f259dd249e6df6fafcb8b8af9b10.tar.bz2 rails-9616a7ee1a18f259dd249e6df6fafcb8b8af9b10.zip | |
Merge pull request #12733 from robin850/fix-railties-build
Fix railties build
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/generators/base.rb | 1 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin/plugin_generator.rb | 1 |
3 files changed, 3 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 71f732b16d..dc1d4fa181 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 diff --git a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb index 813006bf7b..f6f529b80a 100644 --- a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb +++ b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb @@ -184,6 +184,7 @@ task default: :test end end + public_task :set_default_accessors! public_task :create_root def create_root_files |