Merge branch 'next-minor' into develop

.travis.yml

@@ -23,7 +23,7 @@ branches:
     - 'develop'
 
 before_install:
-  - gem install bundler --version 1.12.5
+  - gem install bundler
   - mkdir travis-phantomjs
   - wget http://cifiles.diasporafoundation.org/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
   - tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs

Changelog.md

@@ -40,6 +40,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

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

script/ci/build.sh

@@ -8,6 +8,6 @@ if [ "$DB" = "mysql" ]; then
   sed -i 's/*common/*mysql/' config/database.yml
 fi
 
-command="bundle _1.12.5_ exec rake --trace ci:travis:${BUILD_TYPE}"
+command="bundle exec rake --trace ci:travis:${BUILD_TYPE}"
 
 exec xvfb-run --auto-servernum --server-num=1 --server-args="-screen 0 1280x1024x8" $command