Commit ddad22c4 authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'terminal-bundle-refactor' into 'master'

Removed terminal webpack bundle tag

See merge request gitlab-org/gitlab-ce!17494
parents c9660b45 8510fc87
import initTerminal from '~/terminal/';
document.addEventListener('DOMContentLoaded', initTerminal);
......@@ -6,4 +6,4 @@ import './terminal';
window.Terminal = Terminal;
$(() => new gl.Terminal({ selector: '#terminal' }));
export default () => new gl.Terminal({ selector: '#terminal' });
......@@ -3,7 +3,6 @@
- content_for :page_specific_javascripts do
= stylesheet_link_tag "xterm/xterm"
= webpack_bundle_tag("terminal")
%div{ class: container_class }
.top-area
......
......@@ -45,7 +45,6 @@ function generateEntries() {
const manualEntries = {
monitoring: './monitoring/monitoring_bundle.js',
mr_notes: './mr_notes/index.js',
terminal: './terminal/terminal_bundle.js',
common: './commons/index.js',
common_vue: './vue_shared/vue_resource_interceptor.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