Commit ea0f384c authored by Illya Klymov's avatar Illya Klymov

Merge branch...

Merge branch '344382-make-badges-in-ee-app-views-projects-mirrors-_table_pull_row-html-haml-pajamas-compliant' into 'master'

Make badge in mirrors/_table_pull_row partial Pajamas-compliant

See merge request gitlab-org/gitlab!77100
parents 13b0a87a a0cd3d19
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
%td{ data: { qa_selector: 'mirror_last_update_at_cell' } }= import_state.last_successful_update_at.present? ? time_ago_with_tooltip(import_state.last_successful_update_at) : _('Never') %td{ data: { qa_selector: 'mirror_last_update_at_cell' } }= import_state.last_successful_update_at.present? ? time_ago_with_tooltip(import_state.last_successful_update_at) : _('Never')
%td %td
- if import_state&.last_error.present? - if import_state&.last_error.present?
.badge.badge-danger{ data: { toggle: 'tooltip', html: 'true' }, title: html_escape(import_state.last_error.try(:strip)) }= _('Error') = gl_badge_tag _('Error'), { variant: :danger }, { data: { toggle: 'tooltip', html: 'true' }, title: html_escape(import_state.last_error.try(:strip)) }
%td.mirror-action-buttons %td.mirror-action-buttons
.btn-group.mirror-actions-group.float-right{ role: 'group' } .btn-group.mirror-actions-group.float-right{ role: 'group' }
- ssh_public_key = @project.import_data.ssh_public_key - ssh_public_key = @project.import_data.ssh_public_key
......
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