Merge branch 'master' into feature/removing-email-aliases

1 files changed, 5 insertions, 8 deletions

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 3fd641c..e6f6024 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -13,17 +13,14 @@
 //= require jquery
 //= require jquery_ujs
 //= require srp
-//= 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]');
-});
 //= require rails.validations
 //= require rails.validations.simple_form
+
+//= require tickets
+//= require users
+
+//= require_tree .