From 9f10943c1a76576ac40d96189a28a4d6123a75d8 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 11 Aug 2015 10:28:42 +0200 Subject: Revert "Merge branch 'drop-satellites'" This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets --- app/views/projects/merge_requests/automerge.js.haml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 app/views/projects/merge_requests/automerge.js.haml (limited to 'app/views/projects/merge_requests/automerge.js.haml') diff --git a/app/views/projects/merge_requests/automerge.js.haml b/app/views/projects/merge_requests/automerge.js.haml new file mode 100644 index 00000000000..33321651e32 --- /dev/null +++ b/app/views/projects/merge_requests/automerge.js.haml @@ -0,0 +1,6 @@ +- if @status + :plain + merge_request_widget.mergeInProgress(); +- else + :plain + $('.mr-widget-body').html("#{escape_javascript(render('projects/merge_requests/widget/open/reload'))}"); -- cgit v1.2.3