Updating documentation to reflect #3836 (resolving #4443)
move 'make config/database.yml readable to git only' instruction

I've moved the instruction in question to the the 
'Configure GitLab DB settings'. Can't change permission to a file that doesn't already exist :wink:
Merge pull request #4482 from kivlor/patch-1

move 'make config/database.yml readable to git only' instruction
Add 'services' to path blacklist, fixes #4470
Fix misspelling in social accounts tip
Merge pull request #4488 from dekimsey/patch-1

Fix misspelling in social accounts tip
Merge pull request #4484 from Razer6/add_services_to_blacklist

Add 'services' to path blacklist
Add cluster mode instructions to puma.rb.example
Merge branch 'puma_cluster_recommendation' of /home/git/repositories/gitlab/gitlabhq
Merge pull request #4476 from tstone2077/master

Updating documentation to reflect #3836 (resolving #4443)
Added client list to API doc
Merge pull request #4505 from m4tthumphrey/patch-1

Added client list to API doc
Rename support forum to mailing list to prevent duplication on community page of GitLab.org.
minor contributing guide updates

* issues & pr in English
* appropriate language
* typo & format fix
* not catch all pull request
* update changelog
Merge pull request #4509 from bbodenmiller/cont-updates

minor contributing guide updates
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Merge branch 'rename-support-forum-to-mailing-list' of /home/git/repositories/gitlab/gitlabhq
Add suppoort of unicorn and fog gems
Merge branch 'master' into 6-0-dev

Conflicts:
	Gemfile
	Gemfile.lock
Milestone page: reduce truncate length to prevent issue title overflow