Commit 211fe028 authored by Douwe Maan's avatar Douwe Maan

Tweak MR widget text some more.

parent b2334da4
...@@ -7,4 +7,6 @@ ...@@ -7,4 +7,6 @@
by #{link_to_member(@project, @merge_request.closed_event.author, avatar: true)} by #{link_to_member(@project, @merge_request.closed_event.author, avatar: true)}
#{time_ago_with_tooltip(@merge_request.closed_event.created_at)} #{time_ago_with_tooltip(@merge_request.closed_event.created_at)}
%p %p
The changes were not merged into the target branch. = succeed '.' do
The changes were not merged into
%span.label-branch= @merge_request.target_branch
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
= icon("exclamation-triangle") = icon("exclamation-triangle")
Nothing to merge from Nothing to merge from
%span.label-branch= source_branch_with_namespace(@merge_request) %span.label-branch= source_branch_with_namespace(@merge_request)
to into
%span.label-branch= @merge_request.target_branch %span.label-branch= @merge_request.target_branch
%p %p
Please push new commits to the source branch or use a different target branch. Please push new commits to the source branch or use a different target branch.
%h4 %h4
= icon("exclamation-triangle") = icon("exclamation-triangle")
This merge request could not be merged automatically This merge request failed to be merged automatically
%p %p
Please reload the page to find out the reason. Please reload the page to find out the reason.
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