Commit 6d78fbf0 authored by Amy Qualls's avatar Amy Qualls Committed by Kerri Miller

Fix capitalization of "merge requests"

We shouldn't be capitalizing the "R" in "merge requests" ever, and
we should only capitalize the "M" when it's the first word in a
sentence or slug.

Any other capitalization looks strange to native English speakers.
parent 193c4447
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
Project: <%= @project.name %> ( <%= project_url(@project) %> ) Project: <%= @project.name %> ( <%= project_url(@project) %> )
Branch: <%= @pipeline.source_ref %> ( <%= commits_url(@pipeline) %> ) Branch: <%= @pipeline.source_ref %> ( <%= commits_url(@pipeline) %> )
<% if @merge_request -%> <% if @merge_request -%>
Merge Request: <%= @merge_request.to_reference %> ( <%= merge_request_url(@merge_request) %> ) Merge request: <%= @merge_request.to_reference %> ( <%= merge_request_url(@merge_request) %> )
<% end -%> <% end -%>
Commit: <%= @pipeline.short_sha %> ( <%= commit_url(@pipeline) %> ) Commit: <%= @pipeline.short_sha %> ( <%= commit_url(@pipeline) %> )
......
%p %p
Merge Request #{merge_request_reference_link(@merge_request)} Merge request #{merge_request_reference_link(@merge_request)}
was closed by #{sanitize_name(@updated_by.name)} was closed by #{sanitize_name(@updated_by.name)}
Merge Request #{@merge_request.to_reference} was closed by #{sanitize_name(@updated_by.name)} Merge request #{@merge_request.to_reference} was closed by #{sanitize_name(@updated_by.name)}
Merge Request URL: #{project_merge_request_url(@merge_request.target_project, @merge_request)} Merge request URL: #{project_merge_request_url(@merge_request.target_project, @merge_request)}
= merge_path_description(@merge_request, 'to') = merge_path_description(@merge_request, 'to')
......
%p %p
Merge Request #{merge_request_reference_link(@merge_request)} Merge request #{merge_request_reference_link(@merge_request)}
was #{@mr_status} by #{sanitize_name(@updated_by.name)} was #{@mr_status} by #{sanitize_name(@updated_by.name)}
Merge Request #{@merge_request.to_reference} was #{@mr_status} by #{sanitize_name(@updated_by.name)} Merge request #{@merge_request.to_reference} was #{@mr_status} by #{sanitize_name(@updated_by.name)}
Merge Request URL: #{project_merge_request_url(@merge_request.target_project, @merge_request)} Merge request URL: #{project_merge_request_url(@merge_request.target_project, @merge_request)}
= merge_path_description(@merge_request, 'to') = merge_path_description(@merge_request, 'to')
......
%p %p
Merge Request #{merge_request_reference_link(@merge_request)} can no longer be merged due to conflict. Merge request #{merge_request_reference_link(@merge_request)} can no longer be merged due to conflict.
Merge Request #{@merge_request.to_reference} can no longer be merged due to conflict. Merge request #{@merge_request.to_reference} can no longer be merged due to conflict.
Merge Request URL: #{project_merge_request_url(@merge_request.target_project, @merge_request)} Merge request URL: #{project_merge_request_url(@merge_request.target_project, @merge_request)}
= merge_path_description(@merge_request, 'to') = merge_path_description(@merge_request, 'to')
......
Merge Request #{@merge_request.to_reference} was scheduled to merge after pipeline succeeds by #{sanitize_name(@mwps_set_by.name)} Merge request #{@merge_request.to_reference} was scheduled to merge after pipeline succeeds by #{sanitize_name(@mwps_set_by.name)}
Merge Request url: #{project_merge_request_url(@merge_request.target_project, @merge_request)} Merge request url: #{project_merge_request_url(@merge_request.target_project, @merge_request)}
= merge_path_description(@merge_request, 'to') = merge_path_description(@merge_request, 'to')
......
%p %p
Merge Request #{merge_request_reference_link(@merge_request)} was merged Merge request #{merge_request_reference_link(@merge_request)} was merged
Merge Request #{@merge_request.to_reference} was merged Merge request #{@merge_request.to_reference} was merged
Merge Request URL: #{project_merge_request_url(@merge_request.target_project, @merge_request)} Merge request URL: #{project_merge_request_url(@merge_request.target_project, @merge_request)}
= merge_path_description(@merge_request, 'to') = merge_path_description(@merge_request, 'to')
......
%p %p
You have been mentioned in Merge Request #{merge_request_reference_link(@merge_request)} You have been mentioned in merge request #{merge_request_reference_link(@merge_request)}
= render template: 'notify/new_merge_request_email' = render template: 'notify/new_merge_request_email'
You have been mentioned in Merge Request <%= @merge_request.to_reference %> You have been mentioned in merge request <%= @merge_request.to_reference %>
<%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %> <%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %>
......
...@@ -3,7 +3,7 @@ Pipeline #<%= @pipeline.id %> has failed! ...@@ -3,7 +3,7 @@ Pipeline #<%= @pipeline.id %> has failed!
Project: <%= @project.name %> ( <%= project_url(@project) %> ) Project: <%= @project.name %> ( <%= project_url(@project) %> )
Branch: <%= @pipeline.source_ref %> ( <%= commits_url(@pipeline) %> ) Branch: <%= @pipeline.source_ref %> ( <%= commits_url(@pipeline) %> )
<% if @merge_request -%> <% if @merge_request -%>
Merge Request: <%= @merge_request.to_reference %> ( <%= merge_request_url(@merge_request) %> ) Merge request: <%= @merge_request.to_reference %> ( <%= merge_request_url(@merge_request) %> )
<% end -%> <% end -%>
Commit: <%= @pipeline.short_sha %> ( <%= commit_url(@pipeline) %> ) Commit: <%= @pipeline.short_sha %> ( <%= commit_url(@pipeline) %> )
......
#{sanitize_name(@updated_by_user.name)} pushed new commits to merge request #{@merge_request.to_reference} #{sanitize_name(@updated_by_user.name)} pushed new commits to merge request #{@merge_request.to_reference}
Merge Request URL: #{project_merge_request_url(@merge_request.target_project, @merge_request)} Merge request URL: #{project_merge_request_url(@merge_request.target_project, @merge_request)}
\ \
- if @existing_commits.any? - if @existing_commits.any?
- count = @existing_commits.size - count = @existing_commits.size
......
Reassigned Merge Request <%= @merge_request.iid %> Reassigned merge request <%= @merge_request.iid %>
<%= url_for([@merge_request.project, @merge_request, { only_path: false }]) %> <%= url_for([@merge_request.project, @merge_request, { only_path: false }]) %>
......
%p %p
All discussions on Merge Request #{merge_request_reference_link(@merge_request)} All discussions on merge request #{merge_request_reference_link(@merge_request)}
were resolved by #{sanitize_name(@resolved_by.name)} were resolved by #{sanitize_name(@resolved_by.name)}
All discussions on Merge Request <%= @merge_request.to_reference %> were resolved by <%= sanitize_name(@resolved_by.name) %> All discussions on merge request <%= @merge_request.to_reference %> were resolved by <%= sanitize_name(@resolved_by.name) %>
<%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %> <%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %>
...@@ -31,7 +31,7 @@ RSpec.describe Emails::MergeRequests do ...@@ -31,7 +31,7 @@ RSpec.describe Emails::MergeRequests do
aggregate_failures do aggregate_failures do
is_expected.to have_referable_subject(merge_request, reply: true) is_expected.to have_referable_subject(merge_request, reply: true)
is_expected.to have_body_text(project_merge_request_path(project, merge_request)) is_expected.to have_body_text(project_merge_request_path(project, merge_request))
is_expected.to have_body_text('You have been mentioned in Merge Request') is_expected.to have_body_text('You have been mentioned in merge request')
is_expected.to have_link(merge_request.to_reference, href: project_merge_request_url(merge_request.target_project, merge_request)) is_expected.to have_link(merge_request.to_reference, href: project_merge_request_url(merge_request.target_project, merge_request))
is_expected.to have_text_part_content(assignee.name) is_expected.to have_text_part_content(assignee.name)
is_expected.to have_text_part_content(reviewer.name) is_expected.to have_text_part_content(reviewer.name)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment