Download as
Browse Code »

Commit 423ffe29d549d72a603e0d3a529ec59c035a0934

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

Fix alerts 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 3 changed files with 4 additions and 4 deletions   Show diff stats
app/views/projects/merge_requests/_show.html.haml
  Diff comments   View file @423ffe2
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 = render "projects/merge_requests/show/commits" 12 = render "projects/merge_requests/show/commits"
13 13
14 - if @commits.present? 14 - if @commits.present?
15 - %ul.nav.nav-tabs 15 + %ul.nav.nav-tabs.append-bottom-10
16 %li.notes-tab{data: {action: 'notes'}} 16 %li.notes-tab{data: {action: 'notes'}}
17 = link_to project_merge_request_path(@project, @merge_request) do 17 = link_to project_merge_request_path(@project, @merge_request) do
18 %i.icon-comment 18 %i.icon-comment
app/views/projects/merge_requests/show/_mr_accept.html.haml
  Diff comments   View file @423ffe2
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 %strong This request can't be merged with GitLab. You should do it manually 37 %strong This request can't be merged with GitLab. You should do it manually
38 38
39 .automerge_widget.unchecked 39 .automerge_widget.unchecked
40 - .alert 40 + .alert.alert-warning
41 %strong 41 %strong
42 %i.icon-refresh 42 %i.icon-refresh
43 Checking for ability to automatically merge… 43 Checking for ability to automatically merge…
app/views/projects/merge_requests/show/_mr_ci.html.haml
  Diff comments   View file @423ffe2
@@ -16,14 +16,14 @@ @@ -16,14 +16,14 @@
16 16
17 - [:running, :pending].each do |status| 17 - [:running, :pending].each do |status|
18 .ci_widget{class: "ci-#{status}", style: "display:none"} 18 .ci_widget{class: "ci-#{status}", style: "display:none"}
19 - .alert 19 + .alert.alert-warning
20 %i.icon-time 20 %i.icon-time
21 %strong CI build #{status} 21 %strong CI build #{status}
22 for #{@merge_request.last_commit_short_sha}. 22 for #{@merge_request.last_commit_short_sha}.
23 = link_to "Build page", ci_build_details_path(@merge_request) 23 = link_to "Build page", ci_build_details_path(@merge_request)
24 24
25 .ci_widget 25 .ci_widget
26 - .alert 26 + .alert.alert-warning
27 %strong 27 %strong
28 %i.icon-refresh 28 %i.icon-refresh
29 Checking for CI status for #{@merge_request.last_commit_short_sha} 29 Checking for CI status for #{@merge_request.last_commit_short_sha}