diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-03-26 17:43:06 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-03-26 17:43:06 +1030 |
| commit | 288bf69aedb56a93878fac4e4454a20c1d054440 (patch) | |
| tree | 1d871f648e32909efd53c794db11c654123bcc31 /railties/lib | |
| parent | 168836772753bfa7d2bc11ab574a7a8f71a220e0 (diff) | |
| parent | 9c010026c19febc31255fee724feb7032ea736c9 (diff) | |
| download | rails-288bf69aedb56a93878fac4e4454a20c1d054440.tar.gz rails-288bf69aedb56a93878fac4e4454a20c1d054440.tar.bz2 rails-288bf69aedb56a93878fac4e4454a20c1d054440.zip | |
Merge pull request #24323 from prathamesh-sonpatki/rm-check-for-development.rb
development.rb file always exists so we don't need a check for it
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index d6be69e16c..f58e6ba653 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -95,13 +95,10 @@ module Rails 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') - development_config_exist = File.exist?('config/environments/development.rb') config - if development_config_exist - gsub_file 'config/environments/development.rb', /^(\s+)config\.file_watcher/, '\1# config.file_watcher' - end + gsub_file 'config/environments/development.rb', /^(\s+)config\.file_watcher/, '\1# config.file_watcher' unless callback_terminator_config_exist remove_file 'config/initializers/callback_terminator.rb' |