diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-06-04 15:48:27 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-06-04 15:48:27 +0000 |
| commit | e30168ddb77dbb12375e255c54463f6132c95945 (patch) | |
| tree | f52e7288dfb48169845377f12d0fa9334e43445e /Gemfile.lock | |
| parent | 35ba75f6b93c77f078ab2cf538a256f8aa534eb3 (diff) | |
| parent | d46c12290d74e9faac888bf5de5cc1d84a00b675 (diff) | |
| download | gitlab-ce-e30168ddb77dbb12375e255c54463f6132c95945.tar.gz | |
Merge branch '46845-update-email_spec-to-2-2-0' into 'master'
Update email_spec to 2.2.0
Closes #46845
See merge request gitlab-org/gitlab-ce!19164
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e6e8f3d11bc..b06755edb60 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -178,9 +178,10 @@ GEM dropzonejs-rails (0.7.2) rails (> 3.1) email_reply_trimmer (0.1.6) - email_spec (1.6.0) + email_spec (2.2.0) + htmlentities (~> 4.3.3) launchy (~> 2.1) - mail (~> 2.2) + mail (~> 2.7) encryptor (3.0.0) equalizer (0.0.11) erubis (2.7.0) @@ -1012,7 +1013,7 @@ DEPENDENCIES doorkeeper-openid_connect (~> 1.3) dropzonejs-rails (~> 0.7.1) email_reply_trimmer (~> 0.1) - email_spec (~> 1.6.0) + email_spec (~> 2.2.0) factory_bot_rails (~> 4.8.2) faraday (~> 0.12) fast_blank |