diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /scripts/frontend | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
download | gitlab-ce-e8d2c2579383897a1dd7f9debd359abe8ae8373d.tar.gz |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'scripts/frontend')
-rw-r--r-- | scripts/frontend/extract_gettext_all.js | 2 | ||||
-rwxr-xr-x | scripts/frontend/startup_css/startup_css_changed.sh | 19 | ||||
-rw-r--r-- | scripts/frontend/stylelint/stylelint-utility-classes.js | 2 |
3 files changed, 14 insertions, 9 deletions
diff --git a/scripts/frontend/extract_gettext_all.js b/scripts/frontend/extract_gettext_all.js index 896790a73bb..0a5e2b06971 100644 --- a/scripts/frontend/extract_gettext_all.js +++ b/scripts/frontend/extract_gettext_all.js @@ -6,7 +6,7 @@ const { decorateExtractorWithHelpers, } = require('gettext-extractor-vue'); const vue2TemplateCompiler = require('vue-template-compiler'); -const ensureSingleLine = require('../../app/assets/javascripts/locale/ensure_single_line.js'); +const ensureSingleLine = require('../../app/assets/javascripts/locale/ensure_single_line'); const args = argumentsParser .option('-f, --file <file>', 'Extract message from one single file') diff --git a/scripts/frontend/startup_css/startup_css_changed.sh b/scripts/frontend/startup_css/startup_css_changed.sh index f214e61cdfb..2713d752974 100755 --- a/scripts/frontend/startup_css/startup_css_changed.sh +++ b/scripts/frontend/startup_css/startup_css_changed.sh @@ -10,10 +10,10 @@ echo "-----------------------------------------------------------" startup_glob="*stylesheets/startup*" echo "Staging changes to '${startup_glob}' so we can check for untracked files..." -git add ${startup_glob} +git add "${startup_glob}" -if [ -n "$(git diff HEAD --name-only -- ${startup_glob})" ]; then - diff=$(git diff HEAD -- ${startup_glob}) +if [ -n "$(git diff HEAD --name-only -- "${startup_glob}")" ]; then + diff=$(git diff HEAD -- "${startup_glob}") cat <<EOF Startup CSS changes detected! @@ -21,14 +21,19 @@ Startup CSS changes detected! It looks like there have been recent changes which require regenerating the Startup CSS files. -**What should I do now?** +IMPORTANT: -IMPORTANT: Please make sure to update your MR title with "[RUN AS-IF-FOSS]" and start a new MR pipeline + - If you are making changes to any Startup CSS file, it is very likely that + **both** the CE and EE Startup CSS files will need to be updated. + - Changing any Startup CSS file will trigger the "as-if-foss" job to also run. + +HOW TO FIX: To fix this job, consider one of the following options: - 1. Regenerating locally with "yarn run generate:startup_css". - 2. Copy and apply the following diff: + 1. (Strongly recommended) Copy and apply the diff below: + 2. Regenerate locally with "yarn run generate:startup_css". + You may need to set "FOSS_ONLY=1" if you are trying to generate for CE. ----- start diff ----- $diff diff --git a/scripts/frontend/stylelint/stylelint-utility-classes.js b/scripts/frontend/stylelint/stylelint-utility-classes.js index 420fe82d826..14827145b54 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.js'); +const utilityClasses = require('./utility-classes-map'); const ruleName = 'stylelint-gitlab/utility-classes'; |