diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-04-28 18:05:39 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-04-28 18:05:39 +0000 |
| commit | fe57708e6a0f2b09d95e61130310c826b3437524 (patch) | |
| tree | 10a92f29574ecd4082d1cae75e5293749aad60ee /scripts | |
| parent | 2952a447794e492122820b5a0eb54f75b83a2abd (diff) | |
| download | gitlab-ce-fe57708e6a0f2b09d95e61130310c826b3437524.tar.gz | |
Resolve "rspec_profiling is enabled for MySQL"
Diffstat (limited to 'scripts')
| -rw-r--r--[-rwxr-xr-x] | scripts/prepare_build.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index fd173c0ba88..c727a0e2d88 100755..100644 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -1,5 +1,3 @@ -#!/bin/sh - . scripts/utils.sh export SETUP_DB=${SETUP_DB:-true} @@ -32,7 +30,7 @@ sed -i 's/localhost/redis/g' config/resque.yml cp config/gitlab.yml.example config/gitlab.yml if [ "$USE_BUNDLE_INSTALL" != "false" ]; then - retry bundle install --clean $BUNDLE_INSTALL_FLAGS && bundle check + bundle install --clean $BUNDLE_INSTALL_FLAGS && bundle check fi # Only install knapsack after bundle install! Otherwise oddly some native |