diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-01-23 08:21:41 +0100 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2016-01-23 08:21:41 +0100 |
| commit | 39ea2b09edcf8179fe69808424d325612194d4cb (patch) | |
| tree | e02132389bf2ee76e67af2e408d699de7e36b5b6 /railties/lib | |
| parent | 4fdc56d5788349522fc6d43bbab14811a9f1f29e (diff) | |
| parent | 578af21a4156ff29b4c28936324c54bb1eb83d54 (diff) | |
| download | rails-39ea2b09edcf8179fe69808424d325612194d4cb.tar.gz rails-39ea2b09edcf8179fe69808424d325612194d4cb.tar.bz2 rails-39ea2b09edcf8179fe69808424d325612194d4cb.zip | |
Merge pull request #23206 from joyvuu-dave/action_cable_api_fix
prevent --skip-action-cable from erroring when --api option is used
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 3d689ff37e..a4758857f2 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -318,7 +318,7 @@ module Rails remove_file 'config/cable.yml' remove_file 'app/assets/javascripts/cable.coffee' remove_dir 'app/channels' - gsub_file 'app/views/layouts/application.html.erb', /action_cable_meta_tag/, '' + gsub_file 'app/views/layouts/application.html.erb', /action_cable_meta_tag/, '' unless options[:api] end end |