diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-04 09:42:10 -0500 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-04 09:42:10 -0500 |
| commit | 770517d3e7f9926957b384084ab726651bfecaea (patch) | |
| tree | 6bacb67415be8769157fc59c9f5db6d0f56d94c8 /app/assets | |
| parent | 57074d606b20516921ff2297e2f94262b58e3d3e (diff) | |
| download | gitlab-ce-770517d3e7f9926957b384084ab726651bfecaea.tar.gz | |
Revert "Merge branch 'rs-remove-jquery-blockui' into 'master'
"reverting-rs-remove-jquery-blockui
This reverts commit bc12750fcc7a8637771e1449493cdd3cee9ebd64, reversing
changes made to 8a04b84e09c4318ac46808d0debc4997b52a2314.
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index b9b095e004a..7d3f18fcdbe 100644 --- 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 |