summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorMarkPochert <account@p4a.dk>2014-09-26 10:17:26 +0200
committerMarkPochert <account@p4a.dk>2014-09-26 10:17:26 +0200
commit1be7c25dce8e18b60e048f123314fc20605b2557 (patch)
treea90e8f2ec5d85a1aaa5f6fc3324597e59cc2e033 /app/assets
parent87cf5b7055451a387c64bd488dacf2bc03917913 (diff)
downloadgitlab-ce-1be7c25dce8e18b60e048f123314fc20605b2557.tar.gz
Update application.js.coffee
The require jquery.turbolinks should be before the require turbolinks. https://github.com/rails/turbolinks => "Add the gem to your project, then add the following line to your JavaScript manifest file, after jquery.js but before turbolinks.js"
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/application.js.coffee2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 86158d39ff1..a3da875b90a 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -15,8 +15,8 @@
#= require jquery.atwho
#= require jquery.scrollTo
#= require jquery.blockUI
-#= require turbolinks
#= require jquery.turbolinks
+#= require turbolinks
#= require bootstrap
#= require select2
#= require raphael