Commit 37f3d0f2 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix newlines in how-to-merge. Added steps description. Fixes #3772

parent 2aa620c2
...@@ -21,6 +21,13 @@ class MergeRequest ...@@ -21,6 +21,13 @@ class MergeRequest
this.initMergeWidget() this.initMergeWidget()
this.$('.show-all-commits').on 'click', => this.$('.show-all-commits').on 'click', =>
this.showAllCommits() this.showAllCommits()
modal = $('#modal_merge_info').modal modal: true, show:false
$('.how_to_merge_link').bind "click", ->
modal.show()
$('.modal-header .close').bind "click", ->
modal.hide()
# Local jQuery finder # Local jQuery finder
$: (selector) -> $: (selector) ->
......
...@@ -3,22 +3,17 @@ ...@@ -3,22 +3,17 @@
%a.close{href: "#"} × %a.close{href: "#"} ×
%h3 How To Merge %h3 How To Merge
.modal-body .modal-body
%p
%strong Step 1.
Checkout target branch and get recent objects from GitLab
%pre.dark %pre.dark
= preserve do :preserve
git checkout #{@merge_request.target_branch} git checkout #{@merge_request.target_branch}
git fetch origin 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 merge origin/#{@merge_request.source_branch}
git push origin #{@merge_request.target_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();
})
})
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment