Download as
Browse Code »

Commit 83d35399d13fa46020b004f966d67fb527b8809c

Authored by Dmitriy Zaporozhets
1 parent 88b8b15d
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Move MR alert info out of issue-box 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 1 changed file with 19 additions and 19 deletions   Show diff stats
app/views/projects/merge_requests/show/_mr_box.html.haml
  Diff comments   View file @83d3539
... ... @@ -25,22 +25,22 @@
25 25 = preserve do
26 26 = markdown @merge_request.description
27 27  
28   - - if @merge_request.closed?
29   - .description
30   - %span
31   - %i.icon-remove
32   - Closed by #{link_to_member(@project, @merge_request.closed_event.author)}
33   - #{time_ago_with_tooltip(@merge_request.closed_event.created_at)}.
34   - - if @merge_request.merged?
35   - .description
36   - %span
37   - %i.icon-ok
38   - Merged by #{link_to_member(@project, @merge_request.merge_event.author)}
39   - #{time_ago_with_tooltip(@merge_request.merge_event.created_at)}.
40   - - if !@closes_issues.empty? && @merge_request.opened?
41   - .description.alert-info
42   - %span
43   - %i.icon-ok
44   - Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'}
45   - = succeed '.' do
46   - != gfm(@closes_issues.map { |i| "##{i.iid}" }.to_sentence)
  28 +- if @merge_request.closed?
  29 + .alert.alert-info
  30 + %span
  31 + %i.icon-remove
  32 + Closed by #{link_to_member(@project, @merge_request.closed_event.author)}
  33 + #{time_ago_with_tooltip(@merge_request.closed_event.created_at)}.
  34 +- if @merge_request.merged?
  35 + .alert.alert-info
  36 + %span
  37 + %i.icon-ok
  38 + Merged by #{link_to_member(@project, @merge_request.merge_event.author)}
  39 + #{time_ago_with_tooltip(@merge_request.merge_event.created_at)}.
  40 +- if !@closes_issues.empty? && @merge_request.opened?
  41 + .alert.alert-info.alert-info
  42 + %span
  43 + %i.icon-ok
  44 + Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'}
  45 + = succeed '.' do
  46 + != gfm(@closes_issues.map { |i| "##{i.iid}" }.to_sentence)
... ...