Merge branch 'master' into 373-cached-chroot
This commit is contained in:
commit
a7bcb64968
|
@ -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
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue