GitLab

Merge branch '761-aspect-name-double-escaped-in-page-title' of https://github.com/Dorian/diaspora into dorian

Merge branch '756-status-not-formatted-in-photo-page' of https://github.com/Dorian/diaspora into dorian

notifications now properly socket (not a hack through comments like before).  notification badge updates on new messages.

Methods to generate jasmine fixtures in controller specs, and methods to load those fixtures in jasmine specs.

Remove callback to decrementRequestCounter in aspect-edit.js, since we don't have a request counter on that page anymore. The callback was failing, so the ajax request was never officially completing. Cucumber hates that.
I am going to add jasmine fixture generation in the controller specs, so that next time, a jasmine test will fail in this situation.
Also: clean up manages_aspects.feature.

Merge branch '760-XSS-with-person-name' of https://github.com/Dorian/diaspora into Dorian-760-XSS-with-person-name

This reverts commit 0da4466d.