Fix alerts
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
779355ae8e
commit
423ffe29d5
3 changed files with 4 additions and 4 deletions
|
@ -12,7 +12,7 @@
|
|||
= render "projects/merge_requests/show/commits"
|
||||
|
||||
- if @commits.present?
|
||||
%ul.nav.nav-tabs
|
||||
%ul.nav.nav-tabs.append-bottom-10
|
||||
%li.notes-tab{data: {action: 'notes'}}
|
||||
= link_to project_merge_request_path(@project, @merge_request) do
|
||||
%i.icon-comment
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
%strong This request can't be merged with GitLab. You should do it manually
|
||||
|
||||
.automerge_widget.unchecked
|
||||
.alert
|
||||
.alert.alert-warning
|
||||
%strong
|
||||
%i.icon-refresh
|
||||
Checking for ability to automatically merge…
|
||||
|
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
- [:running, :pending].each do |status|
|
||||
.ci_widget{class: "ci-#{status}", style: "display:none"}
|
||||
.alert
|
||||
.alert.alert-warning
|
||||
%i.icon-time
|
||||
%strong CI build #{status}
|
||||
for #{@merge_request.last_commit_short_sha}.
|
||||
= link_to "Build page", ci_build_details_path(@merge_request)
|
||||
|
||||
.ci_widget
|
||||
.alert
|
||||
.alert.alert-warning
|
||||
%strong
|
||||
%i.icon-refresh
|
||||
Checking for CI status for #{@merge_request.last_commit_short_sha}
|
||||
|
|
Loading…
Reference in a new issue