Merge branch 'master' into 373-cached-chroot

2014-04-09 14:53:01 +06:00 · 2014-04-09 14:53:01 +06:00 · a7bcb64968
parent ae889047ac 2aec96d989
commit a7bcb64968
1 changed files with 0 additions and 2 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -55,8 +55,6 @@ class ApplicationController < ActionController::Base
  def authenticate_user
    if user = find_user_by_token
      sign_in user, store: false
-    else
-      super
    end
  end