diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-12-22 17:14:01 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-12-22 17:14:01 -0500 |
| commit | 5ad192ced2e3daf0c6b34fee11a50351cfe0918f (patch) | |
| tree | 1c93d2a925e3249dc57c068f5259b2e4e45c9972 | |
| parent | 26fa1524f7e5ba10d0ad9f2c2ab5c5a5daaeae69 (diff) | |
| download | gitlab-ce-rs-update-jquery.tar.gz | |
Fix paths for jquery-ui assetsrs-update-jquery
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.scss | 6 |
2 files changed, 4 insertions, 4 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 diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 7b060ce4853..0c0451fe4dd 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/datepicker + *= require jquery-ui/autocomplete *= require jquery.atwho *= require select2 *= require_self @@ -48,4 +48,4 @@ /* * Styles for JS behaviors. */ -@import "behaviors.scss";
\ No newline at end of file +@import "behaviors.scss"; |