diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-07-11 08:21:20 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-07-11 08:21:20 +0000 |
| commit | d7bbafd8970f89bbdd30fa219b3901c3eae4331c (patch) | |
| tree | ac5dbd3781260ab7a173b493b620eebdb317e4ea /scripts | |
| parent | e3af15710f7e30ba60cdc05eae38d277b8de4938 (diff) | |
| parent | 3f52ea5bd17cc829edc5615b5e84f62f2f130053 (diff) | |
| download | gitlab-ce-d7bbafd8970f89bbdd30fa219b3901c3eae4331c.tar.gz | |
Merge branch '34902-bump-knapsack-to-1-14-0' into 'master'
Bump knapsack to 1.14.0
Closes #34902
See merge request !12753
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 68114d149c4..6d6a867764a 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/gitlab.yml.example config/gitlab.yml |