summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorjessib <jessib@leap.se>2012-12-12 14:05:41 -0800
committerjessib <jessib@leap.se>2012-12-12 14:05:41 -0800
commit961fe13b784e7f44e55f9cd0a106728c69354a0f (patch)
treecf35c5a6b16a5e5c2497b86ce170204ec9c191ce /app/assets/javascripts
parent5e474bdaf93548f7bcc2d659bbbf11a19757d725 (diff)
parent49d0ffe5f689ecb651b65beb4050b3f38cbb226e (diff)
Merge branch 'feature-new-comments-refactor' into develop
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/application.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 23d7fef..3fd641c 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -16,7 +16,11 @@
//= require users
//= require_tree .
//= require bootstrap
+//= require bootstrap-editable
+//= require bootstrap-editable-rails
+//= require bootstrap-editable-inline
//= require jquery.pjax
+//= require tickets
$(function() {
$('a:not([data-remote]):not([data-behavior]):not([data-skip-pjax])').pjax('[data-pjax-container]');