Commit ac068de0 authored by Illya Klymov's avatar Illya Klymov

Merge branch...

Merge branch '233686-replace-bootstrap-alerts-in-app/views/admin/projects/show.html.haml' into 'master'

Replace bootstrap alerts in app/.../show.html.haml

Closes #233686

See merge request gitlab-org/gitlab!41389
parents d2a38b3e de72d137
...@@ -13,8 +13,9 @@ ...@@ -13,8 +13,9 @@
- if @project.last_repository_check_failed? - if @project.last_repository_check_failed?
.row .row
.col-md-12 .col-md-12
.card .gl-alert.gl-alert-danger.gl-mb-5
.card-header.alert.alert-danger = sprite_icon('error', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
.gl-alert-body
- last_check_message = _("Last repository check (%{last_check_timestamp}) failed. See the 'repocheck.log' file for error messages.") - last_check_message = _("Last repository check (%{last_check_timestamp}) failed. See the 'repocheck.log' file for error messages.")
- last_check_message = last_check_message % { last_check_timestamp: time_ago_with_tooltip(@project.last_repository_check_at) } - last_check_message = last_check_message % { last_check_timestamp: time_ago_with_tooltip(@project.last_repository_check_at) }
= last_check_message.html_safe = last_check_message.html_safe
......
---
title: Replace bootstrap alerts in app/views/admin/projects/show.html.haml
merge_request: 41389
author: Gilang Gumilar
type: changed
...@@ -46,7 +46,7 @@ RSpec.describe 'Admin uses repository checks', :request_store, :clean_gitlab_red ...@@ -46,7 +46,7 @@ RSpec.describe 'Admin uses repository checks', :request_store, :clean_gitlab_red
) )
visit_admin_project_page(project) visit_admin_project_page(project)
page.within('.alert') do page.within('.gl-alert') do
expect(page.text).to match(/Last repository check \(just now\) failed/) expect(page.text).to match(/Last repository check \(just now\) failed/)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment