Merge branch 'master' into updated-gems
Conflicts: Gemfile Gemfile.lock
This commit is contained in:
commit
bdce1b5872
64 changed files with 1039 additions and 472 deletions
1
config/initializers/resque.rb
Normal file
1
config/initializers/resque.rb
Normal file
|
|
@ -0,0 +1 @@
|
|||
Resque.inline = Rails.env.test?
|
||||
Loading…
Add table
Add a link
Reference in a new issue