diff options
author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2016-06-20 01:28:53 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-20 01:28:53 -0400 |
commit | 0c998a14c45430afe85188f8ad13a696b077ffd9 (patch) | |
tree | da77c4501b3663f3ccd31b2111728dad3774260c /railties/lib | |
parent | 994aeaa1dd72e0651da1c704bb8c44b552b10d35 (diff) | |
parent | 55bb28bd5ac6979bedef330ebbccb6f6a5f61a2a (diff) | |
download | rails-0c998a14c45430afe85188f8ad13a696b077ffd9.tar.gz rails-0c998a14c45430afe85188f8ad13a696b077ffd9.tar.bz2 rails-0c998a14c45430afe85188f8ad13a696b077ffd9.zip |
Merge pull request #25433 from prathamesh-sonpatki/cleanup-app-generator-code
No need to have conditional based on api options in assets
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/assets/config/manifest.js.tt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/app/assets/config/manifest.js.tt b/railties/lib/rails/generators/rails/app/templates/app/assets/config/manifest.js.tt index f4ee1409af..70b579d10e 100644 --- a/railties/lib/rails/generators/rails/app/templates/app/assets/config/manifest.js.tt +++ b/railties/lib/rails/generators/rails/app/templates/app/assets/config/manifest.js.tt @@ -1,6 +1,4 @@ -<% unless options.api? -%> //= link_tree ../images -<% end -%> <% unless options.skip_javascript -%> //= link_directory ../javascripts .js <% end -%> |