Merge pull request #66 from brushbox/update-and-security-fix

use mandrill-api-json gem as it uses a patched version of json gem

.travis.yml

@@ -7,8 +7,6 @@ rvm:
   - 2.3
   - 2.4
   - 2.5.0
-before_install:
-  - gem update --system # fix ruby 2.5 travis build issue
 gemfile:
   - gemfiles/mail_2.6.gemfile
   - gemfiles/mail_2.7_0.gemfile

CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.3.7 (unreleased)
+
+- [#66](https://github.com/spovich/mandrill_dm/pull/66) Switch to security-patched fork of mandrill-api gem (mandrill-api-json). Patches CVE-2020-10663.
+
 ### 1.3.6 (2018-10-19)
 
 - [#63](https://github.com/spovich/mandrill_dm/pull/63) Adopt Mail::Field#unparsed_value public API, thanks @tensho

mandrill_dm.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'mandrill_dm'
-  s.version = '1.3.6'
-  s.date = '2018-10-19'
+  s.version = '1.3.7'
+  s.date = '2020-03-20'
   s.summary = 'A basic Mandrill delivery method for Rails.'
   s.description = 'A basic Mandrill delivery method for Rails.'
   s.authors = ['Jonathan Berglund', 'John Dell', 'Kirill Shnurov']
@@ -13,13 +13,13 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.required_ruby_version = '>= 2.0'
 
-  s.add_dependency 'mail',                    '>= 2.6'
-  s.add_dependency 'mandrill-api',            '~> 1.0.53'
+  s.add_dependency 'mail', '>= 2.6'
+  s.add_dependency 'mandrill-api-json', '~> 1.0.54'
 
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec',       '~> 3.7.0'
-  s.add_development_dependency 'rubocop',     '0.50.0'
-  s.add_development_dependency 'simplecov',   '~> 0.15.1'
+  s.add_development_dependency 'rspec', '~> 3.7.0'
+  s.add_development_dependency 'rubocop', '0.50.0'
+  s.add_development_dependency 'simplecov', '~> 0.15.1'
   s.add_development_dependency 'appraisal'
 end