diff options
Diffstat (limited to 'app/views/shared/milestones')
-rw-r--r-- | app/views/shared/milestones/_deprecation_message.html.haml | 15 | ||||
-rw-r--r-- | app/views/shared/milestones/_milestone.html.haml | 2 | ||||
-rw-r--r-- | app/views/shared/milestones/_sidebar.html.haml | 4 |
3 files changed, 3 insertions, 18 deletions
diff --git a/app/views/shared/milestones/_deprecation_message.html.haml b/app/views/shared/milestones/_deprecation_message.html.haml deleted file mode 100644 index 27cd6d75232..00000000000 --- a/app/views/shared/milestones/_deprecation_message.html.haml +++ /dev/null @@ -1,15 +0,0 @@ -.banner-callout.compact.milestone-deprecation-message.js-milestone-deprecation-message.prepend-top-20 - .banner-graphic= image_tag 'illustrations/milestone_removing-page.svg' - .banner-body.gl-ml-3.gl-mr-3 - %h5.banner-title.gl-mt-0= _('This page will be removed in a future release.') - %p.milestone-banner-text= _('Use group milestones to manage issues from multiple projects in the same milestone.') - = button_tag _('Promote these project milestones into a group milestone.'), class: 'btn btn-link js-popover-link text-align-left milestone-banner-link' - .milestone-banner-buttons.prepend-top-20= link_to _('Learn more'), help_page_url('user/project/milestones/index', anchor: 'promoting-project-milestones-to-group-milestones'), class: 'btn btn-default', target: '_blank' - - %template.js-milestone-deprecation-message-template - .milestone-popover-body - %ol.milestone-popover-instructions-list.gl-mb-0 - %li= _('Click any <strong>project name</strong> in the project list below to navigate to the project milestone.').html_safe - %li= _('Click the <strong>Promote</strong> button in the top right corner to promote it to a group milestone.').html_safe - %hr.popover-hr - .milestone-popover-footer= link_to _('Learn more'), help_page_url('user/project/milestones/index', anchor: 'promoting-project-milestones-to-group-milestones'), class: 'btn btn-link prepend-left-0', target: '_blank' diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index ae5bf9572bd..4ef8a9dd842 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -15,7 +15,7 @@ .text-tertiary.gl-mb-2 = milestone_date_range(milestone) - recent_releases, total_count, more_count = recent_releases_with_counts(milestone) - - unless total_count.zero? + - unless total_count == 0 .text-tertiary.gl-mb-2.milestone-release-links = sprite_icon("rocket", size: 12) = n_('Release', 'Releases', total_count) diff --git a/app/views/shared/milestones/_sidebar.html.haml b/app/views/shared/milestones/_sidebar.html.haml index 7fd657ec2dd..bdacdb23141 100644 --- a/app/views/shared/milestones/_sidebar.html.haml +++ b/app/views/shared/milestones/_sidebar.html.haml @@ -140,11 +140,11 @@ .block.releases .sidebar-collapsed-icon.has-tooltip{ title: milestone_releases_tooltip_text(milestone), data: { container: 'body', placement: 'left', boundary: 'viewport' } } %strong - = sprite_icon("rocket", size: 16) + = sprite_icon("rocket") %span= total_count .title.hide-collapsed= n_('Release', 'Releases', total_count) .hide-collapsed - - if total_count.zero? + - if total_count == 0 .no-value= s_('MilestoneSidebar|None') - else .font-weight-bold |