Commit 719f6530 authored by Mark Lapierre's avatar Mark Lapierre

Merge branch 'sh-update-qa-activesupport' into 'master'

Update QA dependencies to use activesupport v6.0.2.2

See merge request gitlab-org/gitlab!30141
parents 1fd811a5 95c66345
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'gitlab-qa' gem 'gitlab-qa'
gem 'activesupport', '6.0.2' # This should stay in sync with the root's Gemfile gem 'activesupport', '~> 6.0.2.2' # This should stay in sync with the root's Gemfile
gem 'capybara', '~> 3.29.0' gem 'capybara', '~> 3.29.0'
gem 'capybara-screenshot', '~> 1.0.23' gem 'capybara-screenshot', '~> 1.0.23'
gem 'rake', '~> 12.3.0' gem 'rake', '~> 12.3.0'
......
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
activesupport (6.0.2) activesupport (6.0.2.2)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
...@@ -114,7 +114,7 @@ PLATFORMS ...@@ -114,7 +114,7 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
activesupport (= 6.0.2) activesupport (~> 6.0.2.2)
airborne (~> 0.2.13) airborne (~> 0.2.13)
capybara (~> 3.29.0) capybara (~> 3.29.0)
capybara-screenshot (~> 1.0.23) capybara-screenshot (~> 1.0.23)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment