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

Merge branch 'gl-badge-milestone-sidebar' into 'master'

Add gl-badge for badges in milestone drawer

See merge request gitlab-org/gitlab!57964
parents 3d150654 425b97c7
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
%span= milestone.issues_visible_to_user(current_user).count %span= milestone.issues_visible_to_user(current_user).count
.title.hide-collapsed .title.hide-collapsed
= s_('MilestoneSidebar|Issues') = s_('MilestoneSidebar|Issues')
%span.badge.badge-pill= milestone.issues_visible_to_user(current_user).count %span.badge.badge-muted.badge-pill.gl-badge.sm= milestone.issues_visible_to_user(current_user).count
- if show_new_issue_link?(project) - if show_new_issue_link?(project)
= link_to new_project_issue_path(project, issue: { milestone_id: milestone.id }), class: "float-right", title: s_('MilestoneSidebar|New Issue') do = link_to new_project_issue_path(project, issue: { milestone_id: milestone.id }), class: "float-right", title: s_('MilestoneSidebar|New Issue') do
= s_('MilestoneSidebar|New issue') = s_('MilestoneSidebar|New issue')
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
%span= milestone.merge_requests.count %span= milestone.merge_requests.count
.title.hide-collapsed .title.hide-collapsed
= s_('MilestoneSidebar|Merge requests') = s_('MilestoneSidebar|Merge requests')
%span.badge.badge-pill= milestone.merge_requests.count %span.badge.badge-muted.badge-pill.gl-badge.sm= milestone.merge_requests.count
.value.hide-collapsed.bold .value.hide-collapsed.bold
- if !project || can?(current_user, :read_merge_request, project) - if !project || can?(current_user, :read_merge_request, project)
%span.milestone-stat %span.milestone-stat
......
---
title: Add gl-badge for badges in milestone drawer
merge_request: 57964
author: Yogi (@yo)
type: changed
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