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	21	this.initMergeWidget()
22	22	this.$('.show-all-commits').on 'click', =>
23	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	32	# Local jQuery finder
26	33	$: (selector) ->
...	...
...	...	@@ -3,22 +3,17 @@
3	3	%a.close{href: "#"} ×
4	4	%h3 How To Merge
5	5	.modal-body
	6	+ %p
	7	+ %strong Step 1.
	8	+ Checkout target branch and get recent objects from GitLab
6	9	%pre.dark
7		- = preserve do
	10	+ :preserve
8	11	git checkout #{@merge_request.target_branch}
9	12	git fetch origin
	13	+ %p
	14	+ %strong Step 2.
	15	+ Merge source branch into target branch and push changes to GitLab
	16	+ %pre.dark
	17	+ :preserve
10	18	git merge origin/#{@merge_request.source_branch}
11	19	git push origin #{@merge_request.target_branch}
12		-
13		-
14		-:javascript
15		- $(function(){
16		- var modal = $('#modal_merge_info').modal({modal: true, show:false});
17		- $('.how_to_merge_link').bind("click", function(){
18		- modal.show();
19		- });
20		- $('.modal-header .close').bind("click", function(){
21		- modal.hide();
22		- })
23		- })
24		-
...	...