summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-10-05 00:30:52 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-10-05 00:30:52 +0000
commit6d6f42c6a9be5d140beae17e77574246dd7a1012 (patch)
treee0a5aed44a255b89eba151ed5f7be6aa8c434b41 /app
parent615f8957c56a056fff1265483998fff3e69eb8b0 (diff)
downloadredmine-6d6f42c6a9be5d140beae17e77574246dd7a1012.tar.gz
redmine-6d6f42c6a9be5d140beae17e77574246dd7a1012.zip
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
Diffstat (limited to 'app')
-rw-r--r--app/controllers/application_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 5be896ee4..e5234a4bc 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -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