diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 13:37:47 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 13:37:47 +0000 |
commit | aee0a117a889461ce8ced6fcf73207fe017f1d99 (patch) | |
tree | 891d9ef189227a8445d83f35c1b0fc99573f4380 /app/views/admin/projects | |
parent | 8d46af3258650d305f53b819eabf7ab18d22f59e (diff) | |
download | gitlab-ce-aee0a117a889461ce8ced6fcf73207fe017f1d99.tar.gz |
Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42
Diffstat (limited to 'app/views/admin/projects')
-rw-r--r-- | app/views/admin/projects/_archived.html.haml | 3 | ||||
-rw-r--r-- | app/views/admin/projects/_projects.html.haml | 3 | ||||
-rw-r--r-- | app/views/admin/projects/show.html.haml | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/app/views/admin/projects/_archived.html.haml b/app/views/admin/projects/_archived.html.haml index 8b4d5806c47..3d79cc7ca71 100644 --- a/app/views/admin/projects/_archived.html.haml +++ b/app/views/admin/projects/_archived.html.haml @@ -1,3 +1,2 @@ - if project.archived - %span.badge.badge-warning - = _('archived') + = gl_badge_tag _('archived'), variant: :warning diff --git a/app/views/admin/projects/_projects.html.haml b/app/views/admin/projects/_projects.html.haml index 6f7cea85ed1..f56b77813b5 100644 --- a/app/views/admin/projects/_projects.html.haml +++ b/app/views/admin/projects/_projects.html.haml @@ -9,8 +9,7 @@ = s_('AdminProjects|Delete') .stats - %span.badge.badge-pill - = storage_counter(project.statistics&.storage_size) + = gl_badge_tag storage_counter(project.statistics&.storage_size) = render_if_exists 'admin/projects/archived', project: project .title = link_to(admin_project_path(project)) do diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index 3069aab2710..ee2e63353f0 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -178,7 +178,7 @@ .card-header %strong= @group.name = _('group members') - %span.badge.badge-pill= @group_members.size + = gl_badge_tag @group_members.size = render 'shared/members/manage_access_button', path: group_group_members_path(@group) %ul.content-list.members-list = render partial: 'shared/members/member', @@ -195,7 +195,7 @@ .card-header %strong= @project.name = _('project members') - %span.badge.badge-pill= @project.users.size + = gl_badge_tag @project.users.size = render 'shared/members/manage_access_button', path: project_project_members_path(@project) %ul.content-list.project_members.members-list = render partial: 'shared/members/member', |