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
e304a76e
Commit
e304a76e
authored
Jan 11, 2016
by
iqualisoni
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #5817 wording of the web hooks updated on issue and merge events
parent
be76e402
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/views/projects/hooks/index.html.haml
app/views/projects/hooks/index.html.haml
+2
-2
app/views/shared/_service_settings.html.haml
app/views/shared/_service_settings.html.haml
+2
-2
No files found.
app/views/projects/hooks/index.html.haml
View file @
e304a76e
...
...
@@ -47,14 +47,14 @@
=
f
.
label
:issues_events
,
class:
'list-label'
do
%strong
Issues events
%p
.light
This url will be triggered when an issue is created
This url will be triggered when an issue is created
/updated/merged
%div
=
f
.
check_box
:merge_requests_events
,
class:
'pull-left'
.prepend-left-20
=
f
.
label
:merge_requests_events
,
class:
'list-label'
do
%strong
Merge Request events
%p
.light
This url will be triggered when a merge request is created
This url will be triggered when a merge request is created
/updated/merged
%div
=
f
.
check_box
:build_events
,
class:
'pull-left'
.prepend-left-20
...
...
app/views/shared/_service_settings.html.haml
View file @
e304a76e
...
...
@@ -50,7 +50,7 @@
=
form
.
label
:issues_events
,
class:
'list-label'
do
%strong
Issues events
%p
.light
This url will be triggered when an issue is created
This url will be triggered when an issue is created
/updated/merged
-
if
@service
.
supported_events
.
include?
(
"merge_request"
)
%div
=
form
.
check_box
:merge_requests_events
,
class:
'pull-left'
...
...
@@ -58,7 +58,7 @@
=
form
.
label
:merge_requests_events
,
class:
'list-label'
do
%strong
Merge Request events
%p
.light
This url will be triggered when a merge request is created
This url will be triggered when a merge request is created
/updated/merged
-
if
@service
.
supported_events
.
include?
(
"build"
)
%div
=
form
.
check_box
:build_events
,
class:
'pull-left'
...
...
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