GitLab

Fix overflow button in mobile reset password

Change 'unless' to 'if' again because 'unless' is wrong here.

Also, add some specs and add it to the changelog.

This reverts commit b0fc9576, reversing
changes made to 0057e9ed.

Change 'unless' to 'if' because 'unless' is wrong here. [ci skip]

+ updated changelog

Conflicts:
	spec/lib/diaspora/fetcher/public_spec.rb

rake tasks cleanup

Refactor script/server and associated stuff

Remove Alpha logo from branding [ci skip]

simplify link regex and fix #3553

Privatize some controller methods

Fix show post Community Spotlight on stream [ci skip]

Refactor MessagesController

merge pull request #3656

Conflicts:
	Changelog.md (resolved)

adds password_confirmation field to registration page