35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
Index: gitlab/Gemfile
|
|
===================================================================
|
|
--- gitlab.orig/Gemfile
|
|
+++ gitlab/Gemfile
|
|
@@ -200,7 +200,7 @@ gem 'gon', '~> 6.0.1'
|
|
gem 'jquery-atwho-rails', '~> 1.3.2'
|
|
gem 'jquery-rails', '~> 4.0.4'
|
|
gem 'jquery-scrollto-rails', '~> 1.4.3'
|
|
-gem 'jquery-ui-rails', '~> 4.2.1'
|
|
+gem 'jquery-ui-rails', '~> 5.0.5'
|
|
gem 'nprogress-rails', '~> 0.1.2.3'
|
|
gem 'raphael-rails', '~> 2.1.2'
|
|
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";
|