From 805b5bf8840c5bf53de02ff4dbc726b1eec2b920 Mon Sep 17 00:00:00 2001 From: Praveen Arimbrathodiyil Date: Fri, 17 Jun 2016 15:53:27 +0530 Subject: [PATCH] use jquery instead of jquery2 --- debian/changelog | 1 + debian/patches/0200-use-jquery-for-jquery2.patch | 16 ++++++++++++++++ debian/patches/series | 1 + 3 files changed, 18 insertions(+) create mode 100644 debian/patches/0200-use-jquery-for-jquery2.patch diff --git a/debian/changelog b/debian/changelog index 68f9fc8bb2..059b42f9ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Thu, 16 Jun 2016 21:51:02 +0530 diff --git a/debian/patches/0200-use-jquery-for-jquery2.patch b/debian/patches/0200-use-jquery-for-jquery2.patch new file mode 100644 index 0000000000..c594df6cc6 --- /dev/null +++ b/debian/patches/0200-use-jquery-for-jquery2.patch @@ -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 diff --git a/debian/patches/series b/debian/patches/series index b236ff1ef4..fe17ff4771 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ 0108-make-mysql-optional.patch source-init-functions.patch pid-log-paths.patch +0200-use-jquery-for-jquery2.patch