diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-28 12:08:19 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-28 12:08:19 +0300 |
commit | 79659fe1fe45f2bdd13cd1a3980fbf1714caad57 (patch) | |
tree | 6dc2d9e7a3543d5346337c5056331c70f736e950 /scripts/frontend | |
parent | 6047d21a899cba25dfb554cca1776fed689dc951 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/frontend')
-rwxr-xr-x | scripts/frontend/startup_css/startup_css_changed.sh | 19 |
1 files changed, 12 insertions, 7 deletions
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 |