diff options
author | Jeremy Daer <jeremydaer@gmail.com> | 2015-10-11 23:32:57 -0700 |
---|---|---|
committer | Jeremy Daer <jeremydaer@gmail.com> | 2015-10-11 23:32:57 -0700 |
commit | b8230e93e49d75960c3cbf69e0550ff6cc442b26 (patch) | |
tree | e0ee37da1562b598e16fa1716d2a83d996c05105 /railties/lib/rails | |
parent | ee2c093210dd51a4f5fb3ed25f2311c713aa222d (diff) | |
parent | 12248b885c9d6f8bf38698a87d2c453f134d96bb (diff) | |
download | rails-b8230e93e49d75960c3cbf69e0550ff6cc442b26.tar.gz rails-b8230e93e49d75960c3cbf69e0550ff6cc442b26.tar.bz2 rails-b8230e93e49d75960c3cbf69e0550ff6cc442b26.zip |
Merge pull request #21936 from y-yagi/do_not_generate_manifest_in_plugins
do not generate manifest.js in plugins
Diffstat (limited to 'railties/lib/rails')
-rw-r--r-- | railties/lib/rails/generators/rails/plugin/plugin_generator.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb index 910c4e743e..81bc902bde 100644 --- a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb +++ b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb @@ -226,7 +226,7 @@ task default: :test end def create_assets_manifest_file - build(:assets_manifest) unless api? + build(:assets_manifest) if !api? && engine? end def create_public_stylesheets_files |