summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-11 15:07:38 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-11 15:07:38 +0000
commit4eea104c69e59f6fa53c7bc15b986c69f29b60c8 (patch)
tree2eff1ce7ac4a58de15b1f5980acfdb22c7b92ac0 /Gemfile
parentb86f474bf51e20d2db4cf0895d0a8e0894e31c08 (diff)
downloadgitlab-ce-4eea104c69e59f6fa53c7bc15b986c69f29b60c8.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile6
1 files changed, 3 insertions, 3 deletions
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'