From 15954a9b7fa58ae1588470512b77c0cdebcb75d4 Mon Sep 17 00:00:00 2001
From: Sruthi Chandran <srud@disroot.org>
Date: Mon, 13 Jan 2020 22:01:20 +0530
Subject: [PATCH] Remove embedded core-js as required version is now available

---
 debian/control            | 2 +-
 debian/gbp.conf           | 2 +-
 debian/gitlab.install     | 1 -
 debian/upstream-file-list | 1 +
 debian/watch              | 4 ----
 5 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index 22d22cf9fb..7a55360b52 100644
--- a/debian/control
+++ b/debian/control
@@ -345,7 +345,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  node-cache-loader (>= 2.0.1~),
  node-chart.js (>= 2.7.2~),
 # need transition (embedded)
- node-core-js (<< 3~),
+ node-core-js (>= 3.2.1~),
  node-css-loader,
  node-d3 (>= 5.12~),
  node-d3-array,
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 95f75947cc..9b0713c895 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,2 @@
 [DEFAULT]
-component = [ 'core-js', 'derailed-benchmarks', 'elasticsearch-model', 'elasticsearch-rails', 'faraday-middleware-aws-signers-v4', 'doorkeeper' ]
+component = [ 'derailed-benchmarks', 'elasticsearch-model', 'elasticsearch-rails', 'faraday-middleware-aws-signers-v4', 'doorkeeper' ]
diff --git a/debian/gitlab.install b/debian/gitlab.install
index 510b8177ca..fc31ab6fde 100644
--- a/debian/gitlab.install
+++ b/debian/gitlab.install
@@ -63,7 +63,6 @@ yarn.lock /var/lib/gitlab
 shared var/lib/gitlab
 public var/lib/gitlab
 db var/lib/gitlab
-core-js usr/share/gitlab/vendor/node_modules
 derailed-benchmarks usr/share/gitlab/vendor/gems
 elasticsearch-model usr/share/gitlab/vendor/gems
 elasticsearch-rails usr/share/gitlab/vendor/gems
diff --git a/debian/upstream-file-list b/debian/upstream-file-list
index d87aed253e..2df885200e 100644
--- a/debian/upstream-file-list
+++ b/debian/upstream-file-list
@@ -80,6 +80,7 @@ lib
 locale
 log
 package.json
+package.json.rej
 plugins
 public
 qa
diff --git a/debian/watch b/debian/watch
index 29a6dac402..f01f1c4da3 100644
--- a/debian/watch
+++ b/debian/watch
@@ -5,10 +5,6 @@ filenamemangle=s/.*v(.*)\/.*/gitlab-$1.tar.gz/,\
 dversionmangle=s/(\d)[\+]?(debian|dfsg|ds|deb|gh)\d*(\~)*(rc)*(\d)*$/$1$3$4$5/ \
 " https://gitlab.com/gitlab-org/gitlab-foss/tags .*/gitlab-foss-v(\d[\d.]*)\.tar\.gz debian
 
-opts="searchmode=plain,pgpmode=none,component=core-js" \
-https://registry.npmjs.org/core-js \
-https://registry.npmjs.org/core-js/-/core-js-(3.[\d\.]*)@ARCHIVE_EXT@ ignore
-
 opts="pgpmode=none,component=derailed-benchmarks" \
 https://gemwatch.debian.net/derailed_benchmarks .*/derailed_benchmarks-(.*).tar.gz ignore