aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-02-22 22:48:18 -0300
committerRafael França <rafaelmfranca@gmail.com>2016-02-22 22:48:18 -0300
commitb86bf3929c0cbbee2bd9b4bd0f6460bd7ba99e7b (patch)
tree356c0b41b384dbcaf1c22e26ee06ccac058507d2 /railties/lib/rails/generators
parente7299497871e20c3a28516a4e84fe1789c8795a8 (diff)
parentcf423f8f767895d608284acb3543f7c9ba15ccf4 (diff)
downloadrails-b86bf3929c0cbbee2bd9b4bd0f6460bd7ba99e7b.tar.gz
rails-b86bf3929c0cbbee2bd9b4bd0f6460bd7ba99e7b.tar.bz2
rails-b86bf3929c0cbbee2bd9b4bd0f6460bd7ba99e7b.zip
Merge pull request #23600 from maclover7/actioncable-work
Assorted Railties generators work
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 885f0c20f6..07d38605a2 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -91,6 +91,7 @@ module Rails
cookie_serializer_config_exist = File.exist?('config/initializers/cookies_serializer.rb')
callback_terminator_config_exist = File.exist?('config/initializers/callback_terminator.rb')
active_record_belongs_to_required_by_default_config_exist = File.exist?('config/initializers/active_record_belongs_to_required_by_default.rb')
+ action_cable_config_exist = File.exist?('config/cable.yml')
config
@@ -105,6 +106,10 @@ module Rails
unless active_record_belongs_to_required_by_default_config_exist
remove_file 'config/initializers/active_record_belongs_to_required_by_default.rb'
end
+
+ unless action_cable_config_exist
+ template 'config/cable.yml'
+ end
end
def database_yml