Update database.yml.example with same username and password for both supported databases.
 Merge branch 'update_database_template' into 'master'

Update Database Example files

Both example files should have database user `gitlab_ci` as noted in the installation document.
Explain that ref name is the branch.
 Merge branch 'explain-ref-name' into 'master'

Explain Ref Name
Add more entries to CHANGELOG
Update rails

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ci

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
Added a splash of unicorn
Added the new init.d script
Removed all puma references
Deleted a file that was accidentally pushed
Added changelog entry