summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2017-02-26 21:44:54 +0000
committerFatih Acet <acetfatih@gmail.com>2017-02-26 21:44:54 +0000
commit166d71cb8b60d0c17ee4c1e9fa50fb40bc93a061 (patch)
tree1a1fbbbfe456e2c65e625e013685d5af89b35176
parentb29e4689a86a51d70d7353dd0d4dc4fddc6c644f (diff)
parent1a0f70bf2297cb4551531ca6876c1988f78798e9 (diff)
downloadgitlab-ce-166d71cb8b60d0c17ee4c1e9fa50fb40bc93a061.tar.gz
Merge branch 'update-vue-2.1' into 'master'
Update Vue to v2.1 See merge request !9386
-rw-r--r--changelogs/unreleased/update-vue-2-1.yml4
-rw-r--r--config/webpack.config.js2
-rw-r--r--package.json2
-rw-r--r--yarn.lock6
4 files changed, 9 insertions, 5 deletions
diff --git a/changelogs/unreleased/update-vue-2-1.yml b/changelogs/unreleased/update-vue-2-1.yml
new file mode 100644
index 00000000000..acc42bf00b1
--- /dev/null
+++ b/changelogs/unreleased/update-vue-2-1.yml
@@ -0,0 +1,4 @@
+---
+title: update Vue to v2.1.10
+merge_request: 9386
+author:
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',
}
}
}
diff --git a/package.json b/package.json
index 66aa7e9fe5d..5528303ab21 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
"stats-webpack-plugin": "^0.4.3",
"timeago.js": "^2.0.5",
"underscore": "^1.8.3",
- "vue": "^2.0.3",
+ "vue": "^2.1.10",
"vue-resource": "^0.9.3",
"webpack": "^2.2.1",
"webpack-bundle-analyzer": "^2.3.0"
diff --git a/yarn.lock b/yarn.lock
index 1eaa04e21c1..cb4ef36119f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4410,9 +4410,9 @@ vue-resource@^0.9.3:
version "0.9.3"
resolved "https://registry.yarnpkg.com/vue-resource/-/vue-resource-0.9.3.tgz#ab46e1c44ea219142dcc28ae4043b3b04c80959d"
-vue@^2.0.3:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/vue/-/vue-2.0.3.tgz#3f7698f83d6ad1f0e35955447901672876c63fde"
+vue@^2.1.10:
+ version "2.1.10"
+ resolved "https://registry.yarnpkg.com/vue/-/vue-2.1.10.tgz#c9235ca48c7925137be5807832ac4e3ac180427b"
watchpack@^1.2.0:
version "1.2.1"