Commit 644fe000 authored by Douwe Maan's avatar Douwe Maan Committed by Winnie Hellmann

Prevent error when authorizing an admin-created OAauth application without a set owner

parent 3df677a9
- auth_app_owner = @pre_auth.client.application.owner
%main{ :role => "main" } %main{ :role => "main" }
.modal-no-backdrop.modal-doorkeepr-auth .modal-no-backdrop.modal-doorkeepr-auth
.modal-content .modal-content
...@@ -20,9 +18,14 @@ ...@@ -20,9 +18,14 @@
%p %p
An application called An application called
= link_to @pre_auth.client.name, @pre_auth.redirect_uri, target: '_blank', rel: 'noopener noreferrer' = link_to @pre_auth.client.name, @pre_auth.redirect_uri, target: '_blank', rel: 'noopener noreferrer'
is requesting access to your GitLab account. This application was created by is requesting access to your GitLab account.
= succeed "." do
= link_to auth_app_owner.name, user_path(auth_app_owner) - auth_app_owner = @pre_auth.client.application.owner
- if auth_app_owner
This application was created by
= succeed "." do
= link_to auth_app_owner.name, user_path(auth_app_owner)
Please note that this application is not provided by GitLab and you should verify its authenticity before Please note that this application is not provided by GitLab and you should verify its authenticity before
allowing access. allowing access.
- if @pre_auth.scopes - if @pre_auth.scopes
......
---
title: Prevent error when authorizing an admin-created OAauth application without
a set owner
merge_request:
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment