diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-02-20 16:12:04 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-02-20 16:12:04 +0000 |
| commit | 7c57e0994cf90981c4c20cc0cde20cb49ec5d11d (patch) | |
| tree | e122d0b54bfe5812c01761ea018ea9b3ad1533b2 /config | |
| parent | 6df411b442d5791c67d5193b90a609cfe23aa6f5 (diff) | |
| parent | ae89a890555de905505d1dcfd0ec593a40ddb26e (diff) | |
| download | gitlab-ce-7c57e0994cf90981c4c20cc0cde20cb49ec5d11d.tar.gz | |
Merge branch 'fix-vue-production-build' into 'master'
Utilize bundler-ready Vue distribution
See merge request !9357
Diffstat (limited to 'config')
| -rw-r--r-- | config/webpack.config.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index f71bd686136..515569b2e97 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -84,8 +84,7 @@ var config = { 'bootstrap/js': 'bootstrap-sass/assets/javascripts/bootstrap', 'emoji-aliases$': path.join(ROOT_PATH, 'fixtures/emojis/aliases.json'), 'vendor': path.join(ROOT_PATH, 'vendor/assets/javascripts'), - 'vue$': 'vue/dist/vue.js', - 'vue-resource$': 'vue-resource/dist/vue-resource.js' + 'vue$': IS_PRODUCTION ? 'vue/dist/vue.min.js' : 'vue/dist/vue.js', } } } |