summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-09-02 08:43:21 +0000
committerRémy Coutable <remy@rymai.me>2019-09-02 08:43:21 +0000
commitb7398bc1fdad6c721cfa35ff17cebc2cb00c8240 (patch)
tree48592d3a9f6d495b8b47b31c60dfa6eb17a00bb2 /Gemfile.lock
parentd6de7c65500b73f2e7f899e0c0a224aafca3d4d1 (diff)
parentc2452db59cf045f01244b8d72e14cb0144d19722 (diff)
downloadgitlab-ce-b7398bc1fdad6c721cfa35ff17cebc2cb00c8240.tar.gz
Merge branch 'fix-peek-on-puma' into 'master'
Fix Peek on Puma Closes #66528 See merge request gitlab-org/gitlab-ce!32213
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock10
1 files changed, 3 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index ea2c44a2992..0803cf7f752 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -149,8 +149,6 @@ GEM
adamantium (~> 0.2.0)
equalizer (~> 0.0.9)
concurrent-ruby (1.1.5)
- concurrent-ruby-ext (1.1.5)
- concurrent-ruby (= 1.1.5)
connection_pool (2.2.2)
contracts (0.11.0)
crack (0.4.3)
@@ -321,6 +319,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)
@@ -635,10 +635,6 @@ GEM
parser (2.6.3.0)
ast (~> 2.4.0)
parslet (1.8.2)
- peek (1.0.1)
- concurrent-ruby (>= 0.9.0)
- concurrent-ruby-ext (>= 0.9.0)
- railties (>= 4.0.0)
pg (1.1.4)
po_to_json (1.0.1)
json (>= 1.6.0)
@@ -1100,6 +1096,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)
@@ -1170,7 +1167,6 @@ DEPENDENCIES
omniauth_crowd (~> 2.2.0)
omniauth_openid_connect (~> 0.3.1)
org-ruby (~> 0.9.12)
- peek (~> 1.0.1)
pg (~> 1.1)
premailer-rails (~> 1.9.7)
prometheus-client-mmap (~> 0.9.8)