Merge remote-tracking branch 'upstream/pull/5452'

[rails.git] / app / controllers / api_controller.rb

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index acf64c6e2533054a00aca83c64ee805435ad1049..9b2ee9b532ace14bbc30ed2c90083ff5a2b9fef9 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -82,8 +82,6 @@ class ApiController < ApplicationController
     if doorkeeper_token
       set_locale
       report_error t("oauth.permissions.missing"), :forbidden
     if doorkeeper_token
       set_locale
       report_error t("oauth.permissions.missing"), :forbidden

-    elsif current_user
-      head :forbidden

     else
       head :unauthorized
     end
     else
       head :unauthorized
     end