start to upgrade to rails 4

1 files changed, 11 insertions, 4 deletions

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 25df688e..16675d7e 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,8 +1,14 @@
-// This is a manifest file that'll be compiled into including all the files listed below.
-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-// be included in the compiled file accessible from http://example.com/assets/application.js
+// 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, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, 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
-// the compiled file.
+// compiled file.
+//
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
 //
 //= require jquery
 //= require jquery-migrate
@@ -14,6 +20,7 @@
 //= require jquery.masonry
 //= require jquery-fileupload
 //= require jquery.embedly
+//= require turbolinks
 //= require tag-it
 //= require bootstrap
 //= require_tree .