diff options
author | Robert Speicher <robert@gitlab.com> | 2016-03-15 17:33:14 +0300 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-03-15 17:33:14 +0300 |
commit | 90e91e28e40f2d5d5205e62f6e01e23af4da117f (patch) | |
tree | b745cd4a914d2bef8dd9559f6aa8b2d0b15c7414 /app/views/profiles | |
parent | ea7d062fa60e3e622288237fc66a815348bbcf36 (diff) | |
parent | 8f21e2ae408a4ebd0e115846b9a639e7ce09a126 (diff) |
Merge branch 'application-settings' into 'master'
Applications tab on profile settings
Closes #13855
See merge request !3031
Diffstat (limited to 'app/views/profiles')
-rw-r--r-- | app/views/profiles/applications.html.haml | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/app/views/profiles/applications.html.haml b/app/views/profiles/applications.html.haml deleted file mode 100644 index 86f35823406..00000000000 --- a/app/views/profiles/applications.html.haml +++ /dev/null @@ -1,70 +0,0 @@ -- page_title "Applications" -- header_title page_title, applications_profile_path - -.alert.alert-help.prepend-top-default - - if user_oauth_applications? - Manage applications that can use GitLab as an OAuth provider, - and applications that you've authorized to use your account. - - else - Manage applications that you've authorized to use your account. - -- if user_oauth_applications? - .oauth-applications - %h3 - Your applications - .pull-right - = link_to 'New Application', new_oauth_application_path, class: 'btn btn-success' - - if @applications.any? - .table-holder - %table.table.table-striped - %thead - %tr - %th Name - %th Callback URL - %th Clients - %th - %th - %tbody - - @applications.each do |application| - %tr{:id => "application_#{application.id}"} - %td= link_to application.name, oauth_application_path(application) - %td - - application.redirect_uri.split.each do |uri| - %div= uri - %td= application.access_tokens.count - %td= link_to 'Edit', edit_oauth_application_path(application), class: 'btn btn-link btn-sm' - %td= render 'doorkeeper/applications/delete_form', application: application - -.oauth-authorized-applications.prepend-top-20 - - if user_oauth_applications? - %h3 - Authorized applications - - - if @authorized_tokens.any? - .table-holder - %table.table.table-striped - %thead - %tr - %th Name - %th Authorized At - %th Scope - %th - %tbody - - @authorized_apps.each do |app| - - token = app.authorized_tokens.order('created_at desc').first - %tr{:id => "application_#{app.id}"} - %td= app.name - %td= token.created_at - %td= token.scopes - %td= render 'doorkeeper/authorized_applications/delete_form', application: app - - @authorized_anonymous_tokens.each do |token| - %tr - %td - Anonymous - %div.help-block - %em Authorization was granted by entering your username and password in the application. - %td= token.created_at - %td= token.scopes - %td= render 'doorkeeper/authorized_applications/delete_form', token: token - - else - %p.light You don't have any authorized applications |