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
a2655e3f
Commit
a2655e3f
authored
Nov 23, 2017
by
Alexis Reigel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use sentence case for "Merge request events"
parent
630c3380
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
app/views/admin/hooks/_form.html.haml
app/views/admin/hooks/_form.html.haml
+1
-1
app/views/shared/web_hooks/_form.html.haml
app/views/shared/web_hooks/_form.html.haml
+1
-1
doc/workflow/notifications.md
doc/workflow/notifications.md
+1
-1
spec/features/admin/admin_hooks_spec.rb
spec/features/admin/admin_hooks_spec.rb
+1
-1
No files found.
app/views/admin/hooks/_form.html.haml
View file @
a2655e3f
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
=
form
.
check_box
:merge_requests_events
,
class:
'pull-left'
=
form
.
check_box
:merge_requests_events
,
class:
'pull-left'
.prepend-left-20
.prepend-left-20
=
form
.
label
:merge_requests_events
,
class:
'list-label'
do
=
form
.
label
:merge_requests_events
,
class:
'list-label'
do
%strong
Merge
R
equest events
%strong
Merge
r
equest events
%p
.light
%p
.light
This URL will be triggered when a merge request is created/updated/merged
This URL will be triggered when a merge request is created/updated/merged
.form-group
.form-group
...
...
app/views/shared/web_hooks/_form.html.haml
View file @
a2655e3f
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
=
form
.
check_box
:merge_requests_events
,
class:
'pull-left'
=
form
.
check_box
:merge_requests_events
,
class:
'pull-left'
.prepend-left-20
.prepend-left-20
=
form
.
label
:merge_requests_events
,
class:
'list-label'
do
=
form
.
label
:merge_requests_events
,
class:
'list-label'
do
%strong
Merge
R
equest events
%strong
Merge
r
equest events
%p
.light
%p
.light
This URL will be triggered when a merge request is created/updated/merged
This URL will be triggered when a merge request is created/updated/merged
%li
%li
...
...
doc/workflow/notifications.md
View file @
a2655e3f
...
@@ -65,7 +65,7 @@ Below is the table of events users can be notified of:
...
@@ -65,7 +65,7 @@ Below is the table of events users can be notified of:
| Group access level changed | User | Sent when user group access level is changed |
| Group access level changed | User | Sent when user group access level is changed |
| Project moved | Project members [1] | [1] not disabled |
| Project moved | Project members [1] | [1] not disabled |
### Issue / Merge
R
equest events
### Issue / Merge
r
equest events
In all of the below cases, the notification will be sent to:
In all of the below cases, the notification will be sent to:
-
Participants:
-
Participants:
...
...
spec/features/admin/admin_hooks_spec.rb
View file @
a2655e3f
...
@@ -105,7 +105,7 @@ describe 'Admin::Hooks' do
...
@@ -105,7 +105,7 @@ describe 'Admin::Hooks' do
fill_in
'hook_url'
,
with:
url
fill_in
'hook_url'
,
with:
url
uncheck
'Repository update events'
uncheck
'Repository update events'
check
'Merge
R
equest events'
check
'Merge
r
equest events'
expect
{
click_button
'Add system hook'
}.
to
change
(
SystemHook
,
:count
).
by
(
1
)
expect
{
click_button
'Add system hook'
}.
to
change
(
SystemHook
,
:count
).
by
(
1
)
expect
(
current_path
).
to
eq
(
admin_hooks_path
)
expect
(
current_path
).
to
eq
(
admin_hooks_path
)
...
...
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