Skip to content

Commit

Permalink
Replace comment about Sprockets stub directive with a link to README …
Browse files Browse the repository at this point in the history
…about all directives

Conflicts:
	railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt
	railties/lib/rails/generators/rails/plugin_new/templates/rails/javascripts.js
  • Loading branch information
guilleiguaran committed Jun 4, 2013
1 parent ee95bbf commit 79af2c7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Expand Up @@ -7,8 +7,8 @@
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// compiled file.
//
// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
// GO AFTER THE REQUIRES BELOW.
// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
// about supported directives.
//
<% unless options[:skip_javascript] -%>
//= require <%= options[:javascript] %>
Expand Down
Expand Up @@ -7,7 +7,7 @@
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// compiled file.
//
// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
// GO AFTER THE REQUIRES BELOW.
// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
// about supported directives.
//
//= require_tree .

0 comments on commit 79af2c7

Please sign in to comment.