summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-17 16:17:34 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-17 16:17:34 -0800
commita81081aa72ad516d685152ea4790f9156262ab92 (patch)
tree1e1936627050cab2d7ddcf17b43f291688fd9d70 /app/views
parent20028523b5a2969b70a1fde9468c434b78f916ea (diff)
downloadgitlab-ce-a81081aa72ad516d685152ea4790f9156262ab92.tar.gz
Small improvements to CI
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/applications/index.html.haml10
-rw-r--r--app/views/layouts/nav/_admin.html.haml6
2 files changed, 11 insertions, 5 deletions
diff --git a/app/views/admin/applications/index.html.haml b/app/views/admin/applications/index.html.haml
index b0af75573b0..97991ca13e6 100644
--- a/app/views/admin/applications/index.html.haml
+++ b/app/views/admin/applications/index.html.haml
@@ -1,10 +1,15 @@
-%h3.page-title Your applications
+%h3.page-title
+ System OAuth applications
+%p.light
+ System OAuth application does not belong to certain user and can be managed only by admins
+%hr
%p= link_to 'New Application', new_admin_application_path, class: 'btn btn-success'
%table.table.table-striped
%thead
%tr
%th Name
%th Callback URL
+ %th Clients
%th
%th
%tbody
@@ -12,5 +17,6 @@
%tr{:id => "application_#{application.id}"}
%td= link_to application.name, admin_application_path(application)
%td= application.redirect_uri
+ %td= application.access_tokens.count
%td= link_to 'Edit', edit_admin_application_path(application), class: 'btn btn-link'
- %td= render 'delete_form', application: application \ No newline at end of file
+ %td= render 'delete_form', application: application
diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml
index d48dfcd4e94..d9c6670d1bc 100644
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
@@ -11,7 +11,7 @@
Projects
= nav_link(controller: :users) do
= link_to admin_users_path do
- %i.fa.fa-users
+ %i.fa.fa-user
%span
Users
= nav_link(controller: :groups) do
@@ -48,6 +48,6 @@
= nav_link(controller: :applications) do
= link_to admin_applications_path do
- %i.fa.fa-unlock-alt
+ %i.fa.fa-cloud
%span
- Application
+ Applications