Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42

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';