GitLab

login page when a site is in private mode

login page when a site is in private mode

Conflicts:
	plugins/OStatus/OStatusPlugin.php

URL and license image URL) when selecting private or allrightsreserved
licenses.

Workaround for #2485: in profile output on feeds, fall back to the Twitter 73x73 avatar instead of going straight to the 96x96 default image on twitter-import profiles.

Fix for #2227: 'view profile designs' and other default-on options are initially mis-set to off due to caching at account creation

Fix for #2419: There is no function maxDescription in Oauth_application class (broke the 'description too long' error message when editing oauth app registrations)

Clean up notice spew from accessing member variables of null when opening the add/edit oauth application form

Bump up HTTP timeout for OStatus remote-tests.php to 60 seconds; when running without queues and with only bcmath, salmon key generation is absurdly slow.

Ticket #2327: fixing block to remove the blocking user's subscription to the blockee if present; also cleaning up inbox delivery to apply the block checks more consistently, instead of just to group posts.