summaryrefslogtreecommitdiff
path: root/scripts/prepare_build.sh
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-07-11 10:59:16 +0000
committerRémy Coutable <remy@rymai.me>2017-07-11 10:59:16 +0000
commit6d22e1e83816e7fdb0aefd29b69fccca96d28b9c (patch)
tree65563475afedee9d8e2e9cb84fdf0236c00bd86a /scripts/prepare_build.sh
parentc9e3c3fdd6592d3bb975629b887d92e8b2f9a455 (diff)
downloadgitlab-ce-6d22e1e83816e7fdb0aefd29b69fccca96d28b9c.tar.gz
Revert "Merge branch '34902-bump-knapsack-to-1-14-0' into 'master'"
This reverts merge request !12753
Diffstat (limited to 'scripts/prepare_build.sh')
-rw-r--r--scripts/prepare_build.sh5
1 files changed, 2 insertions, 3 deletions
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