Use gitlab-peek forked gemfix-peek-on-puma

2 files changed, 5 insertions, 10 deletions

diff --git a/Gemfile b/Gemfile
index 0611ad2110f..a8976eceba1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -295,7 +295,8 @@ gem 'gettext', '~> 3.2.2', require: false, group: :development
 gem 'batch-loader', '~> 1.4.0'
 
 # Perf bar
-gem 'peek', git: 'https://github.com/smcgivern/peek', branch: 'remove-peek-request-id'
+# https://gitlab.com/gitlab-org/gitlab-ee/issues/13996
+gem 'gitlab-peek', '~> 0.0.1', require: 'peek'
 
 # Snowplow events tracking
 gem 'snowplow-tracker', '~> 0.6.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 347969ef4d2..bbbf14a9784 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,3 @@
-GIT
-  remote: https://github.com/smcgivern/peek
-  revision: b7164ce54b63670f5406f4dc3cb3f5594d71bfaa
-  branch: remove-peek-request-id
-  specs:
-    peek (1.0.1)
-      railties (>= 4.0.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -325,6 +317,8 @@ GEM
       opentracing (~> 0.4)
       redis (> 3.0.0, < 5.0.0)
     gitlab-markup (1.7.0)
+    gitlab-peek (0.0.1)
+      railties (>= 4.0.0)
     gitlab-sidekiq-fetcher (0.5.1)
       sidekiq (~> 5)
     gitlab-styles (2.8.0)
@@ -1108,6 +1102,7 @@ DEPENDENCIES
   github-markup (~> 1.7.0)
   gitlab-labkit (~> 0.5)
   gitlab-markup (~> 1.7.0)
+  gitlab-peek (~> 0.0.1)
   gitlab-sidekiq-fetcher (= 0.5.1)
   gitlab-styles (~> 2.7)
   gitlab_omniauth-ldap (~> 2.1.1)
@@ -1179,7 +1174,6 @@ DEPENDENCIES
   omniauth_crowd (~> 2.2.0)
   omniauth_openid_connect (~> 0.3.1)
   org-ruby (~> 0.9.12)
-  peek!
   pg (~> 1.1)
   premailer-rails (~> 1.9.7)
   prometheus-client-mmap (~> 0.9.8)