[DRE-commits] [gitlab] 02/02: update to use jquery-ui-rails to 6.0

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository gitlab.

commit 12432f43ffb789c76c699f4718c879a879c12e93
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Dec 7 16:32:31 2016 +0530

    update to use jquery-ui-rails to 6.0
---
 debian/control                                 |  2 +-
 debian/patches/0210-use-jquery-ui-rails6.patch | 39 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index f59ada7..bc4a444 100644
--- a/debian/control
+++ b/debian/control
@@ -198,7 +198,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-jquery-atwho-rails (>= 1.3.2~),
  ruby-jquery-rails (>= 4.1~),
  ruby-jquery-scrollto-rails (>= 1.4.3~),
- ruby-jquery-ui-rails (>= 5.0.0~),
+ ruby-jquery-ui-rails (>= 6.0~),
  ruby-nprogress-rails (>= 0.1.6.7~),
  ruby-raphael-rails (>= 2.1.2~),
  ruby-request-store (>= 1.3~),
diff --git a/debian/patches/0210-use-jquery-ui-rails6.patch b/debian/patches/0210-use-jquery-ui-rails6.patch
new file mode 100644
index 0000000..42a1e70
--- /dev/null
+++ b/debian/patches/0210-use-jquery-ui-rails6.patch
@@ -0,0 +1,39 @@
+--- a/Gemfile
++++ b/Gemfile
+@@ -225,7 +225,7 @@
+ 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() {
diff --git a/debian/patches/series b/debian/patches/series
index 73108a3..8d45c90 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ pid-log-paths.patch
 052-relax-grape.patch
 0200-remove-order-dependency-in-label-finder-spec.patch
 cve-2016-9469.diff
+0210-use-jquery-ui-rails6.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git