diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-18 18:06:14 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-18 18:06:14 +0000 |
| commit | b08279013423a66f06f5edde4e067f328fe135bd (patch) | |
| tree | 47aca1a9b0655cd7861bddf31ec17d4b302fc4ea /scripts | |
| parent | 4584eb0e07d372d6014de16ab359965475184c99 (diff) | |
| download | gitlab-ce-b08279013423a66f06f5edde4e067f328fe135bd.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build_assets_image | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/build_assets_image b/scripts/build_assets_image index aff6cb24a1b..6354c2df798 100755 --- a/scripts/build_assets_image +++ b/scripts/build_assets_image @@ -8,7 +8,8 @@ fi # Generate the image name based on the project this is being run in ASSETS_IMAGE_NAME="gitlab-assets-ce" -if [[ "${CI_PROJECT_NAME}" == "gitlab" ]] +# `dev.gitlab-org` still has gitlab-ee. +if [[ "${CI_PROJECT_NAME}" == "gitlab" ]] || [[ "${CI_PROJECT_NAME}" == "gitlab-ee" ]] then ASSETS_IMAGE_NAME="gitlab-assets-ee" fi |