Merge branch 'load-knapsack-if-defined' into 'master'
Load knapsack in Rakefile only when is bundled Fixes `production` builds: https://dev.gitlab.org/gitlab/omnibus-gitlab/builds/85407 cc @marin See merge request !4514
Showing
... | @@ -308,6 +308,7 @@ group :development, :test do | ... | @@ -308,6 +308,7 @@ group :development, :test do |
gem 'benchmark-ips', require: false | gem 'benchmark-ips', require: false | ||
gem "license_finder", require: false | gem "license_finder", require: false | ||
gem 'knapsack' | |||
end | end | ||
group :test do | group :test do | ||
... | @@ -316,7 +317,6 @@ group :test do | ... | @@ -316,7 +317,6 @@ group :test do |
gem 'webmock', '~> 1.21.0' | gem 'webmock', '~> 1.21.0' | ||
gem 'test_after_commit', '~> 0.4.2' | gem 'test_after_commit', '~> 0.4.2' | ||
gem 'sham_rack' | gem 'sham_rack' | ||
gem 'knapsack' | |||
end | end | ||
group :production do | group :production do | ||
... | ... |
Please register or sign in to comment