adjust asset names for jquery-ui

This commit is contained in:
Praveen Arimbrathodiyil 2015-11-04 01:51:30 +05:30
parent 1e885470d0
commit 44e2882fb7

View file

@ -11,3 +11,25 @@ Index: gitlab/Gemfile
gem 'nprogress-rails', '~> 0.1.2.3' gem 'nprogress-rails', '~> 0.1.2.3'
gem 'raphael-rails', '~> 2.1.2' gem 'raphael-rails', '~> 2.1.2'
gem 'request_store', '~> 1.2.0' gem 'request_store', '~> 1.2.0'
Index: gitlab/app/assets/stylesheets/application.scss
===================================================================
--- gitlab.orig/app/assets/stylesheets/application.scss
+++ gitlab/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";