Merge branch '3471-burndown-chart-banner-shows-up-even-if-group-has-upgraded' into 'master'

Resolve "Burndown chart Banner shows up even if group has upgraded"

Closes #3471 and #3474

See merge request gitlab-org/gitlab-ee!2945

app/views/shared/issuable/form/_title.html.haml

@@ -30,10 +30,10 @@
         merge request from being merged before it's ready.
 
   - if no_issuable_templates && can?(current_user, :push_code, issuable.project)
-    - if show_promotions?
-      = render 'shared/promotions/promote_issue_templates'
-    - else
+    - if @project.feature_available?(:issuable_default_templates)
       %p.help-block
         Add
         = link_to 'description templates', help_page_path('user/project/description_templates'), tabindex: -1
         to help your contributors communicate effectively!
+    - elsif show_promotions?
+      = render 'shared/promotions/promote_issue_templates'

ee/app/views/shared/promotions/_promote_burndown_charts.html.haml

-- if show_promotions? && show_callout?('promote_burndown_charts_dismissed')
+- if show_project_feature_promotion?(:burndown_charts, 'promote_burndown_charts_dismissed')
   .user-callout.promotion-callout#promote_burndown_charts{ data: { uid: 'promote_burndown_charts_dismissed' } }
     .bordered-box.content-block
       %button.btn.btn-default.close.js-close-callout{ type: 'button', 'aria-label' => 'Dismiss burndown charts promotion' }

ee/app/views/shared/promotions/_promote_issue_templates.html.haml

 .help-block
   = _('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!')
   .dropdown.promotion-issue-template
     .dropdown-menu.promotion-issue-template-message