2017-02-07 22:34:36 +05:30
|
|
|
adapt gitlab to use jquery-ui 6 directory structure
|
|
|
|
|
|
2016-12-07 16:32:31 +05:30
|
|
|
--- a/Gemfile
|
|
|
|
|
+++ b/Gemfile
|
2017-01-15 13:33:34 +05:30
|
|
|
@@ -224,7 +224,7 @@
|
2016-12-07 16:32:31 +05:30
|
|
|
gem 'gon', '~> 6.1'
|
|
|
|
|
gem 'jquery-atwho-rails', '~> 1.3', '>= 1.3.2'
|
|
|
|
|
gem 'jquery-rails', '~> 4.1'
|
|
|
|
|
-gem 'jquery-ui-rails', '~> 5.0'
|
|
|
|
|
+gem 'jquery-ui-rails', '~> 6.0'
|
|
|
|
|
gem 'request_store', '~> 1.3'
|
|
|
|
|
gem 'select2-rails', '~> 3.5', '>= 3.5.9'
|
|
|
|
|
gem 'virtus', '~> 1.0', '>= 1.0.1'
|
|
|
|
|
--- a/app/assets/javascripts/application.js
|
|
|
|
|
+++ b/app/assets/javascripts/application.js
|
|
|
|
|
@@ -5,11 +5,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.cookie */
|
|
|
|
|
/*= require jquery.endless-scroll */
|
|
|
|
|
--- a/spec/javascripts/new_branch_spec.js
|
|
|
|
|
+++ b/spec/javascripts/new_branch_spec.js
|
|
|
|
|
@@ -1,5 +1,5 @@
|
|
|
|
|
|
|
|
|
|
-/*= require jquery-ui/autocomplete */
|
|
|
|
|
+/*= require jquery-ui/widgets/autocomplete */
|
|
|
|
|
/*= require new_branch_form */
|
|
|
|
|
|
|
|
|
|
(function() {
|
