diaspora/diaspora — pull request #5160 by khall (2014-08-25 22:36:23+00:00)
Title: Issue 5149

https://github.com/diaspora/diaspora/issues/5149

Everything passes except for one test at spec/models/status_message_spec.rb line 56. This test passes when just this file is run, but when all the specs are run it regularly fails (but I've also seen it pass). Perhaps a more seasoned diaspora developer will have a better clue about what is going on.

Please note when merging this that I accidentally deleted and then re-added database.yml.example and diaspora.yml.example, so don't merge those files in or the history will be lost.