diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-08-03 18:44:26 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-08-03 18:44:26 +0200 |
| commit | 47fbd2e909e284ee6e285ca2fbe51e7822d9707f (patch) | |
| tree | 59d88a0dc4e5fca3828644eaeab5fd1abb9947e2 | |
| parent | 351d62e0e8dbabb86ce04f1007d78d048e5fc72a (diff) | |
| parent | 271c8e12af9c0176f784e2d57da536669ad84a97 (diff) | |
| download | rails-47fbd2e909e284ee6e285ca2fbe51e7822d9707f.tar.gz rails-47fbd2e909e284ee6e285ca2fbe51e7822d9707f.tar.bz2 rails-47fbd2e909e284ee6e285ca2fbe51e7822d9707f.zip | |
Merge pull request #21109 from vngrs/update_javascript_manifest_doc
Inform user to add script in correct location into the application.js manifest file [ci skip]
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/rails/javascripts.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt b/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt index cb86978d4c..c88426ec06 100644 --- a/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt +++ b/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt @@ -5,7 +5,7 @@ // or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path. // // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the -// compiled file. +// compiled file. JavaScript code in this file should be added after the last require_* statement. // // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details // about supported directives. diff --git a/railties/lib/rails/generators/rails/plugin/templates/rails/javascripts.js b/railties/lib/rails/generators/rails/plugin/templates/rails/javascripts.js index 8913b40f69..e54c6461cc 100644 --- a/railties/lib/rails/generators/rails/plugin/templates/rails/javascripts.js +++ b/railties/lib/rails/generators/rails/plugin/templates/rails/javascripts.js @@ -5,7 +5,7 @@ // or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path. // // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the -// compiled file. +// compiled file. JavaScript code in this file should be added after the last require_* statement. // // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details // about supported directives. |