Skip to content

Commit

Permalink
Merge pull request collectiveidea#755 from eitoball/rails_4_2
Browse files Browse the repository at this point in the history
Support Rails 4.2
  • Loading branch information
sferik committed Dec 22, 2014
2 parents c1c37bf + f3fa1ae commit 5b47c4a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -8,6 +8,7 @@ env:
- RAILS_VERSION="~> 3.2.0"
- RAILS_VERSION="~> 4.0.0"
- RAILS_VERSION="~> 4.1.0"
- RAILS_VERSION="~> 4.2.0"
- RAILS_VERSION="edge"
rvm:
- 1.9.3
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Expand Up @@ -20,8 +20,8 @@ group :test do
gem 'activerecord', :github => 'rails/rails'
gem 'actionmailer', :github => 'rails/rails'
else
gem 'activerecord', (ENV['RAILS_VERSION'] || ['>= 3.0', '< 4.2'])
gem 'actionmailer', (ENV['RAILS_VERSION'] || ['>= 3.0', '< 4.2'])
gem 'activerecord', (ENV['RAILS_VERSION'] || ['>= 3.0', '< 5.0'])
gem 'actionmailer', (ENV['RAILS_VERSION'] || ['>= 3.0', '< 5.0'])
end

gem 'coveralls', :require => false
Expand Down
2 changes: 1 addition & 1 deletion delayed_job.gemspec
@@ -1,5 +1,5 @@
Gem::Specification.new do |spec|
spec.add_dependency 'activesupport', ['>= 3.0', '< 4.2']
spec.add_dependency 'activesupport', ['>= 3.0', '< 5.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']
Expand Down

0 comments on commit 5b47c4a

Please sign in to comment.