Commit 224c5a6a authored by Fatih Acet's avatar Fatih Acet

Merge branch 'remove-mr-notes-bundle-ee' into 'master'

EE Port of "Remove mr_notes webpack bundle"

See merge request gitlab-org/gitlab-ee!4815
parents aacb95dd 08fa5377
...@@ -3,7 +3,7 @@ import notesApp from '../notes/components/notes_app.vue'; ...@@ -3,7 +3,7 @@ import notesApp from '../notes/components/notes_app.vue';
import discussionCounter from '../notes/components/discussion_counter.vue'; import discussionCounter from '../notes/components/discussion_counter.vue';
import store from '../notes/stores'; import store from '../notes/stores';
document.addEventListener('DOMContentLoaded', () => { export default function initMrNotes() {
new Vue({ // eslint-disable-line new Vue({ // eslint-disable-line
el: '#js-vue-mr-discussions', el: '#js-vue-mr-discussions',
components: { components: {
...@@ -38,4 +38,4 @@ document.addEventListener('DOMContentLoaded', () => { ...@@ -38,4 +38,4 @@ document.addEventListener('DOMContentLoaded', () => {
return createElement('discussion-counter'); return createElement('discussion-counter');
}, },
}); });
}); }
import initTerminal from '~/terminal/';
document.addEventListener('DOMContentLoaded', initTerminal);
import { hasVueMRDiscussionsCookie } from '~/lib/utils/common_utils';
import initMrNotes from '~/mr_notes';
import initSidebarBundle from '~/sidebar/sidebar_bundle'; import initSidebarBundle from '~/sidebar/sidebar_bundle';
import initShow from '../init_merge_request_show'; import initShow from '../init_merge_request_show';
document.addEventListener('DOMContentLoaded', () => { document.addEventListener('DOMContentLoaded', () => {
initShow(); initShow();
initSidebarBundle(); initSidebarBundle();
if (hasVueMRDiscussionsCookie()) {
initMrNotes();
}
}); });
...@@ -6,4 +6,4 @@ import './terminal'; ...@@ -6,4 +6,4 @@ import './terminal';
window.Terminal = Terminal; window.Terminal = Terminal;
$(() => new gl.Terminal({ selector: '#terminal' })); export default () => new gl.Terminal({ selector: '#terminal' });
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
- content_for :page_specific_javascripts do - content_for :page_specific_javascripts do
= stylesheet_link_tag "xterm/xterm" = stylesheet_link_tag "xterm/xterm"
= webpack_bundle_tag("terminal")
%div{ class: container_class } %div{ class: container_class }
.top-area .top-area
......
...@@ -5,9 +5,6 @@ ...@@ -5,9 +5,6 @@
- page_title "#{@merge_request.title} (#{@merge_request.to_reference})", "Merge Requests" - page_title "#{@merge_request.title} (#{@merge_request.to_reference})", "Merge Requests"
- page_description @merge_request.description - page_description @merge_request.description
- page_card_attributes @merge_request.card_attributes - page_card_attributes @merge_request.card_attributes
- if has_vue_discussions_cookie?
- content_for :page_specific_javascripts do
= webpack_bundle_tag('mr_notes')
.merge-request{ data: { mr_action: j(params[:tab].presence || 'show'), url: merge_request_path(@merge_request, format: :json), project_path: project_path(@merge_request.project) } } .merge-request{ data: { mr_action: j(params[:tab].presence || 'show'), url: merge_request_path(@merge_request, format: :json), project_path: project_path(@merge_request.project) } }
= render "projects/merge_requests/mr_title" = render "projects/merge_requests/mr_title"
......
...@@ -48,10 +48,6 @@ function generateEntries() { ...@@ -48,10 +48,6 @@ function generateEntries() {
autoEntriesCount = Object.keys(autoEntries).length; autoEntriesCount = Object.keys(autoEntries).length;
const manualEntries = { const manualEntries = {
monitoring: './monitoring/monitoring_bundle.js',
mr_notes: './mr_notes/index.js',
terminal: './terminal/terminal_bundle.js',
common: './commons/index.js', common: './commons/index.js',
common_vue: './vue_shared/vue_resource_interceptor.js', common_vue: './vue_shared/vue_resource_interceptor.js',
locale: './locale/index.js', locale: './locale/index.js',
......
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