kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Remove unnecessary javascript option check

Browse source 
Follow up to #28546
This commit is contained in:
yuuji.yaginuma 2017-03-29 07:56:54 +09:00
parent 5ac89b168b
commit fcf2430cb4
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt
View file

@ -1,7 +1,7 @@
// This is a manifest file that'll be compiled into application.js, which will include all the files // This is a manifest file that'll be compiled into application.js, which will include all the files
// listed below. // 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. // 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 // 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. // about supported directives.
// //
<% unless options[:skip_javascript] -%> <% unless options[:skip_javascript] -%>
<% if options[:javascript] -%>
//= require <%= options[:javascript] %>
<% end -%>
//= require rails-ujs //= require rails-ujs
<% unless options[:skip_turbolinks] -%> <% unless options[:skip_turbolinks] -%>
//= require turbolinks //= require turbolinks