diff --git a/debian/gbp.conf b/debian/gbp.conf index 7becee21c1..ba3aa59ad7 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' ] +component = [ 'core-js', 'derailed-benchmarks', 'heapy', 'elasticsearch-model', 'elasticsearch-rails', 'faraday-middleware-aws-signers-v4', 'gitlab-peek' ] diff --git a/debian/gitlab.install b/debian/gitlab.install index c7fc4aa090..d3dbe3e015 100644 --- a/debian/gitlab.install +++ b/debian/gitlab.install @@ -65,6 +65,7 @@ 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 new file mode 100644 index 0000000000..6281356645 --- /dev/null +++ b/debian/patches/0480-embed-gitlab-peek.patch @@ -0,0 +1,11 @@ +--- a/Gemfile ++++ b/Gemfile +@@ -303,7 +303,7 @@ + + # Perf bar + # https://gitlab.com/gitlab-org/gitlab-ee/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 84e6499c82..9c71a130ad 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,6 +11,7 @@ 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 0483-relax-kubeclient.patch 0500-set-webpack-root.patch diff --git a/debian/upstream-file-list b/debian/upstream-file-list index 8e9f47c735..dae1c710c0 100644 --- a/debian/upstream-file-list +++ b/debian/upstream-file-list @@ -72,6 +72,7 @@ elasticsearch-rails faraday-middleware-aws-signers-v4 fixtures generator_templates +gitlab-peek haml_lint heapy jest.config.js diff --git a/debian/watch b/debian/watch index ac45631694..7cd94df94c 100644 --- a/debian/watch +++ b/debian/watch @@ -23,3 +23,6 @@ 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