diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-05 16:06:31 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-05 16:06:31 +0000 |
| commit | 4c6898bdcf0bff6a0a3b288215271be4e916b27c (patch) | |
| tree | 13db382a777a55c8220fcbdd85ebf5bf4cedeb03 /config/webpack.config.js | |
| parent | ae9b771797cceee76c18376910519e9e71628acc (diff) | |
| parent | 063e285e6a8c26a95809873fb32fefc54fe9bdb6 (diff) | |
| download | gitlab-ce-4c6898bdcf0bff6a0a3b288215271be4e916b27c.tar.gz | |
Merge branch 'master' into '36860-migrate-issues-author'36860-migrate-issues-author
# Conflicts:
# db/schema.rb
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', |