closes #7061

also remove some unnecessary Timecop.return

closes #7060

Also remove confirm_email_token when unconfirmed_email is removed.

Fixes #7048

closes #7051

closes #7043

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>

closes #7029

Fixes #6999

closes #7036

I got feedback from many users, that they don't understand how the "my
activity" stream is sorted, because they have posts on the top, but
don't see why. The user doesn't see if a like was added, and it is also
not imported for the user to see the post again then. And we have
notifications if someone likes a users own posts, so no need to move it on
top of the "my activity" stream here too.

closes #7030

Related issue: https://github.com/twbs/bootstrap/issues/15958

closes #7055

closes #7050

See http://guides.rubyonrails.org/security.html#cross-site-request-forgery-csrf

closes #7042

closes #7040

closes #7045

closes #7041

closes #7053

closes #7049

closes #7056

closes #7054

related to #7032

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>

closes #7038

The same as #7009 but now all of them ;)

Fix regressions from #6998

bump diaspora_federation