aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-03-29 07:56:54 +0900
committeryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-03-29 07:56:54 +0900
commitfcf2430cb4e1efd6bf843bea3a39ff0531db1488 (patch)
treebe9cd4fc24f41a7740bd45e44157798885c713f2
parent5ac89b168b049e895cc26db90fe54ee77b63bcbc (diff)
downloadrails-fcf2430cb4e1efd6bf843bea3a39ff0531db1488.tar.gz
rails-fcf2430cb4e1efd6bf843bea3a39ff0531db1488.tar.bz2
rails-fcf2430cb4e1efd6bf843bea3a39ff0531db1488.zip
Remove unnecessary `javascript` option check
Follow up to #28546
-rw-r--r--railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt5
1 files changed, 1 insertions, 4 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 25870f19c8..4206002a1b 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
@@ -1,7 +1,7 @@
// This is a manifest file that'll be compiled into application.js, which will include all the files
// listed below.
//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, 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
@@ -11,9 +11,6 @@
// about supported directives.
//
<% unless options[:skip_javascript] -%>
-<% if options[:javascript] -%>
-//= require <%= options[:javascript] %>
-<% end -%>
//= require rails-ujs
<% unless options[:skip_turbolinks] -%>
//= require turbolinks