diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-16 15:09:38 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-16 15:09:38 +0000 |
| commit | 2d8454515e7b631a8f39a6415c86154d6c62841c (patch) | |
| tree | d3d5fac01f23a735226cf20a4073e2cb611664d3 /scripts | |
| parent | 9d67bc14cb59a27c9877474e77d155173a1dedff (diff) | |
| download | gitlab-ce-2d8454515e7b631a8f39a6415c86154d6c62841c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/prepare_build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index a5f8c8b678e..1243609dc24 100644 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -2,7 +2,7 @@ export SETUP_DB=${SETUP_DB:-true} export USE_BUNDLE_INSTALL=${USE_BUNDLE_INSTALL:-true} -export BUNDLE_INSTALL_FLAGS="--without=production --without=development --jobs=$(nproc) --path=vendor --retry=3 --quiet" +export BUNDLE_INSTALL_FLAGS=${BUNDLE_INSTALL_FLAGS:-"--without=production --without=development --jobs=$(nproc) --path=vendor --retry=3 --quiet"} if [ "$USE_BUNDLE_INSTALL" != "false" ]; then bundle --version |