diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-14 18:10:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-14 18:10:35 +0300 |
commit | 7172fb10313a9a7790f8e033b347e77df4987154 (patch) | |
tree | fe1fda5411240ba303bdd1032d12a94ccd58c27c /scripts/frontend | |
parent | 793d974d7c4bd8c9cbd437a9e35087092f4e8bea (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/frontend')
-rwxr-xr-x | scripts/frontend/check_page_bundle_mixins_css_for_sideeffects.js | 2 | ||||
-rw-r--r-- | scripts/frontend/merge_coverage_frontend.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/frontend/check_page_bundle_mixins_css_for_sideeffects.js b/scripts/frontend/check_page_bundle_mixins_css_for_sideeffects.js index 22a4aac762b..4c439caa1da 100755 --- a/scripts/frontend/check_page_bundle_mixins_css_for_sideeffects.js +++ b/scripts/frontend/check_page_bundle_mixins_css_for_sideeffects.js @@ -8,8 +8,8 @@ if (process.env.RAILS_ENV !== 'production') { } const fs = require('fs'); -const glob = require('glob'); const path = require('path'); +const glob = require('glob'); const pjs = require('postcss'); const paths = glob.sync('public/assets/page_bundles/_mixins_and_variables_and_functions*.css', { diff --git a/scripts/frontend/merge_coverage_frontend.js b/scripts/frontend/merge_coverage_frontend.js index 6b3826ddac7..bd56b0d5868 100644 --- a/scripts/frontend/merge_coverage_frontend.js +++ b/scripts/frontend/merge_coverage_frontend.js @@ -1,8 +1,8 @@ +const { resolve } = require('path'); const { sync } = require('glob'); const { createCoverageMap } = require('istanbul-lib-coverage'); const { createContext } = require('istanbul-lib-report'); const { create } = require('istanbul-reports'); -const { resolve } = require('path'); const coverageMap = createCoverageMap(); |