diff app/controllers/account_controller.rb @ 1521:2354ddf5a483 redmine-2.5-integration

Fix some merge/runtime problems
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Tue, 09 Sep 2014 14:27:58 +0100
parents a1bdbf8a87d5
children
line wrap: on
line diff
--- a/app/controllers/account_controller.rb	Tue Sep 09 10:02:18 2014 +0100
+++ b/app/controllers/account_controller.rb	Tue Sep 09 14:27:58 2014 +0100
@@ -39,7 +39,7 @@
     else
       authenticate_user
     end
-  rescue AuthSourceException => e
+  rescue AuthSource::AuthSourceException => e
     logger.error "An error occured when authenticating #{params[:username]}: #{e.message}"
     render_error :message => e.message
   end