diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-09 15:11:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-09 15:11:14 +0300 |
| commit | 3fd585614449ccab7fdab083f210c09eb16a6ed2 (patch) | |
| tree | 225d8bdfcd0bfd5efe0da44348dd97be558be288 /app/views/notify | |
| parent | 8b50d36626f3a71a2d8552a316d700510559b0de (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/merge_when_pipeline_succeeds_email.html.haml | 4 | ||||
| -rw-r--r-- | app/views/notify/merge_when_pipeline_succeeds_email.text.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/notify/merge_when_pipeline_succeeds_email.html.haml b/app/views/notify/merge_when_pipeline_succeeds_email.html.haml index f6b517d6e34..9c25567696f 100644 --- a/app/views/notify/merge_when_pipeline_succeeds_email.html.haml +++ b/app/views/notify/merge_when_pipeline_succeeds_email.html.haml @@ -78,7 +78,7 @@ %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#ffffff;text-align:center;padding-right:5px;" } %img{ alt: "✓", height: "13", src: image_url('mailers/ci_pipeline_notif_v1/icon-check-green-inverted.gif'), style: "display:block;", width: "13" } %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#ffffff;text-align:center;" } - %span= _('Merge request was scheduled to merge after pipeline succeeds') + %span= _('Merge request was set to auto-merge') %tr.spacer %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;height:18px;font-size:18px;line-height:18px;" } @@ -91,7 +91,7 @@ %img{ src: image_url('mailers/approval/icon-merge-request-gray.gif'), style: "height:18px;width:18px;margin-bottom:-4px;", alt: "Merge request icon" } %span{ style: "font-weight: 600;color:#333333;" }= _('Merge request') %a{ href: merge_request_url(@merge_request), style: "font-weight: 600;color:#3777b0;text-decoration:none" }= @merge_request.to_reference - %span= _('was scheduled to merge after pipeline succeeds by') + %span= _('was set to auto-merge by') %img.avatar{ height: "24", src: avatar_icon_for_user(@mwps_set_by, 24, only_path: false), style: "border-radius:12px;margin:-7px 0 -7px 3px;", width: "24", alt: "Avatar" } %a.muted{ href: user_url(@mwps_set_by), style: "color:#333333;text-decoration:none;" } = @mwps_set_by.name diff --git a/app/views/notify/merge_when_pipeline_succeeds_email.text.haml b/app/views/notify/merge_when_pipeline_succeeds_email.text.haml index dbf742a5cbc..cbaa88befd2 100644 --- a/app/views/notify/merge_when_pipeline_succeeds_email.text.haml +++ b/app/views/notify/merge_when_pipeline_succeeds_email.text.haml @@ -1,4 +1,4 @@ -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 set to auto-merge by #{sanitize_name(@mwps_set_by.name)} Merge request url: #{project_merge_request_url(@merge_request.target_project, @merge_request)} |