kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Toshi MARUYAMA 2012-10-05 00:30:52 +00:00
parent 615f8957c5
commit 6d6f42c6a9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/application_controller.rb
View File

@ -22,7 +22,7 @@ class Unauthorized < Exception; end
class ApplicationController < ActionController::Base class ApplicationController < ActionController::Base
include Redmine::I18n include Redmine::I18n
class_attribute :accept_api_auth_actions class_attribute :accept_api_auth_actions
class_attribute :accept_rss_auth_actions class_attribute :accept_rss_auth_actions
class_attribute :model_object class_attribute :model_object
@ -90,7 +90,7 @@ class ApplicationController < ActionController::Base
def find_current_user def find_current_user
user = nil user = nil
unless api_request? unless api_request?
if session[:user_id] if session[:user_id]
# existing session # existing session
user = (User.active.find(session[:user_id]) rescue nil) user = (User.active.find(session[:user_id]) rescue nil)
elsif autologin_user = try_to_autologin elsif autologin_user = try_to_autologin