diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-12-16 12:56:55 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-12-16 12:56:55 -0500 |
| commit | 49e458317a3ebc8b5fc8689cc33e0d36df74e2bd (patch) | |
| tree | b16ab7b52b1681efba9a2a7062f68d62b17ff7d5 | |
| parent | b5230bbe7c9f80ffaa0549cff7dea0d73f4490f8 (diff) | |
| download | gitlab-ce-rs-branch-spacing.tar.gz | |
Prevent extra spacing between branch name and periodrs-branch-spacing
| -rw-r--r-- | app/views/projects/merge_requests/widget/_merged.html.haml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/views/projects/merge_requests/widget/_merged.html.haml b/app/views/projects/merge_requests/widget/_merged.html.haml index 6f52c963a53..e32df98c133 100644 --- a/app/views/projects/merge_requests/widget/_merged.html.haml +++ b/app/views/projects/merge_requests/widget/_merged.html.haml @@ -10,8 +10,7 @@ - if !@merge_request.source_branch_exists? || (params[:delete_source] == 'true') = succeed '.' do The changes were merged 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" do The source branch has been removed. - elsif @merge_request.can_remove_source_branch?(current_user) @@ -19,8 +18,7 @@ %p = succeed '.' do The changes were merged 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" You can remove the source branch now. = link_to namespace_project_branch_path(@merge_request.source_project.namespace, @merge_request.source_project, @merge_request.source_branch), remote: true, method: :delete, class: "btn btn-primary btn-sm remove_source_branch" do %i.fa.fa-times |