summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-14 09:08:43 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-14 09:08:43 +0000
commit733befe96ad19f5a02e442c4a9cc8059d3aabbda (patch)
treedcabd344df040e536a242edc4e3121fb3efca142 /config
parent10213bf3b26c3c21f7683471d35d1cd052c41e9c (diff)
downloadgitlab-ce-733befe96ad19f5a02e442c4a9cc8059d3aabbda.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r--config/webpack.vendor.config.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/webpack.vendor.config.js b/config/webpack.vendor.config.js
index bddbf067d7c..8da4938191c 100644
--- a/config/webpack.vendor.config.js
+++ b/config/webpack.vendor.config.js
@@ -29,7 +29,7 @@ module.exports = {
'vuex',
'pikaday',
'vue/dist/vue.esm.js',
- 'at.js',
+ '@gitlab/at.js',
'jed',
'mermaid',
'katex',