remove trailing white-spaces from app/controllers/application_controller.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10566 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
615f8957c5
commit
6d6f42c6a9
|
@ -22,7 +22,7 @@ class Unauthorized < Exception; end
|
|||
|
||||
class ApplicationController < ActionController::Base
|
||||
include Redmine::I18n
|
||||
|
||||
|
||||
class_attribute :accept_api_auth_actions
|
||||
class_attribute :accept_rss_auth_actions
|
||||
class_attribute :model_object
|
||||
|
@ -90,7 +90,7 @@ class ApplicationController < ActionController::Base
|
|||
def find_current_user
|
||||
user = nil
|
||||
unless api_request?
|
||||
if session[:user_id]
|
||||
if session[:user_id]
|
||||
# existing session
|
||||
user = (User.active.find(session[:user_id]) rescue nil)
|
||||
elsif autologin_user = try_to_autologin
|
||||
|
|
Loading…
Reference in New Issue