From 6d22e1e83816e7fdb0aefd29b69fccca96d28b9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Tue, 11 Jul 2017 10:59:16 +0000 Subject: Revert "Merge branch '34902-bump-knapsack-to-1-14-0' into 'master'" This reverts merge request !12753 --- scripts/prepare_build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index 6d6a867764a..68114d149c4 100644 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -8,10 +8,9 @@ if [ "$USE_BUNDLE_INSTALL" != "false" ]; then bundle install --clean $BUNDLE_INSTALL_FLAGS && bundle check fi -# Only install fog-aws/mime-types after bundle install! Otherwise oddly some native +# Only install knapsack after bundle install! Otherwise oddly some native # gems could not be found under some circumstance. No idea why, hours wasted. -# TODO: remove workaround on !10156 -retry gem install fog-aws mime-types +retry gem install knapsack fog-aws mime-types cp config/gitlab.yml.example config/gitlab.yml -- cgit v1.2.1