diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-02-20 16:12:04 +0000 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2017-02-27 23:08:52 -0500 |
| commit | 09ffa984171a05b34c8a375f57a293d4f5cece17 (patch) | |
| tree | 281d2872f654d15bd3fc652224896c27fa6d0b75 | |
| parent | 77254ab78e4d1043fa269b46dba31222196c3b8f (diff) | |
| download | gitlab-ce-09ffa984171a05b34c8a375f57a293d4f5cece17.tar.gz | |
Merge branch 'fix-vue-production-build' into 'master'
Utilize bundler-ready Vue distribution
See merge request !9357
| -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 d1bf9c63df3..912c993cd70 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -91,8 +91,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', } } } |