diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-05 15:07:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-05 15:07:43 +0300 |
commit | 872319738757edc0483346c75a2407f7019b963f (patch) | |
tree | d5953edec6184dda1f53c5994c3ebcebc9e815a2 /Gemfile.lock | |
parent | 8f764d21b0011056e1492d92afe3bd40b847b9f7 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 054a491a019..cba3d118a7e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -748,7 +748,7 @@ GEM pry-rails (0.3.6) pry (>= 0.10.4) public_suffix (3.1.1) - puma (4.3.0) + puma (4.3.1) nio4r (~> 2.0) puma_worker_killer (0.1.1) get_process_mem (~> 0.2) |