Merge 3347e5b into b70bc73

smartinez87 · Jan 19, 2019 · 22f97ce · 22f97ce
2 parents b70bc73 + 3347e5b
commit 22f97ce
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -19,6 +19,7 @@ gemfile:
   - gemfiles/rails5_0.gemfile
   - gemfiles/rails5_1.gemfile
   - gemfiles/rails5_2.gemfile
+  - gemfiles/rails6_0.gemfile
 matrix:
   exclude:
     - rvm: 2.1.10
@@ -27,11 +28,15 @@ matrix:
       gemfile: gemfiles/rails5_1.gemfile
     - rvm: 2.1.10
       gemfile: gemfiles/rails5_2.gemfile
+    - rvm: 2.1.10
+      gemfile: gemfiles/rails6_0.gemfile
     # rails <=4.1 segfaults with ruby 2.4+
     - rvm: 2.4.3
       gemfile: gemfiles/rails4_0.gemfile
     - rvm: 2.4.3
       gemfile: gemfiles/rails4_1.gemfile
+    - rvm: 2.4.3
+      gemfile: gemfiles/rails6_0.gemfile
     - rvm: 2.5.0
       gemfile: gemfiles/rails4_0.gemfile
     - rvm: 2.5.0

diff --git a/exception_notification.gemspec b/exception_notification.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency("actionmailer", ">= 4.0", "< 6")
   s.add_dependency("activesupport", ">= 4.0", "< 6")
 
-  s.add_development_dependency "rails", ">= 4.0", "< 6"
+  s.add_development_dependency "rails", ">= 4.0", "< 7"
   s.add_development_dependency "resque", "~> 1.2.0"
   # Sidekiq 3.2.2 does not support Ruby 1.9.
   s.add_development_dependency "sidekiq", "~> 3.0.0", "< 3.2.2"

diff --git a/gemfiles/rails6_0.gemfile b/gemfiles/rails6_0.gemfile
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0"
+
+gemspec path: "../"