Commit 3bec37e0 authored by Mark Florian's avatar Mark Florian

Merge branch...

Merge branch '344397-make-badges-in-app-views-shared-milestones-_milestone-html-haml-pajamas-compliant' into 'master'

Resolve "Make badges in app/views/shared/milestones/_milestone.html.haml Pajamas-compliant"

See merge request gitlab-org/gitlab!76100
parents 2498f1e3 fa5fa086
- if milestone.expired? && !milestone.closed? - if milestone.expired? && !milestone.closed?
.gl-badge.badge-warning.badge-pill.gl-mb-2= _('Expired') = gl_badge_tag _('Expired'), { variant: :warning }, { class: "gl-mb-2" }
- if milestone.upcoming? - if milestone.upcoming?
.gl-badge.badge-primary.badge-pill.gl-mb-2= _('Upcoming') = gl_badge_tag _('Upcoming'), { variant: :info }, { class: "gl-mb-2" }
- if milestone.closed? - if milestone.closed?
.gl-badge.badge-danger.badge-pill.gl-mb-2= _('Closed') = gl_badge_tag _('Closed'), { variant: :danger }, { class: "gl-mb-2" }
...@@ -33,11 +33,9 @@ ...@@ -33,11 +33,9 @@
%div %div
= render('shared/milestone_expired', milestone: milestone) = render('shared/milestone_expired', milestone: milestone)
- if milestone.group_milestone? - if milestone.group_milestone?
.gl-badge.badge-info.badge-pill = gl_badge_tag milestone.group.full_name, variant: :info
= milestone.group.full_name
- if milestone.project_milestone? - if milestone.project_milestone?
.gl-badge.badge-muted.badge-pill = gl_badge_tag milestone.project.full_name, variant: :muted
= milestone.project.full_name
.col-sm-4.milestone-progress .col-sm-4.milestone-progress
= milestone_progress_bar(milestone) = milestone_progress_bar(milestone)
......
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