diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-24 12:09:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-24 12:09:17 +0300 |
commit | 43c14d2d9245aea5964d52d3e4915be1126977cb (patch) | |
tree | 769e314e13e40059f6b5ff228e670e278d201e06 /app/assets/javascripts/behaviors | |
parent | ecf2b5b6048d8f289d085b5d7951381c1ef4dca0 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/behaviors')
-rw-r--r-- | app/assets/javascripts/behaviors/markdown/render_gfm.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/behaviors/markdown/render_gfm.js b/app/assets/javascripts/behaviors/markdown/render_gfm.js index 063393c9cd1..c1dff1715b9 100644 --- a/app/assets/javascripts/behaviors/markdown/render_gfm.js +++ b/app/assets/javascripts/behaviors/markdown/render_gfm.js @@ -24,11 +24,11 @@ $.fn.renderGFM = function renderGFM() { highlightCurrentUser(this.find('.gfm-project_member').get()); initUserPopovers(this.find('.js-user-link').get()); - const mrPopoverElements = this.find('.gfm-merge_request').get(); - if (mrPopoverElements.length) { - import(/* webpackChunkName: 'MrPopoverBundle' */ '~/mr_popover') - .then(({ default: initMRPopovers }) => { - initMRPopovers(mrPopoverElements); + const issuablePopoverElements = this.find('.gfm-merge_request').get(); + if (issuablePopoverElements.length) { + import(/* webpackChunkName: 'IssuablePopoverBundle' */ '~/issuable/popover') + .then(({ default: initIssuablePopovers }) => { + initIssuablePopovers(issuablePopoverElements); }) .catch(() => {}); } |