Commit bc9cf77e authored by Dennis Schubert's avatar Dennis Schubert

Merge branch 'master' into next-minor

parents 327cabe6 55219372
......@@ -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
......
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment