summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-12-18 18:00:25 +0000
committerRobert Speicher <robert@gitlab.com>2015-12-18 18:00:25 +0000
commit3f26d24f52cf6c3ccd6b929d21c6a8356f163579 (patch)
tree3f106f844ae5b29429521695bdf77488aa179c2b
parenta54bd0ff77fd31791208d1fd23e6169e0e72b331 (diff)
parentffa12a7f821ee8a6b57e7d0b2882311e6b84ca52 (diff)
downloadgitlab-ce-3f26d24f52cf6c3ccd6b929d21c6a8356f163579.tar.gz
Merge branch 'remove-extra-spaces' into 'master'
Remove extra spaces after branchname See merge request !2152
-rw-r--r--app/views/projects/merge_requests/widget/_merged.html.haml12
1 files changed, 4 insertions, 8 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..d1d602eecdc 100644
--- a/app/views/projects/merge_requests/widget/_merged.html.haml
+++ b/app/views/projects/merge_requests/widget/_merged.html.haml
@@ -8,19 +8,15 @@
#{time_ago_with_tooltip(@merge_request.merge_event.created_at)}
%div
- 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
+ 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"}.
The source branch has been removed.
- elsif @merge_request.can_remove_source_branch?(current_user)
.remove_source_branch_widget
%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
+ 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"}.
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