diff options
| author | Hiroyuki Sato <sathiroyuki@gmail.com> | 2018-11-21 11:58:52 +0900 |
|---|---|---|
| committer | Hiroyuki Sato <sathiroyuki@gmail.com> | 2018-11-21 11:58:52 +0900 |
| commit | 692f87215df9c2a96c889a00fbb7cf8d459c3595 (patch) | |
| tree | 642e6a6dbc74b58cea5ffa8abddf6ee0ee422470 /scripts | |
| parent | b689b20f20f1a3773ba88cfb2f4d355d90389145 (diff) | |
| parent | 6a31259ccef5106126421ab5a93fd303a9326e4a (diff) | |
| download | gitlab-ce-692f87215df9c2a96c889a00fbb7cf8d459c3595.tar.gz | |
Merge remote-tracking branch 'origin/master' into fix-typos-occured
Conflicts:
- app/assets/javascripts/ide/stores/modules/pipelines/actions.js
- spec/javascripts/ide/stores/modules/pipelines/actions_spec.js
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build_assets_image | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/build_assets_image b/scripts/build_assets_image index 1d77524d503..4e5ef977161 100755 --- a/scripts/build_assets_image +++ b/scripts/build_assets_image @@ -1,5 +1,11 @@ #!/bin/bash +# Exit early if we don't want to build the image +if [[ "${BUILD_ASSETS_IMAGE}" != "true" ]] +then + exit 0 +fi + # Generate the image name based on the project this is being run in ASSETS_IMAGE_NAME=$(echo ${CI_PROJECT_NAME} | awk '{ |