diff options
| author | Takuya Noguchi <tak.noguchi.iridge@gmail.com> | 2017-07-10 23:48:27 +0900 |
|---|---|---|
| committer | Takuya Noguchi <tak.noguchi.iridge@gmail.com> | 2017-07-11 06:02:28 +0900 |
| commit | 3f52ea5bd17cc829edc5615b5e84f62f2f130053 (patch) | |
| tree | 321afff0fb8fa12110263777a450aed5d80232e6 | |
| parent | 420f6b5474e49e17226415250846e48fe514fe0d (diff) | |
| download | gitlab-ce-3f52ea5bd17cc829edc5615b5e84f62f2f130053.tar.gz | |
Bump knapsack to 1.14.0
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 5 | ||||
| -rw-r--r-- | scripts/prepare_build.sh | 5 |
3 files changed, 6 insertions, 6 deletions
@@ -345,7 +345,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 f356024506c..d72e779bdd5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -424,9 +424,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) @@ -1006,7 +1005,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 03de59f27ad..9edea404461 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/resque.yml.example config/resque.yml sed -i 's/localhost/redis/g' config/resque.yml |