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
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
f51e2183
Commit
f51e2183
authored
Mar 05, 2018
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Render plugins list on system hooks page
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
9c50f96c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
53 additions
and
53 deletions
+53
-53
app/views/admin/hooks/_form.html.haml
app/views/admin/hooks/_form.html.haml
+20
-22
app/views/admin/hooks/index.html.haml
app/views/admin/hooks/index.html.haml
+30
-28
app/views/shared/plugins/_index.html.haml
app/views/shared/plugins/_index.html.haml
+3
-3
No files found.
app/views/admin/hooks/_form.html.haml
View file @
f51e2183
=
form_errors
(
hook
)
.form-group
=
form
.
label
:url
,
'URL'
,
class:
'control-label'
.col-sm-10
=
form
.
text_field
:url
,
class:
'form-control'
=
form
.
label
:url
,
'URL'
,
class:
'label-light'
=
form
.
text_field
:url
,
class:
'form-control'
.form-group
=
form
.
label
:token
,
'Secret Token'
,
class:
'control-label'
.col-sm-10
=
form
.
text_field
:token
,
class:
'form-control'
%p
.help-block
Use this token to validate received payloads
=
form
.
label
:token
,
'Secret Token'
,
class:
'label-light'
=
form
.
text_field
:token
,
class:
'form-control'
%p
.help-block
Use this token to validate received payloads
.form-group
=
form
.
label
:url
,
'Trigger'
,
class:
'control-label'
.col-sm-10.prepend-top-10
%div
System hook will be triggered on set of events like creating project
or adding ssh key. But you can also enable extra triggers like Push events.
=
form
.
label
:url
,
'Trigger'
,
class:
'label-light'
%ul
.list-unstyled
%li
.help-block
System hook will be triggered on set of events like creating project
or adding ssh key. But you can also enable extra triggers like Push events.
.prepend-top-default
=
form
.
check_box
:repository_update_events
,
class:
'pull-left'
...
...
@@ -24,21 +23,21 @@
%strong
Repository update events
%p
.light
This URL will be triggered when repository is updated
%
div
%
li
=
form
.
check_box
:push_events
,
class:
'pull-left'
.prepend-left-20
=
form
.
label
:push_events
,
class:
'list-label'
do
%strong
Push events
%p
.light
This URL will be triggered for each branch updated to the repository
%
div
%
li
=
form
.
check_box
:tag_push_events
,
class:
'pull-left'
.prepend-left-20
=
form
.
label
:tag_push_events
,
class:
'list-label'
do
%strong
Tag push events
%p
.light
This URL will be triggered when a new tag is pushed to the repository
%
div
%
li
=
form
.
check_box
:merge_requests_events
,
class:
'pull-left'
.prepend-left-20
=
form
.
label
:merge_requests_events
,
class:
'list-label'
do
...
...
@@ -46,9 +45,8 @@
%p
.light
This URL will be triggered when a merge request is created/updated/merged
.form-group
=
form
.
label
:enable_ssl_verification
,
'SSL verification'
,
class:
'control-label checkbox'
.col-sm-10
.checkbox
=
form
.
label
:enable_ssl_verification
do
=
form
.
check_box
:enable_ssl_verification
%strong
Enable SSL verification
=
form
.
label
:enable_ssl_verification
,
'SSL verification'
,
class:
'label-light checkbox'
.checkbox
=
form
.
label
:enable_ssl_verification
do
=
form
.
check_box
:enable_ssl_verification
%strong
Enable SSL verification
app/views/admin/hooks/index.html.haml
View file @
f51e2183
-
page_title
'System Hooks'
%h3
.page-title
System hooks
.row.prepend-top-default
.col-lg-4
%h4
.prepend-top-0
=
page_title
%p
#{
link_to
'System hooks '
,
help_page_path
(
'system_hooks/system_hooks'
),
class:
'vlink'
}
can be
used for binding events when GitLab creates a User or Project.
%p
.light
#{
link_to
'System hooks '
,
help_page_path
(
'system_hooks/system_hooks'
),
class:
'vlink'
}
can be
used for binding events when GitLab creates a User or Project.
.col-lg-8.append-bottom-default
=
form_for
@hook
,
as: :hook
,
url:
admin_hooks_path
do
|
f
|
=
render
partial:
'form'
,
locals:
{
form:
f
,
hook:
@hook
}
=
f
.
submit
'Add system hook'
,
class:
'btn btn-create'
%hr
%hr
=
form_for
@hook
,
as: :hook
,
url:
admin_hooks_path
,
html:
{
class:
'form-horizontal'
}
do
|
f
|
=
render
partial:
'form'
,
locals:
{
form:
f
,
hook:
@hook
}
.form-actions
=
f
.
submit
'Add system hook'
,
class:
'btn btn-create'
%hr
-
if
@hooks
.
any?
.panel.panel-default
.panel-heading
System hooks (
#{
@hooks
.
count
}
)
%ul
.content-list
-
@hooks
.
each
do
|
hook
|
%li
.controls
=
render
'shared/web_hooks/test_button'
,
triggers:
SystemHook
.
triggers
,
hook:
hook
,
button_class:
'btn-sm'
=
link_to
'Edit'
,
edit_admin_hook_path
(
hook
),
class:
'btn btn-sm'
=
link_to
'Remove'
,
admin_hook_path
(
hook
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
'btn btn-remove btn-sm'
.monospace
=
hook
.
url
%div
-
SystemHook
.
triggers
.
each_value
do
|
event
|
-
if
hook
.
public_send
(
event
)
%span
.label.label-gray
=
event
.
to_s
.
titleize
%span
.label.label-gray
SSL Verification:
#{
hook
.
enable_ssl_verification
?
'enabled'
:
'disabled'
}
-
if
@hooks
.
any?
.panel.panel-default
.panel-heading
System hooks (
#{
@hooks
.
count
}
)
%ul
.content-list
-
@hooks
.
each
do
|
hook
|
%li
.controls
=
render
'shared/web_hooks/test_button'
,
triggers:
SystemHook
.
triggers
,
hook:
hook
,
button_class:
'btn-sm'
=
link_to
'Edit'
,
edit_admin_hook_path
(
hook
),
class:
'btn btn-sm'
=
link_to
'Remove'
,
admin_hook_path
(
hook
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
'btn btn-remove btn-sm'
.monospace
=
hook
.
url
%div
-
SystemHook
.
triggers
.
each_value
do
|
event
|
-
if
hook
.
public_send
(
event
)
%span
.label.label-gray
=
event
.
to_s
.
titleize
%span
.label.label-gray
SSL Verification:
#{
hook
.
enable_ssl_verification
?
'enabled'
:
'disabled'
}
=
render
'shared/plugins/index'
app/views/shared/plugins/_index.html.haml
View file @
f51e2183
...
...
@@ -13,8 +13,8 @@
%ul
.content-list
-
plugins
.
each
do
|
file
|
%li
%span
.titl
e
=
File
.
basename
(
file
)
=
boolean_to_icon
tru
e
=
File
.
basename
(
file
)
-
else
%p
.
settings-message.text-center.append-bottom-0
%p
.
light-well.text-center
No plugins found.
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