diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2015-12-17 12:13:22 +0100 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2015-12-17 12:13:22 +0100 |
commit | 48f5cecdb03f697a710169ccef1885fcaca70788 (patch) | |
tree | fb0620965261d9a77c5ccbfb158fa86573559384 /railties/lib/rails/generators/app_base.rb | |
parent | c4f8ce53b1f9af9585aeec9bbb0c66fc9c48ec1b (diff) | |
parent | d15de0cfb86fa3cc1914892b3d16221115a42dee (diff) | |
download | rails-48f5cecdb03f697a710169ccef1885fcaca70788.tar.gz rails-48f5cecdb03f697a710169ccef1885fcaca70788.tar.bz2 rails-48f5cecdb03f697a710169ccef1885fcaca70788.zip |
Merge pull request #22586 from rails/merge-action-cable
Merge Action Cable into master
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 bc5c8052dc..c4f4d834e1 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -51,6 +51,9 @@ module Rails class_option :skip_spring, type: :boolean, default: false, desc: "Don't install Spring application preloader" + class_option :skip_action_cable, type: :boolean, aliases: '-C', default: false, + desc: 'Skip Action Cable files' + class_option :database, type: :string, aliases: '-d', default: 'sqlite3', desc: "Preconfigure for selected database (options: #{DATABASES.join('/')})" @@ -168,7 +171,7 @@ module Rails end def include_all_railties? - options.values_at(:skip_active_record, :skip_action_mailer, :skip_test, :skip_sprockets).none? + options.values_at(:skip_active_record, :skip_action_mailer, :skip_test, :skip_sprockets, :skip_action_cable).none? end def comment_if(value) |