diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-07-27 17:41:40 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-07-27 17:41:40 +0000 |
| commit | 86ae883b638d29953f26a87efc16ae613ff865e4 (patch) | |
| tree | 6d216f1ec842e8cb72a9efac4ba576146aa176a5 /app/views | |
| parent | 066f4d8b715aa6c58bffe39b7f9fb35e6e6ff8a9 (diff) | |
| parent | f837cd6611a39d3dd38655821f32feb2c2abba8d (diff) | |
| download | gitlab-ce-86ae883b638d29953f26a87efc16ae613ff865e4.tar.gz | |
Merge branch 'backport-ee-2456' into 'master'
Skip OAuth authorization for trusted applications
See merge request !13061
Diffstat (limited to 'app/views')
| -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 061f8991b11..93827d6a1ab 100644 --- a/app/views/admin/applications/_form.html.haml +++ b/app/views/admin/applications/_form.html.haml @@ -6,6 +6,7 @@ .col-sm-10 = f.text_field :name, class: 'form-control' = doorkeeper_errors_for application, :name + = content_tag :div, class: 'form-group' do = f.label :redirect_uri, class: 'col-sm-2 control-label' .col-sm-10 @@ -19,6 +20,13 @@ %code= Doorkeeper.configuration.native_redirect_uri for local tests + = content_tag :div, class: 'form-group' do + = f.label :trusted, class: 'col-sm-2 control-label' + .col-sm-10 + = f.check_box :trusted + %span.help-block + Trusted applications are automatically authorized on GitLab OAuth flow. + .form-group = f.label :scopes, class: 'col-sm-2 control-label' .col-sm-10 diff --git a/app/views/admin/applications/index.html.haml b/app/views/admin/applications/index.html.haml index eb4293c7e37..94d33fa6489 100644 --- a/app/views/admin/applications/index.html.haml +++ b/app/views/admin/applications/index.html.haml @@ -11,6 +11,7 @@ %th Name %th Callback URL %th Clients + %th Trusted %th %th %tbody.oauth-applications @@ -19,5 +20,6 @@ %td= link_to application.name, admin_application_path(application) %td= application.redirect_uri %td= application.access_tokens.map(&:resource_owner_id).uniq.count + %td= application.trusted? ? 'Y': 'N' %td= link_to 'Edit', edit_admin_application_path(application), class: 'btn btn-link' %td= render 'delete_form', application: application diff --git a/app/views/admin/applications/show.html.haml b/app/views/admin/applications/show.html.haml index 14683cc66e9..5125aa21b06 100644 --- a/app/views/admin/applications/show.html.haml +++ b/app/views/admin/applications/show.html.haml @@ -23,6 +23,12 @@ %div %span.monospace= uri + %tr + %td + Trusted + %td + = @application.trusted? ? 'Y' : 'N' + = render "shared/tokens/scopes_list", token: @application .form-actions |