Merge branch 'unicorn-app-dir-fix' of https://github.com/mikew/gitlabhq into mikew-unicorn-app-dir-fix

Conflicts:
	config/unicorn.rb.example

Constants in Events looks good now

Some fix for gitlab:gitlab_shell:check

Fixing issue #2970

Update lib/tasks/sidekiq.rake

API: Fixes return code when accessing non existent branch (#2922)

Merge branch 'easy-to-find-commit-on-network-graph' of https://github.com/hiroponz/gitlabhq into hiroponz-easy-to-find-commit-on-network-graph

Disable autocomplete for admin/users form

Mac OS uses launchd instead of /etc/init.d to start daemons and tasks to be started by launchd MUST NOT daemon itself. So "nohup" here won't work for Mac OS. 

Can we add a "launchd" task to the rake file so that we can start sidekiq as "bundle exec rake sidekiq:launchd" ?

Gitlab incorrectly routes blobs to the compare controller depending on filename.

Merge branch 'fix-db-after-updating-rails' of https://github.com/Undev/gitlabhq into Undev-fix-db-after-updating-rails