diff options
author | José Valim <jose.valim@gmail.com> | 2011-06-29 09:39:41 -0300 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-06-29 09:41:16 -0300 |
commit | c690b7124d2f2206342d11aebb7aa3fc990046d2 (patch) | |
tree | 1d4e0bc6a60c46ae7e2e6fed8965320ed997f208 /railties/lib/rails/generators/app_base.rb | |
parent | 4106245530bc573c035fe70e8fc8633e89741abd (diff) | |
download | rails-c690b7124d2f2206342d11aebb7aa3fc990046d2.tar.gz rails-c690b7124d2f2206342d11aebb7aa3fc990046d2.tar.bz2 rails-c690b7124d2f2206342d11aebb7aa3fc990046d2.zip |
[IMPORTANT] Make "sprockets/railtie" require explicit.
This makes "sprockets/railtie" explicit. This means that sprockets will
be loaded when you require "rails/all". If you are not using requiring
"rails/all", you need to manually load it with all other framework
railties.
In order to be complete, this commit also adds --skip-sprockets to
the rails generator.
Diffstat (limited to 'railties/lib/rails/generators/app_base.rb')
-rw-r--r-- | railties/lib/rails/generators/app_base.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 378eceb4c3..c8847f0159 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -37,6 +37,9 @@ module Rails class_option :skip_active_record, :type => :boolean, :aliases => "-O", :default => false, :desc => "Skip Active Record files" + class_option :skip_sprockets, :type => :boolean, :aliases => "-S", :default => false, + :desc => "Skip Sprockets files" + class_option :database, :type => :string, :aliases => "-d", :default => "sqlite3", :desc => "Preconfigure for selected database (options: #{DATABASES.join('/')})" @@ -124,7 +127,7 @@ module Rails end def include_all_railties? - !options[:skip_active_record] && !options[:skip_test_unit] + !options[:skip_active_record] && !options[:skip_test_unit] && !options[:skip_sprockets] end def comment_if(value) |