Also show Revert and Cherry-pick when the source branch can't be removed

b016d435 · Douwe Maan · d00e5455 · b016d435
Commit b016d435 authored Apr 20, 2016 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

app/views/projects/merge_requests/widget/_merged.html.haml app/views/projects/merge_requests/widget/_merged.html.haml +5 -0

No files found.
--- 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'