Merge branch 'extend_user_api' of https://github.com/bladealslayer/gitlabhq into bladealslayer-extend_user_api

Conflicts:
	spec/requests/api/users_spec.rb

Update config/database.yml.postgresql

Fix bug of network graph(#2847) and trivial code clean up.

Expose MergeRequest object as a notable in the API to allow for easy ret...

Displaying commit on a new window, when clicking commit on network graph.

Improve overlap of lines in network graph

Switchable the main branch on network graph

Fixed a grammar mistake in alert-message.block-message

Fix #2790