Download as
Browse Code »

Commit fa7d0e3ae0bcc1f2aa4a46b0ca3b80e78d3c3c46

Authored by Dmitriy Zaporozhets
1 parent e026491d
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Fix MR widget UI 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 1 changed file with 9 additions and 8 deletions   Show diff stats
app/views/projects/merge_requests/show/_state_widget.html.haml
  Diff comments   View file @fa7d0e3
@@ -21,14 +21,6 @@ @@ -21,14 +21,6 @@
21 #{time_ago_with_tooltip(@merge_request.merge_event.created_at)} 21 #{time_ago_with_tooltip(@merge_request.merge_event.created_at)}
22 = render "projects/merge_requests/show/remove_source_branch" 22 = render "projects/merge_requests/show/remove_source_branch"
23 23
24 - - if !@closes_issues.empty? && @merge_request.open?  
25 - .alert.alert-info.alert-info  
26 - %span  
27 - %i.icon-ok  
28 - Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'}  
29 - = succeed '.' do  
30 - != gfm(@closes_issues.map { |i| "##{i.iid}" }.to_sentence)  
31 -  
32 - unless @commits.any? 24 - unless @commits.any?
33 %h4 Nothing to merge 25 %h4 Nothing to merge
34 %p 26 %p
@@ -38,3 +30,12 @@ @@ -38,3 +30,12 @@
38 %span.label-branch #{@merge_request.target_branch} 30 %span.label-branch #{@merge_request.target_branch}
39 %br 31 %br
40 Try to use different branches or push new code. 32 Try to use different branches or push new code.
  33 +
  34 + - if !@closes_issues.empty? && @merge_request.open?
  35 + .panel-footer
  36 + %span
  37 + %i.icon-ok
  38 + Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'}
  39 + = succeed '.' do
  40 + != gfm(@closes_issues.map { |i| "##{i.iid}" }.to_sentence)
  41 +