Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/models/mailer.rb

@@ -34,13 +34,13 @@ class Mailer < ActionMailer::Base
       @target = cls
     end
     def method_missing(name, *args, &block)
-      if Setting.delayjob_enabled? && Object.const_defined?('Delayed')
-        # with delayed_job
-        @target.delay.send(name, *args, &block)
-      else
+      # if Setting.delayjob_enabled? && Object.const_defined?('Delayed')
+      #   # with delayed_job
+      #   @target.delay.send(name, *args, &block)
+      # else
         # without delayed_job
         @target.send(name, *args, &block).deliver
-      end
+      # end
     end
   end