Commit 6f91ceec authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Make source branch a link

parent 9c302285
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
or or
%code Use theirs %code Use theirs
in all the conflicted files above. Commit these changes into in all the conflicted files above. Commit these changes into
%strong {{conflictsData.sourceBranch}}. #{link_to @merge_request.source_branch, project_tree_path(@merge_request.project, @merge_request.source_branch)}.
.col-md-8 .col-md-8
%label.label-light{ "for" => "commit-message" } %label.label-light{ "for" => "commit-message" }
#{ _('Commit message') } #{ _('Commit message') }
......
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