summaryrefslogtreecommitdiff
path: root/app/views/merge_requests/show/_how_to_merge.html.haml
blob: 2512d254fe04d3798a8ccfb96c5ce8957a901201 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
%div#modal_merge_info.modal.hide
  .modal-header
    %a.close{:href => "#"} ×
    %h3 How To Merge
  .modal-body
    %pre
      = preserve do
        :erb
          git checkout <%= @merge_request.target_branch %>
          git fetch origin
          git merge origin/<%= @merge_request.source_branch %>
          git push origin <%= @merge_request.target_branch %>


:javascript
  $(function(){
    var modal = $('#modal_merge_info').modal({modal: true, show:false});
    $('.how_to_merge_link').bind("click", function(){
      modal.show();
    });
    $('.modal-header .close').bind("click", function(){
      modal.hide();
    })
  })