Merge branch 'dismiss-epic-promo' into 'master'

Dismiss epic promotion and persist across reload

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

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

 - promotion_feature = 'promote_epics_sidebar_dismissed'
 
-- if promote_feature?(:epic)
+- if promote_feature?(:epic) && show_promotions? && show_callout?(promotion_feature)
   .block.js-epics-sidebar-callout.promotion-issue-sidebar{ data: { uid: promotion_feature } }
     .sidebar-collapsed-icon{ data: { toggle: "dropdown", target: ".js-epics-sidebar-callout" } }
       %span{ data: { toggle: "tooltip", placement: "left", container: "body" }, title: _('Epic') }

ee/changelogs/unreleased/dismiss-epic-promo.yml

+---
+title: Dismiss epic promotion and persist it across reloads
+merge_request: 8885
+author:
+type: fixed

ee/spec/features/promotion_spec.rb

@@ -264,7 +264,7 @@ describe 'Promotions', :js do
         find('.js-epics-sidebar-callout .js-close-callout').click
         visit project_issue_path(project, issue)
 
-        expect(page).not_to have_selector('.promotion-issue-sidebar-message')
+        expect(page).not_to have_selector('.js-epics-sidebar-callout')
       end
 
       it 'should close dialog when clicking on X, but not dismiss it' do