diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-04-18 19:02:13 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-04-18 19:02:13 +0000 |
| commit | bf41703fd219d03b231aa87a71799ec6817eb09e (patch) | |
| tree | c940509c78edb053c5732cd8491e757403850ae9 | |
| parent | 007a683f9ccf49ac537761cdd1a83e62220294d8 (diff) | |
| parent | 0592112c6e9cebfcae6869c8fa273d7c13b74c16 (diff) | |
| download | gitlab-ce-bf41703fd219d03b231aa87a71799ec6817eb09e.tar.gz | |
Merge branch 'change_target_branch_link_color' into 'master'
Change the link color of the target branch in a merge rquest
closes #15296
See merge request !3786
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 285ad26316c..7125d7d9d1c 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -31,7 +31,8 @@ %span Request to merge %span.label-branch= source_branch_with_namespace(@merge_request) %span into - = link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch" + %span.label-branch + = link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch) - if @merge_request.open? && @merge_request.diverged_from_target_branch? %span (#{pluralize(@merge_request.diverged_commits_count, 'commit')} behind) |