Add latest changes from gitlab-org/gitlab@13-2-stable-ee

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.