Commit 6d22e1e8 authored by Rémy Coutable's avatar Rémy Coutable

Revert "Merge branch '34902-bump-knapsack-to-1-14-0' into 'master'"

This reverts merge request !12753
parent c9e3c3fd
Pipeline #9760105 failed with stages
in 19 minutes and 33 seconds
......@@ -344,7 +344,7 @@ group :development, :test do
gem 'benchmark-ips', '~> 2.3.0', require: false
gem 'license_finder', '~> 2.1.0', require: false
gem 'knapsack', '~> 1.14.0'
gem 'knapsack', '~> 1.11.0'
gem 'activerecord_sane_schema_dumper', '0.2'
......
......@@ -422,8 +422,9 @@ GEM
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.10.0)
knapsack (1.14.0)
knapsack (1.11.0)
rake
timecop (>= 0.1.0)
kubeclient (2.2.0)
http (= 0.9.8)
recursive-open-struct (= 1.0.0)
......@@ -1001,7 +1002,7 @@ DEPENDENCIES
json-schema (~> 2.6.2)
jwt (~> 1.5.6)
kaminari (~> 0.17.0)
knapsack (~> 1.14.0)
knapsack (~> 1.11.0)
kubeclient (~> 2.2.0)
letter_opener_web (~> 1.3.0)
license_finder (~> 2.1.0)
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment