Commit 6c9262e2 authored by Regis's avatar Regis

structure html to handle single or double merge states with new style changes

parent 812acfc4
......@@ -49,4 +49,4 @@
%span
The changes were merged into
#{link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch"}.
= render 'projects/merge_requests/widget/merged_buttons'
= render 'projects/merge_requests/widget/merged_buttons'
......@@ -9,7 +9,7 @@
%li
%span
= succeed '.' do
The changes will be merged into <b>#{@merge_request.target_branch}</b>
The changes will be merged into #{link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch"}.
- if @merge_request.remove_source_branch?
%li
%span
......
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