diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-02-26 21:44:54 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-02-26 21:44:54 +0000 |
| commit | 166d71cb8b60d0c17ee4c1e9fa50fb40bc93a061 (patch) | |
| tree | 1a1fbbbfe456e2c65e625e013685d5af89b35176 /config | |
| parent | b29e4689a86a51d70d7353dd0d4dc4fddc6c644f (diff) | |
| parent | 1a0f70bf2297cb4551531ca6876c1988f78798e9 (diff) | |
| download | gitlab-ce-166d71cb8b60d0c17ee4c1e9fa50fb40bc93a061.tar.gz | |
Merge branch 'update-vue-2.1' into 'master'
Update Vue to v2.1
See merge request !9386
Diffstat (limited to 'config')
| -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 e754f68553a..a71ec0c5f52 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -87,7 +87,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$': IS_PRODUCTION ? 'vue/dist/vue.min.js' : 'vue/dist/vue.js', + 'vue$': 'vue/dist/vue.common.js', } } } |