diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-31 15:08:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-31 15:08:17 +0300 |
commit | 5820d448c17f93606afb52d878c00d84681764e0 (patch) | |
tree | 98835aafc3d77377ba402baeb2b5110b2467bda1 /scripts/frontend | |
parent | b654eb44a85fa358ce466b8d6cf772a660478fa9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/frontend')
-rw-r--r-- | scripts/frontend/stylelint/stylelint_duplicate_selectors.js (renamed from scripts/frontend/stylelint/stylelint-duplicate-selectors.js) | 2 | ||||
-rw-r--r-- | scripts/frontend/stylelint/stylelint_utility_classes.js (renamed from scripts/frontend/stylelint/stylelint-utility-classes.js) | 4 | ||||
-rw-r--r-- | scripts/frontend/stylelint/stylelint_utility_map.js (renamed from scripts/frontend/stylelint/stylelint-utility-map.js) | 6 | ||||
-rw-r--r-- | scripts/frontend/stylelint/stylelint_utils.js (renamed from scripts/frontend/stylelint/stylelint-utils.js) | 0 | ||||
-rw-r--r-- | scripts/frontend/stylelint/utility_classes_map.js (renamed from scripts/frontend/stylelint/utility-classes-map.js) | 0 |
5 files changed, 6 insertions, 6 deletions
diff --git a/scripts/frontend/stylelint/stylelint-duplicate-selectors.js b/scripts/frontend/stylelint/stylelint_duplicate_selectors.js index 982ddf524a3..77c1f1292b7 100644 --- a/scripts/frontend/stylelint/stylelint-duplicate-selectors.js +++ b/scripts/frontend/stylelint/stylelint_duplicate_selectors.js @@ -1,5 +1,5 @@ const stylelint = require('stylelint'); -const utils = require('./stylelint-utils'); +const utils = require('./stylelint_utils'); const ruleName = 'stylelint-gitlab/duplicate-selectors'; diff --git a/scripts/frontend/stylelint/stylelint-utility-classes.js b/scripts/frontend/stylelint/stylelint_utility_classes.js index 14827145b54..ad2b2ddbb20 100644 --- a/scripts/frontend/stylelint/stylelint-utility-classes.js +++ b/scripts/frontend/stylelint/stylelint_utility_classes.js @@ -1,6 +1,6 @@ const stylelint = require('stylelint'); -const utils = require('./stylelint-utils'); -const utilityClasses = require('./utility-classes-map'); +const utils = require('./stylelint_utils'); +const utilityClasses = require('./utility_classes_map'); const ruleName = 'stylelint-gitlab/utility-classes'; diff --git a/scripts/frontend/stylelint/stylelint-utility-map.js b/scripts/frontend/stylelint/stylelint_utility_map.js index 676f83cd067..187b2065823 100644 --- a/scripts/frontend/stylelint/stylelint-utility-map.js +++ b/scripts/frontend/stylelint/stylelint_utility_map.js @@ -4,13 +4,13 @@ const postcss = require('postcss'); const prettier = require('prettier'); const sass = require('sass'); -const utils = require('./stylelint-utils'); +const utils = require('./stylelint_utils'); const ROOT_PATH = path.resolve(__dirname, '../../..'); -const hashMapPath = path.resolve(__dirname, './utility-classes-map.js'); +const hashMapPath = path.resolve(__dirname, './utility_classes_map.js'); // -// This creates a JS based hash map (saved in utility-classes-map.js) of the different values in the utility classes +// This creates a JS based hash map (saved in utility_classes_map.js) of the different values in the utility classes // sass.render( { diff --git a/scripts/frontend/stylelint/stylelint-utils.js b/scripts/frontend/stylelint/stylelint_utils.js index c9d9c7d9aad..c9d9c7d9aad 100644 --- a/scripts/frontend/stylelint/stylelint-utils.js +++ b/scripts/frontend/stylelint/stylelint_utils.js diff --git a/scripts/frontend/stylelint/utility-classes-map.js b/scripts/frontend/stylelint/utility_classes_map.js index a174812ff93..a174812ff93 100644 --- a/scripts/frontend/stylelint/utility-classes-map.js +++ b/scripts/frontend/stylelint/utility_classes_map.js |