diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-05-21 11:03:17 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-05-21 11:03:17 +0000 |
commit | 3834040aa8a9415864c07c8edb86ebb290e08b01 (patch) | |
tree | c5cc3725ae53d577317ca0a0ead036029aa56fee /scripts | |
parent | d7b3eb3de43e1c12fc8475adf966577f469a1adf (diff) | |
parent | bc57a62a5c8c4c1e08cdf5c4a1656357d885026d (diff) | |
download | gitlab-ce-3834040aa8a9415864c07c8edb86ebb290e08b01.tar.gz |
Merge branch 'rc/improve-single-script-jobs-ci-config' into 'master'
Improve the single-script jobs CI config
See merge request gitlab-org/gitlab-ce!19040
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 d8bcc9f8191..75a3cea0448 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 +retry gem install knapsack --no-ri --no-rdoc 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 |