diff options
| author | Arthur Nogueira Neves <github@arthurnn.com> | 2016-02-27 12:29:16 -0500 |
|---|---|---|
| committer | Arthur Nogueira Neves <github@arthurnn.com> | 2016-02-27 12:29:16 -0500 |
| commit | 64e4f201a99bf37de8b88289601ab874849c9476 (patch) | |
| tree | 37d9857d026753153769fa12a7ddc38d1cbed5e6 /railties/lib/rails/generators | |
| parent | ecf6dc3dfbc0cdf1b0a86f48e030debd0f917cb6 (diff) | |
| parent | 5a9cc012a0b2c8bc059abb8f5663f0c66258583c (diff) | |
| download | rails-64e4f201a99bf37de8b88289601ab874849c9476.tar.gz rails-64e4f201a99bf37de8b88289601ab874849c9476.tar.bz2 rails-64e4f201a99bf37de8b88289601ab874849c9476.zip | |
Merge pull request #23921 from y-yagi/remove_rack_cors_initializer_when_updating
remove rack cors initializer when updating
Diffstat (limited to 'railties/lib/rails/generators')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 5 |
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 4234706452..7bab3fdf74 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -93,6 +93,7 @@ module Rails 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') ssl_options_exist = File.exist?('config/initializers/ssl_options.rb') + rack_cors_config_exist = File.exist?('config/initializers/cors.rb') config @@ -115,6 +116,10 @@ module Rails unless ssl_options_exist remove_file 'config/initializers/ssl_options.rb' end + + unless rack_cors_config_exist + remove_file 'config/initializers/cors.rb' + end end def database_yml |