Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/projects/merge_requests/show/_how_to_merge.html.haml')
-rw-r--r--app/views/projects/merge_requests/show/_how_to_merge.html.haml19
1 files changed, 19 insertions, 0 deletions
diff --git a/app/views/projects/merge_requests/show/_how_to_merge.html.haml b/app/views/projects/merge_requests/show/_how_to_merge.html.haml
new file mode 100644
index 00000000000..7f1e33418de
--- /dev/null
+++ b/app/views/projects/merge_requests/show/_how_to_merge.html.haml
@@ -0,0 +1,19 @@
+%div#modal_merge_info.modal.hide
+ .modal-header
+ %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
+ 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}