summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/widget
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-07 14:48:53 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-07 14:48:53 +0100
commitd611a3879816d07f5842e2bdcea69b0813777107 (patch)
tree5f0df5c5d68731198b74b2df3d27070ef632d79c /app/views/projects/merge_requests/widget
parent0dcff1342b38c093a05c9edd13d422ee0b37b7bd (diff)
parente88fd58671f5407d80fafe1070d48b750b9f2e50 (diff)
downloadgitlab-ce-d611a3879816d07f5842e2bdcea69b0813777107.tar.gz
Merge branch 'master' into reference-pipeline-and-caching
Diffstat (limited to 'app/views/projects/merge_requests/widget')
-rw-r--r--app/views/projects/merge_requests/widget/_merged.html.haml8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/views/projects/merge_requests/widget/_merged.html.haml b/app/views/projects/merge_requests/widget/_merged.html.haml
index a788fcea23f..5c6fece8c5c 100644
--- a/app/views/projects/merge_requests/widget/_merged.html.haml
+++ b/app/views/projects/merge_requests/widget/_merged.html.haml
@@ -7,10 +7,11 @@
by #{link_to_member(@project, @merge_request.merge_event.author, avatar: true)}
#{time_ago_with_tooltip(@merge_request.merge_event.created_at)}
%div
- - if !@merge_request.source_branch_exists?
+ - if !@merge_request.source_branch_exists? || (params[:delete_source] == 'true')
= succeed '.' do
The changes were merged into
- %span.label-branch= @merge_request.target_branch
+ = link_to namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch" do
+ = @merge_request.target_branch
The source branch has been removed.
- elsif can_remove_branch?(@merge_request.source_project, @merge_request.source_branch)
@@ -18,7 +19,8 @@
%p
= succeed '.' do
The changes were merged into
- %span.label-branch= @merge_request.target_branch
+ = link_to namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch" do
+ = @merge_request.target_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