Commit c31c2401 authored by Olena Horal-Koretska's avatar Olena Horal-Koretska

Merge branch...

Merge branch '344404-make-badges-in-ee-app-views-admin-projects-_archived-html-haml-pajamas-compliant' into 'master'

Use Rails helper for archived badges in admin settings

See merge request gitlab-org/gitlab!76451
parents 01ce68ce ec6908f1
- if project.archived - if project.archived
%span.badge.badge-warning = gl_badge_tag _('archived'), variant: :warning
= _('archived')
- if project.marked_for_deletion? - if project.marked_for_deletion?
%span.badge.badge-warning = gl_badge_tag _('pending deletion'), variant: :warning
= _('pending deletion')
- elsif project.archived - elsif project.archived
%span.badge.badge-warning = gl_badge_tag _('archived'), variant: :warning
= _('archived')
...@@ -40,7 +40,7 @@ RSpec.describe "Admin::Projects" do ...@@ -40,7 +40,7 @@ RSpec.describe "Admin::Projects" do
expect(page).to have_content(project.name) expect(page).to have_content(project.name)
expect(page).to have_content(archived_project.name) expect(page).to have_content(archived_project.name)
expect(page).to have_xpath("//span[@class='badge badge-warning']", text: 'archived') expect(page).to have_xpath("//span[@class='gl-badge badge badge-pill badge-warning md']", text: 'archived')
end end
it 'renders only archived projects', :js do it 'renders only archived projects', :js do
......
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