Commit a1b1cbdd authored by Tim Zallmann's avatar Tim Zallmann Committed by Tim Zallmann

Fixes for Burndown Charts, Issue Templates and Tab Index of Promotion Link

parent 5f9c1a0c
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
merge request from being merged before it's ready. merge request from being merged before it's ready.
- if no_issuable_templates && can?(current_user, :push_code, issuable.project) - if no_issuable_templates && can?(current_user, :push_code, issuable.project)
- if show_promotions? - if show_promotions? && !@project.feature_available?(:issuable_default_templates)
= render 'shared/promotions/promote_issue_templates' = render 'shared/promotions/promote_issue_templates'
- else - else
%p.help-block %p.help-block
......
- if show_promotions? && show_callout?('promote_burndown_charts_dismissed') - if show_promotions? && !@project.feature_available?(:burndown_charts) && !@project.feature_available?(:issue_weights) && show_callout?('promote_burndown_charts_dismissed')
.user-callout.promotion-callout#promote_burndown_charts{ data: { uid: 'promote_burndown_charts_dismissed' } } .user-callout.promotion-callout#promote_burndown_charts{ data: { uid: 'promote_burndown_charts_dismissed' } }
.bordered-box.content-block .bordered-box.content-block
%button.btn.btn-default.close.js-close-callout{ type: 'button', 'aria-label' => 'Dismiss burndown charts promotion' } %button.btn.btn-default.close.js-close-callout{ type: 'button', 'aria-label' => 'Dismiss burndown charts promotion' }
......
.help-block .help-block
= _('Add') = _('Add')
= link_to 'description templates', 'javascript:void(0);', id: 'promotion-issue-template-link', data: {toggle: 'dropdown'} = link_to 'description templates', 'javascript:void(0);', id: 'promotion-issue-template-link', data: {toggle: 'dropdown'}, tabindex: -1
= _('to help your contributors communicate effectively!') = _('to help your contributors communicate effectively!')
.dropdown.promotion-issue-template .dropdown.promotion-issue-template
.dropdown-menu.promotion-issue-template-message .dropdown-menu.promotion-issue-template-message
......
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