diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-09 15:08:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-09 15:08:56 +0300 |
| commit | fcda041fc06e7bad3e4f5b5cff921f91c7eba717 (patch) | |
| tree | a7e935192b9f846fa9257daf85a1642fbaa0f01a /scripts | |
| parent | c3b45354d720654215eb0e7b8e718ba6ea2d7a96 (diff) | |
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 d2cc16f4f8b..4991e8eae45 100644 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -11,7 +11,7 @@ if [ "$USE_BUNDLE_INSTALL" != "false" ]; then # When we test multiple versions of PG in the same pipeline, we have a single `setup-test-env` # job but the `pg` gem needs to be rebuilt since it includes extensions (https://guides.rubygems.org/gems-with-extensions). # Uncomment the following line if multiple versions of PG are tested in the same pipeline. - # run_timed_command "bundle pristine pg" + run_timed_command "bundle pristine pg" fi # Only install knapsack after bundle install! Otherwise oddly some native |