diff options
author | Jacob Schatz <jschatz1@gmail.com> | 2016-04-15 23:58:18 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2016-04-15 23:58:18 +0000 |
commit | 8c9cc6d26c2936b6f759979fa959fdca88e282a7 (patch) | |
tree | 9b678b786d3fddfaf68909d6f36504c3e7943be9 | |
parent | 2e4d9c1de6d46357702da2a1b9b9819b25e5f4e1 (diff) | |
parent | 47c6111546c32ec0b1ec4f1720e0e29c455cb438 (diff) | |
download | gitlab-ce-8c9cc6d26c2936b6f759979fa959fdca88e282a7.tar.gz |
Merge branch 'rs-branch-name-space' into 'master'
Remove extra spacing from merge request target branch name
See merge request !3758
-rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 07037a14f51..2c34f9c454b 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -32,8 +32,7 @@ %span Request to merge %span.label-branch= source_branch_with_namespace(@merge_request) %span into - = link_to namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch" do - = @merge_request.target_branch + = link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch" - if @merge_request.open? && @merge_request.diverged_from_target_branch? %span (#{pluralize(@merge_request.diverged_commits_count, 'commit')} behind) |