kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source
This commit is contained in:
Regis 2017-03-06 11:25:01 -07:00
parent 812acfc47f
commit 6c9262e266
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/projects/merge_requests/widget/_merged.html.haml
View file

@ -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'

2
app/views/projects/merge_requests/widget/open/_merge_when_pipeline_succeeds.html.haml
View file

@ -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