Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
a81081aa
Commit
a81081aa
authored
Jan 17, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small improvements to CI
parent
20028523
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
6 deletions
+12
-6
app/controllers/admin/applications_controller.rb
app/controllers/admin/applications_controller.rb
+1
-1
app/views/admin/applications/index.html.haml
app/views/admin/applications/index.html.haml
+8
-2
app/views/layouts/nav/_admin.html.haml
app/views/layouts/nav/_admin.html.haml
+3
-3
No files found.
app/controllers/admin/applications_controller.rb
View file @
a81081aa
...
@@ -17,7 +17,7 @@ class Admin::ApplicationsController < Admin::ApplicationController
...
@@ -17,7 +17,7 @@ class Admin::ApplicationsController < Admin::ApplicationController
def
create
def
create
@application
=
Doorkeeper
::
Application
.
new
(
application_params
)
@application
=
Doorkeeper
::
Application
.
new
(
application_params
)
if
@application
.
save
if
@application
.
save
flash
[
:notice
]
=
I18n
.
t
(
:notice
,
scope:
[
:doorkeeper
,
:flash
,
:applications
,
:create
])
flash
[
:notice
]
=
I18n
.
t
(
:notice
,
scope:
[
:doorkeeper
,
:flash
,
:applications
,
:create
])
redirect_to
admin_application_url
(
@application
)
redirect_to
admin_application_url
(
@application
)
...
...
app/views/admin/applications/index.html.haml
View file @
a81081aa
%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'
%p
=
link_to
'New Application'
,
new_admin_application_path
,
class:
'btn btn-success'
%table
.table.table-striped
%table
.table.table-striped
%thead
%thead
%tr
%tr
%th
Name
%th
Name
%th
Callback URL
%th
Callback URL
%th
Clients
%th
%th
%th
%th
%tbody
%tbody
...
@@ -12,5 +17,6 @@
...
@@ -12,5 +17,6 @@
%tr
{
:id
=>
"application_#{application.id}"
}
%tr
{
:id
=>
"application_#{application.id}"
}
%td
=
link_to
application
.
name
,
admin_application_path
(
application
)
%td
=
link_to
application
.
name
,
admin_application_path
(
application
)
%td
=
application
.
redirect_uri
%td
=
application
.
redirect_uri
%td
=
application
.
access_tokens
.
count
%td
=
link_to
'Edit'
,
edit_admin_application_path
(
application
),
class:
'btn btn-link'
%td
=
link_to
'Edit'
,
edit_admin_application_path
(
application
),
class:
'btn btn-link'
%td
=
render
'delete_form'
,
application:
application
%td
=
render
'delete_form'
,
application:
application
\ No newline at end of file
app/views/layouts/nav/_admin.html.haml
View file @
a81081aa
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
Projects
Projects
=
nav_link
(
controller: :users
)
do
=
nav_link
(
controller: :users
)
do
=
link_to
admin_users_path
do
=
link_to
admin_users_path
do
%i
.fa.fa-user
s
%i
.fa.fa-user
%span
%span
Users
Users
=
nav_link
(
controller: :groups
)
do
=
nav_link
(
controller: :groups
)
do
...
@@ -48,6 +48,6 @@
...
@@ -48,6 +48,6 @@
=
nav_link
(
controller: :applications
)
do
=
nav_link
(
controller: :applications
)
do
=
link_to
admin_applications_path
do
=
link_to
admin_applications_path
do
%i
.fa.fa-
unlock-alt
%i
.fa.fa-
cloud
%span
%span
Application
Application
s
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment