summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-27 15:30:20 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-27 15:30:20 +0000
commit9141b9ceccf6361be9b4da69d6ca7d93157c456e (patch)
tree0fd894747dc282dcd539df5391b195afb51ebb63 /app
parent88725a6b87961c5f3052259f84208a6ccb943b34 (diff)
downloadgitlab-ce-9141b9ceccf6361be9b4da69d6ca7d93157c456e.tar.gz
Add latest changes from gitlab-org/security/gitlab@12-10-stable-ee
Diffstat (limited to 'app')
-rw-r--r--app/controllers/oauth/authorized_applications_controller.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/app/controllers/oauth/authorized_applications_controller.rb b/app/controllers/oauth/authorized_applications_controller.rb
index 9cfa57c53a5..addec71f0bf 100644
--- a/app/controllers/oauth/authorized_applications_controller.rb
+++ b/app/controllers/oauth/authorized_applications_controller.rb
@@ -5,6 +5,13 @@ class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicatio
layout 'profile'
+ def index
+ respond_to do |format|
+ format.html { render "errors/not_found", layout: "errors", status: :not_found }
+ format.json { render json: "", status: :not_found }
+ end
+ end
+
def destroy
if params[:token_id].present?
current_resource_owner.oauth_authorized_tokens.find(params[:token_id]).revoke