diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-11-23 15:16:37 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-11-23 15:16:37 +0000 |
| commit | dbf97574dc611309bd60eac292fec3f029f34348 (patch) | |
| tree | 5195f231bc31044a751eb4840a10038c0ef61051 /scripts | |
| parent | deda88f9422e67913d9e13557d386d8a9ad92e0a (diff) | |
| parent | d6fcdec52f795f59526c5908349e918d499da2b3 (diff) | |
| download | gitlab-ce-dbf97574dc611309bd60eac292fec3f029f34348.tar.gz | |
Merge branch '39887-move-identical-check-to-merged-branches' into 'master'
Move identical merged branch check to merged_branch_names
Closes #39887
See merge request gitlab-org/gitlab-ce!15464
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/prepare_build.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index 36bcf087cd9..ea406aadf39 100644 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -14,6 +14,7 @@ fi retry gem install knapsack cp config/gitlab.yml.example config/gitlab.yml +sed -i 's/bin_path: \/usr\/bin\/git/bin_path: \/usr\/local\/bin\/git/' config/gitlab.yml # Determine the database by looking at the job name. # For example, we'll get pg if the job is `rspec-pg 19 20` |