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

This commit is contained in:
Douwe Maan 2017-11-13 12:47:43 +01:00
parent 95661d7b62
commit ade23934a1
2 changed files with 14 additions and 5 deletions

View File

@ -1,5 +1,3 @@
- auth_app_owner = @pre_auth.client.application.owner
%main{ :role => "main" }
.modal-no-backdrop.modal-doorkeepr-auth
.modal-content
@ -20,9 +18,14 @@
%p
An application called
= 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
= succeed "." do
= link_to auth_app_owner.name, user_path(auth_app_owner)
is requesting access to your GitLab account.
- 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
allowing access.
- if @pre_auth.scopes

View File

@ -0,0 +1,6 @@
---
title: Prevent error when authorizing an admin-created OAauth application without
a set owner
merge_request:
author:
type: fixed