Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert "Remove unused daemons gem."

This reverts commit 20d155d.

daemons is in fact still used by the delayed_job script.

Conflicts:

	Gemfile
	Gemfile.lock
  • Loading branch information...
commit 4506e9db7621604a860578b33557c745778ff80f 1 parent 34c15ea
@chrismear chrismear authored
Showing with 3 additions and 0 deletions.
  1. +1 −0  Gemfile
  2. +2 −0  Gemfile.lock
View
1  Gemfile
@@ -37,6 +37,7 @@ gem "jquery-rails", "~>2.0.2"
gem "haml", "~>3.1.4"
gem "rdiscount", "~>1.6.8"
gem "pdfkit", "~>0.5.2"
+gem "daemons", "~>1.0.10"
gem "delayed_job", "~>3.0.2"
gem "delayed_job_active_record", "~>0.3.2"
gem "exception_notification_rails3", "~>1.2.0", :require => 'exception_notifier'
View
2  Gemfile.lock
@@ -67,6 +67,7 @@ GEM
capybara (>= 1.1.2)
cucumber (>= 1.1.8)
nokogiri (>= 1.5.0)
+ daemons (1.0.10)
database_cleaner (0.7.2)
delayed_job (3.0.2)
activesupport (~> 3.0)
@@ -231,6 +232,7 @@ DEPENDENCIES
capistrano (~> 2.11.2)
capybara (~> 1.1.2)
cucumber-rails (~> 1.3.0)
+ daemons (~> 1.0.10)
database_cleaner
delayed_job (~> 3.0.2)
delayed_job_active_record (~> 0.3.2)
Please sign in to comment.
Something went wrong with that request. Please try again.