diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-09-06 15:16:38 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-09-06 15:16:38 +0200 |
| commit | 8189347b4986e2e44b30d04bf9e83c11e76feef8 (patch) | |
| tree | 2de0e9b37d8938966fa48876b83313fb76b99b6f /config/webpack.config.js | |
| parent | c288ca78b42986ea1cc315d46d58fc25f7ff8f85 (diff) | |
| parent | b97f9629cabadca1125351a8aa514791524dea3f (diff) | |
| download | gitlab-ce-8189347b4986e2e44b30d04bf9e83c11e76feef8.tar.gz | |
Merge branch 'master' into zj-auto-devops-table
Diffstat (limited to 'config/webpack.config.js')
| -rw-r--r-- | config/webpack.config.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index ad88e48550d..6b0cd023291 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -30,7 +30,7 @@ var config = { blob: './blob_edit/blob_bundle.js', boards: './boards/boards_bundle.js', common: './commons/index.js', - common_vue: ['vue', './vue_shared/common_vue.js'], + common_vue: './vue_shared/vue_resource_interceptor.js', common_d3: ['d3'], cycle_analytics: './cycle_analytics/cycle_analytics_bundle.js', commit_pipelines: './commit/pipelines/pipelines_bundle.js', |