From f6870c1c4d315654486d88195be63be79a2e7d34 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Mon, 12 Sep 2016 10:48:46 +0200 Subject: [PATCH] Require installed optional groups with Bundler --- Changelog.md | 4 ++++ config/application.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 9a162a2a4..b836d1c97 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,7 @@ +# 0.6.0.1 + +Fixes an issue with installing an running diaspora\*, caused by a recent bundler update that fixes a bundler bug on which we depended on. + # 0.6.0.0 ## Warning: This release contains long migrations diff --git a/config/application.rb b/config/application.rb index 6ef69fdb5..ca30da275 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,7 +1,7 @@ require_relative 'boot' require 'rails/all' -Bundler.require(:default, Rails.env) +Bundler.require(:default, *Bundler.settings.with, Rails.env) # Do not dump the limit of boolean fields on MySQL, # since that generates a db/schema.rb that's incompatible