summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-07-11 11:06:02 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-07-11 11:06:02 +0000
commitc17b1d5f5651b6f73b8c999bb6a5376e31a7d30d (patch)
tree3a42c1c68ab4876943b2fadc3c32bfa423f51b89
parent655219e24a3043c19582808e02b20dd4feddb449 (diff)
parent6d22e1e83816e7fdb0aefd29b69fccca96d28b9c (diff)
downloadgitlab-ce-c17b1d5f5651b6f73b8c999bb6a5376e31a7d30d.tar.gz
Merge branch 'revert-d7bbafd8' into 'master'
Revert "Merge branch '34902-bump-knapsack-to-1-14-0' into 'master'" Closes #34942 See merge request !12783
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock5
-rw-r--r--scripts/prepare_build.sh5
3 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index 8693b63053a..233a50c6e47 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.14.0'
+ gem 'knapsack', '~> 1.11.0'
gem 'activerecord_sane_schema_dumper', '0.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2990bf72ad9..deaf3ded2f9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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)
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