home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'change_target_branch_link_color' into 'master'

Browse Source 
Change the link color of the target branch in a merge rquest

closes #15296

See merge request !3786
This commit is contained in:
Jacob Schatz
2016-04-18 19:02:13 +00:00
parent 007a683f9c 0592112c6e
commit bf41703fd2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/projects/merge_requests/_show.html.haml
+2 -1
View File
@@ -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)