diff options
| author | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-27 17:10:25 +0000 |
|---|---|---|
| committer | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-27 17:10:25 +0000 |
| commit | 61f65992a05e8fc5ab756ac0ce890d090c6cf4eb (patch) | |
| tree | 57952a5fa69f757bcd33247e6e3642ba98c6252b /config/webpack.config.js | |
| parent | 44622abe9603c5419bc50212654f737343012ca8 (diff) | |
| parent | 883342ce36b5f38156a3376af7d8a2e274163917 (diff) | |
| download | gitlab-ce-61f65992a05e8fc5ab756ac0ce890d090c6cf4eb.tar.gz | |
Merge branch 'master' into 'add-svg-loader'
# Conflicts:
# app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6
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 ddc888c5f93..d178106d179 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -92,7 +92,7 @@ var config = { 'emoji-aliases$': path.join(ROOT_PATH, 'fixtures/emojis/aliases.json'), 'icons': path.join(ROOT_PATH, 'app/views/shared/icons'), 'vendor': path.join(ROOT_PATH, 'vendor/assets/javascripts'), - 'vue$': IS_PRODUCTION ? 'vue/dist/vue.min.js' : 'vue/dist/vue.js', + 'vue$': 'vue/dist/vue.common.js', } } } |