use jquery instead of jquery2

This commit is contained in:
Praveen Arimbrathodiyil 2016-06-17 15:53:27 +05:30
parent 24f4e26010
commit 805b5bf884
3 changed files with 18 additions and 0 deletions

1
debian/changelog vendored
View file

@ -2,6 +2,7 @@ gitlab (8.9.0+dfsg~rc4-1) UNRELEASED; urgency=medium
* New upstream release candidate
* Refresh patches
* Use jquery in place of jquery2 (debian has only jquery and it has same API)
-- Pirate Praveen <praveen@debian.org> Thu, 16 Jun 2016 21:51:02 +0530

View file

@ -0,0 +1,16 @@
jquery 1.x and 2.x use same api
http://lists.alioth.debian.org/pipermail/pkg-javascript-devel/2015-September/011230.html
Index: gitlab/app/assets/javascripts/application.js.coffee
===================================================================
--- gitlab.orig/app/assets/javascripts/application.js.coffee
+++ gitlab/app/assets/javascripts/application.js.coffee
@@ -4,7 +4,7 @@
# It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
# the compiled file.
#
-#= require jquery2
+#= require jquery
#= require jquery-ui/autocomplete
#= require jquery-ui/datepicker
#= require jquery-ui/draggable

View file

@ -7,3 +7,4 @@
0108-make-mysql-optional.patch
source-init-functions.patch
pid-log-paths.patch
0200-use-jquery-for-jquery2.patch