summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/behaviors
diff options
context:
space:
mode:
authorSam Bigelow <sbigelow@gitlab.com>2019-03-01 16:41:16 -0500
committerSam Bigelow <sbigelow@gitlab.com>2019-03-21 10:24:18 -0400
commit1a14e5230e5b7f705fc09c3baf46f6cf74ca3ad0 (patch)
tree7c8f1d88347252e88535dc087f3129102ef77bf8 /app/assets/javascripts/behaviors
parentc174fc0cc1a221bb2ab8f265b3691a17d5cfd8aa (diff)
downloadgitlab-ce-1a14e5230e5b7f705fc09c3baf46f6cf74ca3ad0.tar.gz
Add merge request popover with details
- Show pipeline status, title, MR Status and project path - Popover attached to gitlab flavored markdown everywhere, including: + MR/Issue Title + MR/Issue description + MR/Issue comments + Rendered markdown files
Diffstat (limited to 'app/assets/javascripts/behaviors')
-rw-r--r--app/assets/javascripts/behaviors/markdown/render_gfm.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/behaviors/markdown/render_gfm.js b/app/assets/javascripts/behaviors/markdown/render_gfm.js
index fc9286d15e6..bfb073fdcdc 100644
--- a/app/assets/javascripts/behaviors/markdown/render_gfm.js
+++ b/app/assets/javascripts/behaviors/markdown/render_gfm.js
@@ -4,6 +4,7 @@ import renderMath from './render_math';
import renderMermaid from './render_mermaid';
import highlightCurrentUser from './highlight_current_user';
import initUserPopovers from '../../user_popovers';
+import initMRPopovers from '../../mr_popover';
// Render GitLab flavoured Markdown
//
@@ -15,6 +16,7 @@ $.fn.renderGFM = function renderGFM() {
renderMermaid(this.find('.js-render-mermaid'));
highlightCurrentUser(this.find('.gfm-project_member').get());
initUserPopovers(this.find('.gfm-project_member').get());
+ initMRPopovers(this.find('.gfm-merge_request').get());
return this;
};