diff options
| author | Takuya Noguchi <takninnovationresearch@gmail.com> | 2018-05-26 23:21:20 +0900 |
|---|---|---|
| committer | Takuya Noguchi <takninnovationresearch@gmail.com> | 2018-06-03 22:14:40 +0900 |
| commit | e87031e4b127fe11044e2d761362f90fecda1537 (patch) | |
| tree | 52c352df424dbf11600e421b2322df8b042269e8 | |
| parent | fe0ebf76c49e2512b211c5d43152275c536f7e3a (diff) | |
| download | gitlab-ce-e87031e4b127fe11044e2d761362f90fecda1537.tar.gz | |
Update email_spec to 2.2.0
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 7 | ||||
| -rw-r--r-- | changelogs/unreleased/46845-update-email_spec-to-2-2-0.yml | 5 |
3 files changed, 10 insertions, 4 deletions
@@ -374,7 +374,7 @@ end group :test do gem 'shoulda-matchers', '~> 3.1.2', require: false - gem 'email_spec', '~> 1.6.0' + gem 'email_spec', '~> 2.2.0' gem 'json-schema', '~> 2.8.0' gem 'webmock', '~> 2.3.2' gem 'rails-controller-testing' if rails5? # Rails5 only gem. diff --git a/Gemfile.lock b/Gemfile.lock index 2efd89bf40d..c2f11ca4c84 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 diff --git a/changelogs/unreleased/46845-update-email_spec-to-2-2-0.yml b/changelogs/unreleased/46845-update-email_spec-to-2-2-0.yml new file mode 100644 index 00000000000..bf501340769 --- /dev/null +++ b/changelogs/unreleased/46845-update-email_spec-to-2-2-0.yml @@ -0,0 +1,5 @@ +--- +title: Update email_spec to 2.2.0 +merge_request: 19164 +author: Takuya Noguchi +type: other |