diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-05-19 13:55:25 -0500 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-05-30 13:51:21 -0600 |
| commit | d287315dbf1a1493e3f2c2511e559204cc914ff8 (patch) | |
| tree | e8ad832255adec67b700a73e4cf853392e27bbb8 /Gemfile.lock | |
| parent | d47b2b92c9b5e80eb3430e2b4950e17646b8efd8 (diff) | |
| download | gitlab-ce-d287315dbf1a1493e3f2c2511e559204cc914ff8.tar.gz | |
Upgrade attr_encrypted and encryptor
attr_encrypted (1.3.4 => 3.0.1) Changelog:
https://github.com/attr-encrypted/attr_encrypted/blob/master/CHANGELOG.m
d
attr_encrypted 2.x included a vulnerability, so that major version is
skipped. 3.x requires that the algorithm and mode used by each
encrypted attribute is specified explicitly.
`nil` is no longer a valid value for the encrypted_value_iv field, so
it’s changed to a randomly generated string.
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 30a0a2fd183..7c873845cc3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -60,8 +60,8 @@ GEM oauth2 (~> 1.0) asciidoctor (1.5.3) ast (2.2.0) - attr_encrypted (1.3.4) - encryptor (>= 1.3.0) + attr_encrypted (3.0.1) + encryptor (~> 3.0.0) attr_required (1.0.0) autoprefixer-rails (6.2.3) execjs @@ -178,7 +178,7 @@ GEM email_spec (1.6.0) launchy (~> 2.1) mail (~> 2.2) - encryptor (1.3.0) + encryptor (3.0.0) equalizer (0.0.11) erubis (2.7.0) escape_utils (1.1.1) @@ -891,7 +891,7 @@ DEPENDENCIES allocations (~> 1.0) asana (~> 0.4.0) asciidoctor (~> 1.5.2) - attr_encrypted (~> 1.3.4) + attr_encrypted (~> 3.0.0) awesome_print (~> 1.2.0) babosa (~> 1.0.2) base32 (~> 0.3.0) |