diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-16 16:03:07 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-16 16:03:07 +0200 |
| commit | a7fded9b9529cfc08463afd4f6cf12478262e951 (patch) | |
| tree | 69a0acd9145acc15a5f90a9bac07f041ccf62e72 /app/views/projects/merge_requests/merge.js.haml | |
| parent | 26f5d6047d6e21a5c65a4276266648f1e69aac4a (diff) | |
| download | gitlab-ce-a7fded9b9529cfc08463afd4f6cf12478262e951.tar.gz | |
Huge refactoring for accepting merge requests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
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, 6 insertions, 0 deletions
diff --git a/app/views/projects/merge_requests/merge.js.haml b/app/views/projects/merge_requests/merge.js.haml new file mode 100644 index 00000000000..33321651e32 --- /dev/null +++ b/app/views/projects/merge_requests/merge.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'))}"); |