diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-01-30 10:03:40 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-01-30 10:03:40 +0000 |
| commit | 3d61cf9f1bfaa9d0ffd5cc36e54162c0f0b59c61 (patch) | |
| tree | 09ab03799bbb10c036e623934f0a43eee2320e1e | |
| parent | dec21517186f7406da2efd76569b4dff4fa711e0 (diff) | |
| parent | 103d67768d5dc3b3f2676d3f4bc7e2fb5581083e (diff) | |
| download | gitlab-ce-3d61cf9f1bfaa9d0ffd5cc36e54162c0f0b59c61.tar.gz | |
Merge branch 'warn-admin-oauth' into 'master'
Warn admin of granting admin rights during OAuth
Fixes #3951
Warning style the same as the warning a user sees on a archived project.
See merge request !2601
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/doorkeeper/authorizations/new.html.haml | 11 |
2 files changed, 11 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index e5a32d3b49e..d1a0e467147 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -41,6 +41,7 @@ v 8.4.1 and Nokogiri (1.6.7.2) - Fix redirect loop during import - Fix diff highlighting for all syntax themes + - Warn admin during OAuth of granting admin rights (Zeger-Jan van de Weg) v 8.4.0 - Allow LDAP users to change their email if it was not set by the LDAP server diff --git a/app/views/doorkeeper/authorizations/new.html.haml b/app/views/doorkeeper/authorizations/new.html.haml index 15f9ee266c1..eae80e5210f 100644 --- a/app/views/doorkeeper/authorizations/new.html.haml +++ b/app/views/doorkeeper/authorizations/new.html.haml @@ -4,6 +4,15 @@ Authorize %strong.text-info= @pre_auth.client.name to use your account? + + - if current_user.admin? + .text-warning.prepend-top-20 + %p + = icon("exclamation-triangle fw") + You are an admin, which means granting access to + %strong #{@pre_auth.client.name} + will allow them to interact with GitLab as an admin as well. Proceed with caution. + - if @pre_auth.scopes #oauth-permissions %p This application will be able to: @@ -25,4 +34,4 @@ = hidden_field_tag :state, @pre_auth.state = hidden_field_tag :response_type, @pre_auth.response_type = hidden_field_tag :scope, @pre_auth.scope - = submit_tag "Deny", class: "btn btn-danger prepend-left-10"
\ No newline at end of file + = submit_tag "Deny", class: "btn btn-danger prepend-left-10" |