Merge branch 'master' into next-minor

diaspora · Sep 19, 2016 · bc9cf77 · bc9cf77
2 parents 327cabe + 5521937
commit bc9cf77
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Changelog.md b/Changelog.md
@@ -32,6 +32,10 @@
 * Add support for setting BOSH access protocol via chat configuration [#7100](https://github.com/diaspora/diaspora/pull/7100)
 * Add number of unreviewed reports to admin dashboard and admin sidebar [#7109](https://github.com/diaspora/diaspora/pull/7109)
 
+# 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
@@ -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