Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-18 03:17:34 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-18 09:23:26 +0300
commite4a4358254bbcb2028f2a4d01b9e5a9ac9e64113 (patch)
tree22b16ae9a80224a566f8a093e556b302dd8aed1e /app
parent20d10b63919e876aea3288e374366994a73f17b6 (diff)
Small improvements to CI
Diffstat (limited to 'app')
-rw-r--r--app/controllers/admin/applications_controller.rb2
-rw-r--r--app/views/admin/applications/index.html.haml10
-rw-r--r--app/views/layouts/nav/_admin.html.haml6
3 files changed, 12 insertions, 6 deletions
diff --git a/app/controllers/admin/applications_controller.rb b/app/controllers/admin/applications_controller.rb
index cba19184dba..471d24934a0 100644
--- a/app/controllers/admin/applications_controller.rb
+++ b/app/controllers/admin/applications_controller.rb
@@ -17,7 +17,7 @@ class Admin::ApplicationsController < Admin::ApplicationController
def create
@application = Doorkeeper::Application.new(application_params)
-
+
if @application.save
flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :create])
redirect_to admin_application_url(@application)
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