diff options
| author | Marin Jankovski <marin@gitlab.com> | 2018-12-31 10:07:10 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-01-10 14:16:09 -0800 |
| commit | a01a29e09158647967bd808406c32bdec0114f7a (patch) | |
| tree | b4cc05116fa8abf690ef0bbb82a26e6034718d4f | |
| parent | b8ec11a6a15952a9a1851fba2bd7890e572e5a6f (diff) | |
| download | gitlab-ce-a01a29e09158647967bd808406c32bdec0114f7a.tar.gz | |
Merge branch 'fix-prepare-build-script' into 'master'
Stop using deprecated argument to `gem`
See merge request gitlab-org/gitlab-ce!24079
| -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 75a3cea0448..d2b0b80061a 100644 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -11,7 +11,7 @@ fi # Only install knapsack after bundle install! Otherwise oddly some native # gems could not be found under some circumstance. No idea why, hours wasted. -retry gem install knapsack --no-ri --no-rdoc +retry gem install knapsack --no-document 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 |