diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /scripts/frontend | |
parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'scripts/frontend')
-rw-r--r-- | scripts/frontend/merge_coverage_frontend.js | 2 | ||||
-rw-r--r-- | scripts/frontend/prettier.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/frontend/merge_coverage_frontend.js b/scripts/frontend/merge_coverage_frontend.js index 507695b45e5..99034176b29 100644 --- a/scripts/frontend/merge_coverage_frontend.js +++ b/scripts/frontend/merge_coverage_frontend.js @@ -26,6 +26,6 @@ reportFiles const context = createContext({ coverageMap: coverageMap, dir: 'coverage-frontend' }); -['json', 'lcov', 'text-summary', 'clover'].forEach(reporter => { +['json', 'lcov', 'text-summary', 'clover', 'cobertura'].forEach(reporter => { create(reporter, {}).execute(context); }); diff --git a/scripts/frontend/prettier.js b/scripts/frontend/prettier.js index 45cdef2ba86..7772f80c233 100644 --- a/scripts/frontend/prettier.js +++ b/scripts/frontend/prettier.js @@ -3,7 +3,7 @@ const prettier = require('prettier'); const fs = require('fs'); const { getStagedFiles } = require('./frontend_script_utils'); -const matchExtensions = ['js', 'vue']; +const matchExtensions = ['js', 'vue', 'graphql']; // This will improve glob performance by excluding certain directories. // The .prettierignore file will also be respected, but after the glob has executed. |