diff options
author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-11-02 17:27:38 +0100 |
---|---|---|
committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-11-02 17:27:38 +0100 |
commit | 77f8a1e392b64f51326df8aebdc77e97af07bfed (patch) | |
tree | f1ce42885c2459c9e4737d8a8b5099fbdc2efa7b /app/views/projects/merge_requests/merge.js.haml | |
parent | 8c9e1df98eb45e3305ab5badc6727580e84d36e0 (diff) | |
download | gitlab-ce-77f8a1e392b64f51326df8aebdc77e97af07bfed.tar.gz |
Merge when build succeeds
Diffstat (limited to 'app/views/projects/merge_requests/merge.js.haml')
-rw-r--r-- | app/views/projects/merge_requests/merge.js.haml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/merge.js.haml b/app/views/projects/merge_requests/merge.js.haml index 33321651e32..89aae17a606 100644 --- a/app/views/projects/merge_requests/merge.js.haml +++ b/app/views/projects/merge_requests/merge.js.haml @@ -1,6 +1,10 @@ -- if @status +- case @status +- when :success :plain merge_request_widget.mergeInProgress(); +- when :merge_when_build_succeeds + :plain + $('.mr-widget-body').html("#{escape_javascript(render('projects/merge_requests/widget/open/merge_when_build_succeeds'))}"); - else :plain $('.mr-widget-body').html("#{escape_javascript(render('projects/merge_requests/widget/open/reload'))}"); |