diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-02 13:23:50 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-02 13:23:50 +0300 |
commit | 37f3d0f25b7188312e5d781514245a2853054e4b (patch) | |
tree | f581bd9f665ba46ac3c1441748541f351dd2b1e5 /app/views/merge_requests | |
parent | 2aa620c25ad2c6386bd454b9678d852ee55e83f8 (diff) | |
download | gitlab-ce-37f3d0f25b7188312e5d781514245a2853054e4b.tar.gz |
Fix newlines in how-to-merge. Added steps description. Fixes #3772
Diffstat (limited to 'app/views/merge_requests')
-rw-r--r-- | app/views/merge_requests/show/_how_to_merge.html.haml | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/app/views/merge_requests/show/_how_to_merge.html.haml b/app/views/merge_requests/show/_how_to_merge.html.haml index 69881d4352f..7f1e33418de 100644 --- a/app/views/merge_requests/show/_how_to_merge.html.haml +++ b/app/views/merge_requests/show/_how_to_merge.html.haml @@ -3,22 +3,17 @@ %a.close{href: "#"} × %h3 How To Merge .modal-body + %p + %strong Step 1. + Checkout target branch and get recent objects from GitLab %pre.dark - = preserve do + :preserve git checkout #{@merge_request.target_branch} git fetch origin + %p + %strong Step 2. + Merge source branch into target branch and push changes to GitLab + %pre.dark + :preserve 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(); - }) - }) - |