update to rails 4.2.5, clean up

2016-01-17 19:45:46 +01:00
parent ce19d61e1d
commit e53228eaf1
11 changed files with 255 additions and 209 deletions
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -108,8 +108,8 @@ class UsersController < ApplicationController
            end
            begin
              # these shouldn't be send in the background
-              RedstonerMailer.register_mail(@user, is_idiot).deliver
-              RedstonerMailer.register_info_mail(@user, is_idiot).deliver
+              RedstonerMailer.register_mail(@user, is_idiot).deliver_now
+              RedstonerMailer.register_info_mail(@user, is_idiot).deliver_now
            rescue => e
              Rails.logger.error "---"
              Rails.logger.error "WARNING: registration mail failed for user #{@user.try(:name)}, #{@user.try(:email)}"