nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into next-minor

Browse source
This commit is contained in:
Dennis Schubert 2016-09-20 01:46:45 +02:00
commit bc9cf77e8d
No known key found for this signature in database
GPG key ID: 5A0304BEA7966D7E
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Changelog.md
View file

@ -32,6 +32,10 @@
* Add support for setting BOSH access protocol via chat configuration [#7100](https://github.com/diaspora/diaspora/pull/7100) * 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) * 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 # 0.6.0.0
## Warning: This release contains long migrations ## Warning: This release contains long migrations

2
config/application.rb
View file

@ -1,7 +1,7 @@
require_relative 'boot' require_relative 'boot'
require 'rails/all' 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, # Do not dump the limit of boolean fields on MySQL,
# since that generates a db/schema.rb that's incompatible # since that generates a db/schema.rb that's incompatible