diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-12-24 12:01:22 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-12-24 12:01:22 +0200 |
| commit | d4e9c7584466d5275858ad3cf1d401891625aa1a (patch) | |
| tree | 64faa1ce0c1be4d21db2305546433ede0874a557 /app/assets/javascripts | |
| parent | 5da8c1f77a7a6f65366c02d17af763c0e19996bf (diff) | |
| parent | 94a55045dc0a838701884731ac88eb078319ccb1 (diff) | |
| download | gitlab-ce-d4e9c7584466d5275858ad3cf1d401891625aa1a.tar.gz | |
Merge remote-tracking branch 'origin/master' into emoji-picker-search
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 1539eba0faa..affab5bb030 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -5,7 +5,7 @@ # the compiled file. # #= require jquery -#= require jquery.ui.all +#= require jquery-ui #= require jquery_ujs #= require jquery.cookie #= require jquery.endless-scroll |