Replaced delayed_job with resque. See README_DEVEL

app/controllers/feedback_controller.rb

@@ -5,7 +5,7 @@ class FeedbackController < ApplicationController
 
   def create
     if params[:message].present?
-      Mailer.feedback(FoodsoftConfig.scope, current_user, params[:message]).deliver
+      Mailer.feedback(current_user, params[:message]).deliver
       redirect_to root_url, :notice => "Das Feedback wurde erfolgreich verschickt. Vielen Dank!"
     else
       render :action => 'new'

app/controllers/invites_controller.rb

@@ -10,7 +10,7 @@ class InvitesController < ApplicationController
   def create
     @invite = Invite.new(params[:invite])
     if @invite.save
-      Mailer.delay.invite(FoodsoftConfig.scope, @invite.id)
+      Mailer.invite(@invite)
 
       respond_to do |format|
         format.html do

app/controllers/login_controller.rb

@@ -14,7 +14,7 @@ class LoginController < ApplicationController
       user.reset_password_token = user.new_random_password(16)
       user.reset_password_expires = Time.now.advance(:days => 2)
       if user.save
-        Mailer.delay.reset_password(FoodsoftConfig.scope, user.id)
+        Mailer.reset_password(user)
         logger.debug("Sent password reset email to #{user.email}.")
       end
     end

app/controllers/messages_controller.rb

@@ -2,7 +2,7 @@ class MessagesController < ApplicationController
 
   # Renders the "inbox" action.
   def index
-    @messages = Message.public.page(params[:page]).per(@per_page).order('created_at DESC')
+    @messages = Message.public.page(params[:page]).per(@per_page).order('created_at DESC').includes(:sender)
   end
 
   # Creates a new message object.
@@ -14,7 +14,7 @@ class MessagesController < ApplicationController
   def create
     @message = @current_user.send_messages.new(params[:message])
     if @message.save
-      Message.delay.deliver(@message.id)
+      Resque.enqueue(UserNotifier, FoodsoftConfig.scope, 'message_deliver', @message.id)
       redirect_to messages_url, :notice => "Nachricht ist gespeichert und wird versendet."
     else
       render :action => 'new'