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

diff --combined app/controllers/application_controller.rb
index 9949149aa66a7823ad768a288c8a48972d228f63,40f02300a469f4d6bc14373b4fe79c9d19fa172b..176fd8c2e060213d8264c1ccd1dd8cddca281df6
--- 1/app/controllers/application_controller.rb
--- 2/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@@ -304,7 -304,10 +304,7 @@@ class ApplicationController < ActionCon
    end
  
    def deny_access(_exception)
 -    if doorkeeper_token
 -      set_locale
 -      report_error t("oauth.permissions.missing"), :forbidden
 -    elsif current_user
 +    if current_user
        set_locale
        respond_to do |format|
          format.html { redirect_to :controller => "/errors", :action => "forbidden" }
@@@ -351,10 -354,4 +351,4 @@@
  
      referer&.to_s
    end
- 
-   def scope_enabled?(scope)
-     doorkeeper_token&.includes_scope?(scope)
-   end
- 
-   helper_method :scope_enabled?
  end