diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 11:28:42 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 11:28:42 +0300 |
| commit | 9f10943c1a76576ac40d96189a28a4d6123a75d8 (patch) | |
| tree | 88955d92ebc98a4165d66a36cb8a2cf92709981a /app/views/projects/merge_requests/automerge.js.haml | |
| parent | 84727fba96c6794874e1f94d581408b70e1842a7 (diff) | |
Revert "Merge branch 'drop-satellites'"
This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing
changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/projects/merge_requests/automerge.js.haml')
| -rw-r--r-- | app/views/projects/merge_requests/automerge.js.haml | 6 |
1 files changed, 6 insertions, 0 deletions
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'))}"); |