Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot
2019-09-14 00:06:25 +00:00
parent 188a57f93b
commit a93dfc1b7e
22 changed files with 960 additions and 389 deletions

View File

@ -31,6 +31,9 @@ module.exports = {
moduleNameMapper: {
'^~(/.*)$': '<rootDir>/app/assets/javascripts$1',
'^ee(/.*)$': '<rootDir>/ee/app/assets/javascripts$1',
'^ee_component(/.*)$': IS_EE
? '<rootDir>/ee/app/assets/javascripts$1'
: '<rootDir>/app/assets/javascripts/vue_shared/components/empty_component.js',
'^ee_else_ce(/.*)$': IS_EE
? '<rootDir>/ee/app/assets/javascripts$1'
: '<rootDir>/app/assets/javascripts$1',