diff options
| author | Alexis Reigel <alexis.reigel.ext@siemens.com> | 2017-11-23 13:49:35 +0100 |
|---|---|---|
| committer | Alexis Reigel <alexis.reigel.ext@siemens.com> | 2018-01-04 09:33:41 +0100 |
| commit | a2655e3fbda186ea598f6649dee8bb5565d6b980 (patch) | |
| tree | 798500067d23df9c19c82321e0d1ab9d470c9d8b | |
| parent | 630c3380510d4ada5d33b3dee0966e6dfb163dcf (diff) | |
| download | gitlab-ce-a2655e3fbda186ea598f6649dee8bb5565d6b980.tar.gz | |
use sentence case for "Merge request events"
| -rw-r--r-- | app/views/admin/hooks/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/web_hooks/_form.html.haml | 2 | ||||
| -rw-r--r-- | doc/workflow/notifications.md | 2 | ||||
| -rw-r--r-- | spec/features/admin/admin_hooks_spec.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/views/admin/hooks/_form.html.haml b/app/views/admin/hooks/_form.html.haml index 1b6de917f5a..d8f96ed5b0d 100644 --- a/app/views/admin/hooks/_form.html.haml +++ b/app/views/admin/hooks/_form.html.haml @@ -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 diff --git a/app/views/shared/web_hooks/_form.html.haml b/app/views/shared/web_hooks/_form.html.haml index 1f0e7629fb4..ad4d39b4aa1 100644 --- a/app/views/shared/web_hooks/_form.html.haml +++ b/app/views/shared/web_hooks/_form.html.haml @@ -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 diff --git a/doc/workflow/notifications.md b/doc/workflow/notifications.md index 3e2e7d0f7b6..0203757e0e1 100644 --- a/doc/workflow/notifications.md +++ b/doc/workflow/notifications.md @@ -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: diff --git a/spec/features/admin/admin_hooks_spec.rb b/spec/features/admin/admin_hooks_spec.rb index d7f254ec89b..197e6cd07c4 100644 --- a/spec/features/admin/admin_hooks_spec.rb +++ b/spec/features/admin/admin_hooks_spec.rb @@ -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) |