summaryrefslogtreecommitdiff
path: root/qa/Gemfile
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-11 06:10:11 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-11 06:10:11 +0000
commit65a1175e466105fca1f40cb5a995fdb100ff334e (patch)
tree562573b4fc7a0cd748d07d6a1720b4b13d36386a /qa/Gemfile
parent3a52deac114dda8a1ee0da597c148b0dfc5dcf35 (diff)
downloadgitlab-ce-65a1175e466105fca1f40cb5a995fdb100ff334e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/Gemfile')
-rw-r--r--qa/Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/qa/Gemfile b/qa/Gemfile
index 58118340f24..86d8aa5c025 100644
--- a/qa/Gemfile
+++ b/qa/Gemfile
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
gem 'gitlab-qa'
-gem 'activesupport', '5.2.3' # This should stay in sync with the root's Gemfile
+gem 'activesupport', '6.0.2' # This should stay in sync with the root's Gemfile
gem 'capybara', '~> 3.29.0'
gem 'capybara-screenshot', '~> 1.0.23'
gem 'rake', '~> 12.3.0'