diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-04-20 14:28:34 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-04-20 14:28:34 +0200 |
| commit | b016d4356d38996b81a813f13e259f218131539b (patch) | |
| tree | 9e98cef394c8e0aab1f9bda87d5380eced47661a | |
| parent | d00e5455ee253921ddd01821372bb10d58294c66 (diff) | |
| download | gitlab-ce-b016d4356d38996b81a813f13e259f218131539b.tar.gz | |
Also show Revert and Cherry-pick when the source branch can't be removed
| -rw-r--r-- | app/views/projects/merge_requests/widget/_merged.html.haml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/views/projects/merge_requests/widget/_merged.html.haml b/app/views/projects/merge_requests/widget/_merged.html.haml index 3abae9f0bf6..ec4beae9727 100644 --- a/app/views/projects/merge_requests/widget/_merged.html.haml +++ b/app/views/projects/merge_requests/widget/_merged.html.haml @@ -44,3 +44,8 @@ $('.remove_source_branch_in_progress').hide(); $('.remove_source_branch_widget.failed').show(); }); + - else + %p + 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"}. + = render 'projects/merge_requests/widget/merged_buttons' |