diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 21:08:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 21:08:47 +0300 |
| commit | 3832718d895bf8268f3e3aac85948e2792769345 (patch) | |
| tree | 4a322399af568b6203e732ae2e2f3efc39b23a67 /app/views/doorkeeper | |
| parent | 180cd023a11c0eb413ad0de124d9758ea25672bd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/doorkeeper')
| -rw-r--r-- | app/views/doorkeeper/applications/_form.html.haml | 6 | ||||
| -rw-r--r-- | app/views/doorkeeper/applications/show.html.haml | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/app/views/doorkeeper/applications/_form.html.haml b/app/views/doorkeeper/applications/_form.html.haml index 78904f550c7..79abe31a056 100644 --- a/app/views/doorkeeper/applications/_form.html.haml +++ b/app/views/doorkeeper/applications/_form.html.haml @@ -15,6 +15,12 @@ %span.form-text.text-muted = _('Use <code>%{native_redirect_uri}</code> for local tests').html_safe % { native_redirect_uri: Doorkeeper.configuration.native_redirect_uri } + .form-group.form-check + = f.check_box :confidential, class: 'form-check-input' + = f.label :confidential, class: 'label-bold form-check-label' + %span.form-text.text-muted + = _('The application will be used where the client secret can be kept confidential. Native mobile apps and Single Page Apps are considered non-confidential.') + .form-group = f.label :scopes, class: 'label-bold' = render 'shared/tokens/scopes_form', prefix: 'doorkeeper_application', token: application, scopes: @scopes diff --git a/app/views/doorkeeper/applications/show.html.haml b/app/views/doorkeeper/applications/show.html.haml index 8a1b7500abf..7b29269dbb1 100644 --- a/app/views/doorkeeper/applications/show.html.haml +++ b/app/views/doorkeeper/applications/show.html.haml @@ -34,6 +34,12 @@ %div %span.monospace= uri + %tr + %td + = _('Confidential') + %td + = @application.confidential? ? _('Yes') : _('No') + = render "shared/tokens/scopes_list", token: @application .form-actions |