From 4b57a2b79c3cbf14b55b090d13332b071eda6f8f Mon Sep 17 00:00:00 2001 From: Philipe Fatio Date: Sat, 26 Mar 2016 11:12:10 +0100 Subject: [PATCH] Allow rails 5 --- .travis.yml | 1 + CHANGELOG.md | 4 ++++ Gemfile | 2 +- example/Gemfile | 2 +- premailer-rails.gemspec | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e7d99fb..298a701 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ env: - JRUBY_OPTS="--2.0" matrix: - ACTION_MAILER_VERSION=4 + - ACTION_MAILER_VERSION=5.beta - ACTION_MAILER_VERSION=master matrix: allow_failures: diff --git a/CHANGELOG.md b/CHANGELOG.md index c4742a8..9f03e37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## HEAD + +- Update rails dependency to allow rails 5 + ## v1.9.1 - Respect data-premailer="ignore" on link tags diff --git a/Gemfile b/Gemfile index f3b4b55..7599582 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' gemspec -action_mailer_version = ENV.fetch('ACTION_MAILER_VERSION', '4.0') +action_mailer_version = ENV.fetch('ACTION_MAILER_VERSION', '4') if action_mailer_version == 'master' git 'git://github.com/rails/rails.git' do diff --git a/example/Gemfile b/example/Gemfile index f155873..850ad24 100644 --- a/example/Gemfile +++ b/example/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '4.2.5' +gem 'rails', '~> 5.0.0.beta3' gem 'premailer-rails', path: '..' gem 'nokogiri' diff --git a/premailer-rails.gemspec b/premailer-rails.gemspec index 2cd5425..3198667 100644 --- a/premailer-rails.gemspec +++ b/premailer-rails.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |s| s.require_paths = ["lib"] s.add_dependency 'premailer', '~> 1.7', '>= 1.7.9' - s.add_dependency 'actionmailer', '>= 3', '< 5' + s.add_dependency 'actionmailer', '>= 3', '< 6' s.add_development_dependency 'rspec', '~> 3.3' s.add_development_dependency 'nokogiri'