update to use jquery-ui-rails to 6.0

This commit is contained in:
Praveen Arimbrathodiyil 2016-12-07 16:32:31 +05:30
parent 932ed3eeb6
commit 12432f43ff
3 changed files with 41 additions and 1 deletions

2
debian/control vendored
View file

@ -198,7 +198,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
ruby-jquery-atwho-rails (>= 1.3.2~), ruby-jquery-atwho-rails (>= 1.3.2~),
ruby-jquery-rails (>= 4.1~), ruby-jquery-rails (>= 4.1~),
ruby-jquery-scrollto-rails (>= 1.4.3~), 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-nprogress-rails (>= 0.1.6.7~),
ruby-raphael-rails (>= 2.1.2~), ruby-raphael-rails (>= 2.1.2~),
ruby-request-store (>= 1.3~), ruby-request-store (>= 1.3~),

View file

@ -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() {

View file

@ -9,3 +9,4 @@ pid-log-paths.patch
052-relax-grape.patch 052-relax-grape.patch
0200-remove-order-dependency-in-label-finder-spec.patch 0200-remove-order-dependency-in-label-finder-spec.patch
cve-2016-9469.diff cve-2016-9469.diff
0210-use-jquery-ui-rails6.patch