root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

use sentence case for "Merge request events"

This commit is contained in:
Alexis Reigel 2017-11-23 13:49:35 +01:00
parent 630c338051
commit a2655e3fbd
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/hooks/_form.html.haml
View File

@ -42,7 +42,7 @@
= form.check_box :merge_requests_events, class: 'pull-left'
.prepend-left-20
= form.label :merge_requests_events, class: 'list-label' do
%strong Merge Request events
%strong Merge request events
%p.light
This URL will be triggered when a merge request is created/updated/merged
.form-group

2
app/views/shared/web_hooks/_form.html.haml
View File

@ -50,7 +50,7 @@
= form.check_box :merge_requests_events, class: 'pull-left'
.prepend-left-20
= form.label :merge_requests_events, class: 'list-label' do
%strong Merge Request events
%strong Merge request events
%p.light
This URL will be triggered when a merge request is created/updated/merged
%li

2
doc/workflow/notifications.md
View File

@ -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 |
| Project moved | Project members [1] | [1] not disabled |
### Issue / Merge Request events
### Issue / Merge request events
In all of the below cases, the notification will be sent to:
- Participants:

2
spec/features/admin/admin_hooks_spec.rb
View File

@ -105,7 +105,7 @@ describe 'Admin::Hooks' do
fill_in 'hook_url', with: url
uncheck 'Repository update events'
check 'Merge Request events'
check 'Merge request events'
expect { click_button 'Add system hook' }.to change(SystemHook, :count).by(1)
expect(current_path).to eq(admin_hooks_path)