Merge branch 'reverting-rs-remove-jquery-blockui' into 'master'

Revert "Merge branch 'rs-remove-jquery-blockui' into 'master'" This reverts commit bc12750f, reversing changes made to 8a04b84e. See merge request !2285

Merge branch 'reverting-rs-remove-jquery-blockui' into 'master'
7e034a7f · Dmitriy Zaporozhets · 561acdeb · 770517d3 · 7e034a7f · 7e034a7f
Commit 7e034a7f authored Jan 04, 2016 by Dmitriy Zaporozhets
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

application.js.coffee app/assets/javascripts/application.js.coffee +1 -0

jquery.blockUI.js vendor/assets/javascripts/jquery.blockUI.js +0 -0

No files found.
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -13,6 +13,7 @@
 #= require jquery.waitforimages
 #= require jquery.atwho
 #= require jquery.scrollTo
+#= require jquery.blockUI
 #= require jquery.turbolinks
 #= require d3
 #= require cal-heatmap

--- a/vendor/assets/javascripts/jquery.blockUI.js
+++ b/vendor/assets/javascripts/jquery.blockUI.js