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

Dmitriy Zaporozhets
1 parent 2aa620c2
Showing 2 changed files with 16 additions and 14 deletions Show diff stats
app/assets/javascripts/merge_requests.js.coffee
app/views/merge_requests/show/_how_to_merge.html.haml
@@ -21,6 +21,13 @@ class MergeRequest
     this.initMergeWidget()
     this.$('.show-all-commits').on 'click', =>
       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
   $: (selector) ->
@@ -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();
-    })
-  })
-
	@@ -21,6 +21,13 @@ class MergeRequest		@@ -21,6 +21,13 @@ class MergeRequest
21	this.initMergeWidget()	21	this.initMergeWidget()
22	this.$('.show-all-commits').on 'click', =>	22	this.$('.show-all-commits').on 'click', =>
23	this.showAllCommits()	23	this.showAllCommits()
		24	+
		25	+ modal = $('#modal_merge_info').modal modal: true, show:false
		26	+
		27	+ $('.how_to_merge_link').bind "click", ->
		28	+ modal.show()
		29	+ $('.modal-header .close').bind "click", ->
		30	+ modal.hide()
24		31
25	# Local jQuery finder	32	# Local jQuery finder
26	$: (selector) ->	33	$: (selector) ->