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/admin | |
| parent | 180cd023a11c0eb413ad0de124d9758ea25672bd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/applications/_form.html.haml | 8 | ||||
| -rw-r--r-- | app/views/admin/applications/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/applications/show.html.haml | 6 |
3 files changed, 16 insertions, 0 deletions
diff --git a/app/views/admin/applications/_form.html.haml b/app/views/admin/applications/_form.html.haml index 21e84016c66..8338401bea5 100644 --- a/app/views/admin/applications/_form.html.haml +++ b/app/views/admin/applications/_form.html.haml @@ -30,6 +30,14 @@ %span.form-text.text-muted Trusted applications are automatically authorized on GitLab OAuth flow. + = content_tag :div, class: 'form-group row' do + .col-sm-2.col-form-label.pt-0 + = f.label :confidential + .col-sm-10 + = f.check_box :confidential + %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.row .col-sm-2.col-form-label.pt-0 = f.label :scopes diff --git a/app/views/admin/applications/index.html.haml b/app/views/admin/applications/index.html.haml index 758d722cc63..c3861f335b8 100644 --- a/app/views/admin/applications/index.html.haml +++ b/app/views/admin/applications/index.html.haml @@ -12,6 +12,7 @@ %th Callback URL %th Clients %th Trusted + %th Confidential %th %th %tbody.oauth-applications @@ -21,6 +22,7 @@ %td= application.redirect_uri %td= @application_counts[application.id].to_i %td= application.trusted? ? 'Y': 'N' + %td= application.confidential? ? 'Y': 'N' %td= link_to 'Edit', edit_admin_application_path(application), class: 'btn btn-link' %td= render 'delete_form', application: application = paginate @applications, theme: 'gitlab' diff --git a/app/views/admin/applications/show.html.haml b/app/views/admin/applications/show.html.haml index aca9302aff7..146674a2fac 100644 --- a/app/views/admin/applications/show.html.haml +++ b/app/views/admin/applications/show.html.haml @@ -36,6 +36,12 @@ %td = @application.trusted? ? 'Y' : 'N' + %tr + %td + Confidential + %td + = @application.confidential? ? 'Y' : 'N' + = render "shared/tokens/scopes_list", token: @application .form-actions |