Commit aca5aac2 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '325756-update-lockbox-gem-before-rails-6-1' into 'master'

Resolve "Update lockbox gem before Rails 6.1"

See merge request gitlab-org/gitlab!57283
parents 5524b34d ca70385d
......@@ -514,7 +514,7 @@ gem 'erubi', '~> 1.9.0'
gem 'mail', '= 2.7.1'
# File encryption
gem 'lockbox', '~> 0.3.3'
gem 'lockbox', '~> 0.6.2'
# Email validation
gem 'valid_email', '~> 0.1'
......
......@@ -707,7 +707,7 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
locale (2.1.3)
lockbox (0.3.3)
lockbox (0.6.2)
lograge (0.11.2)
actionpack (>= 4)
activesupport (>= 4)
......@@ -1478,7 +1478,7 @@ DEPENDENCIES
letter_opener_web (~> 1.3.4)
license_finder (~> 6.0)
licensee (~> 9.14.1)
lockbox (~> 0.3.3)
lockbox (~> 0.6.2)
lograge (~> 0.5)
loofah (~> 2.2)
lru_redux
......
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