From 4eea104c69e59f6fa53c7bc15b986c69f29b60c8 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 11 Dec 2019 15:07:38 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- Gemfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 19b80dd3bd8..70a4b9a0b7c 100644 --- a/Gemfile +++ b/Gemfile @@ -170,8 +170,8 @@ group :unicorn do end group :puma do - gem 'puma', '~> 4.3.0', require: false - gem 'puma_worker_killer', '~> 0.1.1', require: false + gem 'gitlab-puma', '~> 4.3.1.gitlab.2', require: false + gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false gem 'rack-timeout', require: false end @@ -346,7 +346,7 @@ group :development do end group :development, :test do - gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET'] + gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET'] gem 'pry-byebug', '~> 3.5.1', platform: :mri gem 'pry-rails', '~> 0.3.4' -- cgit v1.2.1