Merge branch 'master' into 373-cached-chroot

This commit is contained in:
Alexander Machehin 2014-04-09 14:53:01 +06:00
commit a7bcb64968
1 changed files with 0 additions and 2 deletions

View File

@ -55,8 +55,6 @@ class ApplicationController < ActionController::Base
def authenticate_user def authenticate_user
if user = find_user_by_token if user = find_user_by_token
sign_in user, store: false sign_in user, store: false
else
super
end end
end end