Merge 6dac893 into 7e6e5f7

collectiveidea · Sep 7, 2015 · fb0df4b · fb0df4b
2 parents 7e6e5f7 + 6dac893
commit fb0df4b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Gemfile b/Gemfile
@@ -19,6 +19,7 @@ group :test do
   if ENV['RAILS_VERSION'] == 'edge'
     gem 'activerecord', :github => 'rails/rails'
     gem 'actionmailer', :github => 'rails/rails'
+    gem 'arel', :github => 'rails/arel'
   else
     gem 'activerecord', (ENV['RAILS_VERSION'] || ['>= 3.0', '< 5.0'])
     gem 'actionmailer', (ENV['RAILS_VERSION'] || ['>= 3.0', '< 5.0'])

diff --git a/delayed_job.gemspec b/delayed_job.gemspec
@@ -1,5 +1,5 @@
 Gem::Specification.new do |spec|
-  spec.add_dependency 'activesupport', ['>= 3.0', '< 5.0']
+  spec.add_dependency 'activesupport', ['>= 3.0']
   spec.authors        = ['Brandon Keepers', 'Brian Ryckbost', 'Chris Gaffney', 'David Genord II', 'Erik Michaels-Ober', 'Matt Griffin', 'Steve Richert', 'Tobias Lütke']
   spec.description    = 'Delayed_job (or DJ) encapsulates the common pattern of asynchronously executing longer tasks in the background. It is a direct extraction from Shopify where the job table is responsible for a multitude of core tasks.'
   spec.email          = ['brian@collectiveidea.com']