Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
644fe000
Commit
644fe000
authored
Nov 13, 2017
by
Douwe Maan
Committed by
Winnie Hellmann
Nov 13, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prevent error when authorizing an admin-created OAauth application without a set owner
parent
3df677a9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
5 deletions
+14
-5
app/views/doorkeeper/authorizations/new.html.haml
app/views/doorkeeper/authorizations/new.html.haml
+8
-5
changelogs/unreleased/dm-authorize-admin-oauth-application.yml
...elogs/unreleased/dm-authorize-admin-oauth-application.yml
+6
-0
No files found.
app/views/doorkeeper/authorizations/new.html.haml
View file @
644fe000
-
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.
-
auth_app_owner
=
@pre_auth
.
client
.
application
.
owner
-
if
auth_app_owner
This application was created by
=
succeed
"."
do
=
succeed
"."
do
=
link_to
auth_app_owner
.
name
,
user_path
(
auth_app_owner
)
=
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
...
...
changelogs/unreleased/dm-authorize-admin-oauth-application.yml
0 → 100644
View file @
644fe000
---
title
:
Prevent error when authorizing an admin-created OAauth application without
a set owner
merge_request
:
author
:
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment