Allow rails 5

fphilipe · Apr 10, 2016 · 4b57a2b · 4b57a2b
1 parent a08efe7
commit 4b57a2b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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'