diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-14 00:09:30 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-14 00:09:30 +0000 |
| commit | 8957ace3159e5369a700a77614493ed6a8a98f93 (patch) | |
| tree | 98ff5be0caa30cfebb4e0cd0ae2ceaf21ce92eb4 /Gemfile.lock | |
| parent | 232e0a31f1e5d5b3a788dfc3dba8f8d41df36bf9 (diff) | |
| download | gitlab-ce-8957ace3159e5369a700a77614493ed6a8a98f93.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index ef8bffdc592..6da9a9a1740 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -391,7 +391,7 @@ GEM gitlab-mail_room (0.0.3) gitlab-markup (1.7.0) gitlab-net-dns (0.9.1) - gitlab-puma (4.3.1.gitlab.2) + gitlab-puma (4.3.3.gitlab.2) nio4r (~> 2.0) gitlab-puma_worker_killer (0.1.1.gitlab.1) get_process_mem (~> 0.2) @@ -1237,7 +1237,7 @@ DEPENDENCIES gitlab-mail_room (~> 0.0.3) gitlab-markup (~> 1.7.0) gitlab-net-dns (~> 0.9.1) - gitlab-puma (~> 4.3.1.gitlab.2) + gitlab-puma (~> 4.3.3.gitlab.2) gitlab-puma_worker_killer (~> 0.1.1.gitlab.1) gitlab-sidekiq-fetcher (= 0.5.2) gitlab-styles (~> 3.1.0) |