diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-12-06 16:19:16 -0700 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-12-06 16:19:16 -0700 |
| commit | 3d65263aa1dd2a6aa0e138fc0708fec76c778d59 (patch) | |
| tree | b40562a6cbac96af4cfe0c74665630e5dcad9bd9 | |
| parent | 2e26ca1f986c913893b0123aad654879a5560d35 (diff) | |
| download | gitlab-ce-3d65263aa1dd2a6aa0e138fc0708fec76c778d59.tar.gz | |
Fix some of the issues with the jQuery UI update.
| -rw-r--r-- | app/assets/javascripts/application.js | 10 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.scss | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b7c4673c8e3..55a9e3cdcdf 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -6,11 +6,11 @@ // the compiled file. // /*= require jquery2 */ -/*= require jquery-ui/autocomplete */ -/*= require jquery-ui/datepicker */ -/*= require jquery-ui/draggable */ -/*= require jquery-ui/effect-highlight */ -/*= require jquery-ui/sortable */ +/*= require jquery-ui/widgets/autocomplete */ +/*= require jquery-ui/widgets/datepicker */ +/*= require jquery-ui/widgets/draggable */ +/*= require jquery-ui/effects/effect-highlight */ +/*= require jquery-ui/widgets/sortable */ /*= require jquery_ujs */ /*= require jquery.endless-scroll */ /*= require jquery.highlight */ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 8b93665d085..8cdf6efbb98 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -2,8 +2,8 @@ * This is a manifest file that'll automatically include all the stylesheets available in this directory * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at * the top of the compiled file, but it's generally better to create a new file per style scope. - *= require jquery-ui/datepicker - *= require jquery-ui/autocomplete + *= require jquery-ui/widgets/datepicker + *= require jquery-ui/widgets/autocomplete *= require jquery.atwho *= require select2 *= require_self |