diff options
| author | randx <dmitriy.zaporozhets@gmail.com> | 2012-03-30 08:15:04 +0300 |
|---|---|---|
| committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-03-30 08:15:04 +0300 |
| commit | 3824f9b372fe9451d101eec478440d129fb2d0b2 (patch) | |
| tree | b9dbe298daee43dd23009cb93beae196d8a9e156 /app/views | |
| parent | 411d84f385364be987380da5f0216048073609c9 (diff) | |
| download | gitlab-ce-3824f9b372fe9451d101eec478440d129fb2d0b2.tar.gz | |
Unverify MR on every push. Ajax for MR accept. better UI
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/merge_requests/automerge.js.haml | 2 | ||||
| -rw-r--r-- | app/views/merge_requests/show.html.haml | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/app/views/merge_requests/automerge.js.haml b/app/views/merge_requests/automerge.js.haml new file mode 100644 index 00000000000..5827a518b51 --- /dev/null +++ b/app/views/merge_requests/automerge.js.haml @@ -0,0 +1,2 @@ +:plain + location.reload(); diff --git a/app/views/merge_requests/show.html.haml b/app/views/merge_requests/show.html.haml index 1b8a25f2dd4..7e14a61c661 100644 --- a/app/views/merge_requests/show.html.haml +++ b/app/views/merge_requests/show.html.haml @@ -54,12 +54,11 @@ - if @merge_request.open? && @commits.any? - if @merge_request.can_be_merged? - .alert-message.info + .ui-box.padded %p - You can accept this request automatically. If you still want to do it manually - #{link_to "click here", "#", :class => "how_to_merge_link cwhite", :title => "How To Merge"} for instructions - .alert-actions - = link_to "Accept Merge Request", automerge_project_merge_request_path(@project, @merge_request), :class => "btn small info" - + You can accept this request automatically. If you still want to do it manually - #{link_to "click here", "#", :class => "how_to_merge_link vlink", :title => "How To Merge"} for instructions + = link_to "Accept Merge Request", automerge_project_merge_request_path(@project, @merge_request), :class => "btn small info accept_merge_request", :remote => true + - else .alert-message @@ -88,6 +87,10 @@ :javascript $(function(){ MergeRequest.init(); + + $(".accept_merge_request").live("ajax:beforeSend", function() { + $(this).replaceWith('#{image_tag "ajax_loader.gif"}'); + }) }) = render "notes/per_line_form" |