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

Bump knapsack to 1.14.0

Closes #34902

See merge request !12753

3 files changed, 6 insertions, 6 deletions

diff --git a/Gemfile b/Gemfile
index 233a50c6e47..8693b63053a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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.11.0'
+  gem 'knapsack', '~> 1.14.0'
 
   gem 'activerecord_sane_schema_dumper', '0.2'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index deaf3ded2f9..2990bf72ad9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -422,9 +422,8 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.10.0)
-    knapsack (1.11.0)
+    knapsack (1.14.0)
       rake
-      timecop (>= 0.1.0)
     kubeclient (2.2.0)
       http (= 0.9.8)
       recursive-open-struct (= 1.0.0)
@@ -1002,7 +1001,7 @@ DEPENDENCIES
   json-schema (~> 2.6.2)
   jwt (~> 1.5.6)
   kaminari (~> 0.17.0)
-  knapsack (~> 1.11.0)
+  knapsack (~> 1.14.0)
   kubeclient (~> 2.2.0)
   letter_opener_web (~> 1.3.0)
   license_finder (~> 2.1.0)
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