diff options
| author | Marin Jankovski <marin@gitlab.com> | 2018-12-31 10:07:10 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2018-12-31 10:07:10 +0000 |
| commit | a352a95e9a4e6e925e43e1b0a3dc2cac6d33cef4 (patch) | |
| tree | 7b51d10ea34fafed45a1a3053f38dd6ff6ba2a77 /scripts | |
| parent | 102c1870cf134d3532b9ec3320096f8180a38412 (diff) | |
| parent | 1854f142e201af4c6640b98b33b1e4992795b7bc (diff) | |
| download | gitlab-ce-a352a95e9a4e6e925e43e1b0a3dc2cac6d33cef4.tar.gz | |
Merge branch 'fix-prepare-build-script' into 'master'
Stop using deprecated argument to `gem`
See merge request gitlab-org/gitlab-ce!24079
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 d85c53090a4..58b74f2f07d 100644 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -10,7 +10,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 |