From 286257652bcf5c66acf9cf195c0174f2b1223707 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Wed, 14 Feb 2018 17:18:49 +0530
Subject: [PATCH] Add workaround for broken libjs-jquery-atwho (#890391)

---
 debian/control       | 2 ++
 debian/gitlab.links  | 2 +-
 debian/rake-tasks.sh | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index e93178b97d..2023119944 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,8 @@ Package: gitlab
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
+# workaround for broken libjs-jquery-atwho #890391
+ wget,
  lsb-base (>= 3.0-6),
  git (>= 1:2.7.3~),
  rake,
diff --git a/debian/gitlab.links b/debian/gitlab.links
index 8f01ef555f..5869d7d0ce 100644
--- a/debian/gitlab.links
+++ b/debian/gitlab.links
@@ -16,7 +16,7 @@ usr/share/javascript/pdf/build/pdf.worker.js usr/share/gitlab/vendor/assets/java
 usr/share/javascript/pdf/build/pdf.js usr/share/gitlab/vendor/assets/javascripts/pdf.js
 usr/share/javascript/pdf/build/pdf.js usr/share/gitlab/vendor/assets/javascripts/pdf.min.js
 usr/share/javascript/caret.js/jquery.caret.js usr/share/gitlab/vendor/assets/javascripts/jquery.caret.js
-usr/share/javascript/jquery-atwho/jquery.atwho.js usr/share/gitlab/vendor/assets/javascripts/jquery.atwho.js
+usr/share/gitlab/node_modules/at.js/dist/js/jquery.atwho.js usr/share/gitlab/vendor/assets/javascripts/jquery.atwho.js
 usr/share/javascript/jquery-nicescroll/jquery.nicescroll.min.js usr/share/gitlab/vendor/assets/javascripts/jquery.nicescroll.min.js
 usr/share/javascript/clipboard/clipboard.js usr/share/gitlab/vendor/assets/javascripts/clipboard.js
 usr/share/javascript/chartjs/Chart.js usr/share/gitlab/vendor/assets/javascripts/chart-lib.min.js
diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh
index 5e4598f65c..0aadeebdfc 100755
--- a/debian/rake-tasks.sh
+++ b/debian/rake-tasks.sh
@@ -32,6 +32,10 @@ echo "Installing node modules"
 runuser -u ${gitlab_user} -- sh -c 'install -d /var/lib/gitlab/node_modules'
 runuser -u ${gitlab_user} -- sh -c 'npm install npm'
 runuser -u ${gitlab_user} -- sh -c 'node_modules/.bin/npm install'
+# workaround for broken libjs-jquery-atwho #890391
+# npm i at.js won't work as it needs jquery@^1.7.0 as peer dependency
+runuser -u ${gitlab_user} -- sh -c 'wget  -O /tmp/at.js.tar.gz `npm view at.js dist.tarball`'
+runuser -u ${gitlab_user} -- sh -c 'tar -C node_modules --transform "s/package/at.js/" -zxf /tmp/at.js.tar.gz'
 runuser -u ${gitlab_user} -- sh -c 'rm -rf node_modules/webpack'
 runuser -u ${gitlab_user} -- sh -c 'NODE_PATH=/usr/share/gitlab/node_modules webpack --config config/webpack.config.js'