Commit cac086bb authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'webpack-roadmap' into 'master'

Remove roadmap webpack bundle entry point

See merge request gitlab-org/gitlab-ee!4786
parents 9ecb7440 bab751cb
...@@ -72,7 +72,6 @@ function generateEntries() { ...@@ -72,7 +72,6 @@ function generateEntries() {
mirrors: 'ee/mirrors', mirrors: 'ee/mirrors',
ee_protected_branches: 'ee/protected_branches', ee_protected_branches: 'ee/protected_branches',
service_desk: 'ee/projects/settings_service_desk/service_desk_bundle.js', service_desk: 'ee/projects/settings_service_desk/service_desk_bundle.js',
roadmap: 'ee/roadmap',
}; };
return Object.assign(manualEntries, autoEntries); return Object.assign(manualEntries, autoEntries);
......
import initNewEpic from 'ee/epics/new_epic/new_epic_bundle'; import initNewEpic from 'ee/epics/new_epic/new_epic_bundle';
import initRoadmap from 'ee/roadmap/index';
document.addEventListener('DOMContentLoaded', initNewEpic); document.addEventListener('DOMContentLoaded', () => {
initNewEpic();
initRoadmap();
});
...@@ -13,7 +13,7 @@ import roadmapApp from './components/app.vue'; ...@@ -13,7 +13,7 @@ import roadmapApp from './components/app.vue';
Vue.use(Translate); Vue.use(Translate);
document.addEventListener('DOMContentLoaded', () => { export default () => {
const el = document.getElementById('js-roadmap'); const el = document.getElementById('js-roadmap');
if (!el) { if (!el) {
...@@ -57,4 +57,4 @@ document.addEventListener('DOMContentLoaded', () => { ...@@ -57,4 +57,4 @@ document.addEventListener('DOMContentLoaded', () => {
}); });
}, },
}); });
}); };
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
- if @epics_count != 0 - if @epics_count != 0
- content_for :page_specific_javascripts do - content_for :page_specific_javascripts do
= webpack_bundle_tag 'common_vue' = webpack_bundle_tag 'common_vue'
= webpack_bundle_tag 'roadmap'
#js-roadmap{ data: { epics_path: group_epics_path(@group, format: :json), group_id: @group.id, empty_state_illustration: image_path('illustrations/epics/roadmap.svg') } } #js-roadmap{ data: { epics_path: group_epics_path(@group, format: :json), group_id: @group.id, empty_state_illustration: image_path('illustrations/epics/roadmap.svg') } }
- else - else
= render 'shared/empty_states/roadmap' = render 'shared/empty_states/roadmap'
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