Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-01-11 21:10:43 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-01-11 21:10:43 +0300
commitdcacb5daf7941dd2be05e6f688027baae92a6c81 (patch)
tree58e1a4b5be95bbc15f60c7c31a9709668ea1cb18 /Gemfile
parentec971a05e380fa580ae75dea30ab963112096525 (diff)
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 ebfa3796724..37964d454fa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -184,8 +184,8 @@ group :unicorn do
end
group :puma do
- gem 'gitlab-puma', '~> 4.3.3.gitlab.2', require: false
- gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false
+ gem 'puma', '~> 5.1.1', require: false
+ gem 'puma_worker_killer', '~> 0.3.1', require: false
end
# State machine
@@ -410,7 +410,7 @@ group :test do
gem 'rspec_profiling', '~> 0.0.6'
gem 'rspec-parameterized', require: false
- gem 'capybara', '~> 3.33.0'
+ gem 'capybara', '~> 3.34.0'
gem 'capybara-screenshot', '~> 1.0.22'
gem 'selenium-webdriver', '~> 3.142'