diff options
| author | Takuya Noguchi <tak.noguchi.iridge@gmail.com> | 2017-07-10 23:48:27 +0900 |
|---|---|---|
| committer | Takuya Noguchi <tak.noguchi.iridge@gmail.com> | 2017-07-11 06:02:28 +0900 |
| commit | 3f52ea5bd17cc829edc5615b5e84f62f2f130053 (patch) | |
| tree | 321afff0fb8fa12110263777a450aed5d80232e6 /scripts | |
| parent | 420f6b5474e49e17226415250846e48fe514fe0d (diff) | |
| download | gitlab-ce-3f52ea5bd17cc829edc5615b5e84f62f2f130053.tar.gz | |
Bump knapsack to 1.14.0
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/prepare_build.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index 03de59f27ad..9edea404461 100644 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -8,9 +8,10 @@ if [ "$USE_BUNDLE_INSTALL" != "false" ]; then bundle install --clean $BUNDLE_INSTALL_FLAGS && bundle check fi -# Only install knapsack after bundle install! Otherwise oddly some native +# Only install fog-aws/mime-types after bundle install! Otherwise oddly some native # gems could not be found under some circumstance. No idea why, hours wasted. -retry gem install knapsack fog-aws mime-types +# TODO: remove workaround on !10156 +retry gem install fog-aws mime-types cp config/resque.yml.example config/resque.yml sed -i 's/localhost/redis/g' config/resque.yml |