diff options
author | Stan Hu <stanhu@gmail.com> | 2019-05-02 15:11:14 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-05-02 15:11:14 -0700 |
commit | 79890748cf653aca57b194eb4950c650b390e9a9 (patch) | |
tree | d25e96a309cae063882852a444706d40c1671d0c /jest.config.js | |
parent | 5259e75d79568946e9e49f5420caec32122cd9ff (diff) | |
parent | 206504008cb8dbcddd05545d71c644c059801250 (diff) | |
download | gitlab-ce-56557-disable-kubernetes-namespace-service-account-backend.tar.gz |
Merge branch 'master' into 56557-disable-kubernetes-namespace-service-account-backend56557-disable-kubernetes-namespace-service-account-backend
Diffstat (limited to 'jest.config.js')
-rw-r--r-- | jest.config.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/jest.config.js b/jest.config.js index fdbbe977f0b..0868547e654 100644 --- a/jest.config.js +++ b/jest.config.js @@ -24,6 +24,7 @@ module.exports = { '^helpers(/.*)$': '<rootDir>/spec/frontend/helpers$1', '^vendor(/.*)$': '<rootDir>/vendor/assets/javascripts$1', '\\.(jpg|jpeg|png|svg)$': '<rootDir>/spec/frontend/__mocks__/file_mock.js', + 'emojis(/.*).json': '<rootDir>/fixtures/emojis$1.json', }, collectCoverageFrom: ['<rootDir>/app/assets/javascripts/**/*.{js,vue}'], coverageDirectory: '<rootDir>/coverage-frontend/', |