diff --git a/debian/gbp.conf b/debian/gbp.conf index ba3aa59ad7..7becee21c1 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,2 +1,2 @@ [DEFAULT] -component = [ 'core-js', 'derailed-benchmarks', 'heapy', 'elasticsearch-model', 'elasticsearch-rails', 'faraday-middleware-aws-signers-v4', 'gitlab-peek' ] +component = [ 'core-js', 'derailed-benchmarks', 'heapy', 'elasticsearch-model', 'elasticsearch-rails', 'faraday-middleware-aws-signers-v4' ] diff --git a/debian/gitlab.install b/debian/gitlab.install index 6a94c6bb3a..abb8a51012 100644 --- a/debian/gitlab.install +++ b/debian/gitlab.install @@ -65,7 +65,6 @@ public var/lib/gitlab db var/lib/gitlab core-js usr/share/gitlab/vendor/node_modules derailed-benchmarks usr/share/gitlab/vendor/gems -gitlab-peek usr/share/gitlab/vendor/gems heapy usr/share/gitlab/vendor/gems elasticsearch-model usr/share/gitlab/vendor/gems elasticsearch-rails usr/share/gitlab/vendor/gems diff --git a/debian/patches/0480-embed-gitlab-peek.patch b/debian/patches/0480-embed-gitlab-peek.patch deleted file mode 100644 index 6e21ba8283..0000000000 --- a/debian/patches/0480-embed-gitlab-peek.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Gemfile -+++ b/Gemfile -@@ -304,7 +304,7 @@ - - # Perf bar - # https://gitlab.com/gitlab-org/gitlab/issues/13996 --gem 'gitlab-peek', '~> 0.0.1', require: 'peek' -+gem 'gitlab-peek', '~> 0.0.1', require: 'peek', path: 'vendor/gems/gitlab-peek' - - # Snowplow events tracking - gem 'snowplow-tracker', '~> 0.6.1' diff --git a/debian/patches/series b/debian/patches/series index 98a757c873..e1e209eda5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,7 +11,6 @@ 0480-embed-elasticsearch-model.patch 0480-embed-elasticsearch-rails.patch 0480-embed-faraday-middleware-aws-signers-v4.patch -0480-embed-gitlab-peek.patch 0482-remove-ee-only-gems.patch 0484-relax-asciidoctor-plantuml.patch 0485-relax-responders.patch diff --git a/debian/watch b/debian/watch index 7cd94df94c..ac45631694 100644 --- a/debian/watch +++ b/debian/watch @@ -23,6 +23,3 @@ https://gemwatch.debian.net/elasticsearch-model .*/elasticsearch-rails-(0.1.*).t opts="pgpmode=none,component=faraday-middleware-aws-signers-v4" \ https://gemwatch.debian.net/faraday_middleware-aws-signers-v4 .*/faraday_middleware-aws-signers-v4-(0.1.*).tar.gz ignore - -opts="pgpmode=none,component=gitlab-peek" \ -https://gemwatch.debian.net/gitlab-peek .*/gitlab-peek-(.*).tar.gz ignore