Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork

Conflicts:
	app/views/projects/commit/show.html.haml
	app/views/projects/compare/show.html.haml
	app/views/projects/merge_requests/branch_from.js.haml
Remove ugly button and truncate too long project names. Remove unecessary newlines
Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork
Merge branch 'master' into karlhungus-mr-on-fork

Conflicts:
	app/contexts/filter_context.rb
	app/contexts/search_context.rb
	app/models/merge_request.rb
	app/models/note.rb
	app/views/shared/_merge_requests.html.haml
	spec/controllers/commit_controller_spec.rb
	spec/services/notification_service_spec.rb
reset db schema
Fix unmerged diff for non-fork MR
Update chosen, improve ui, fix MR fork tests
fix chosen ui. fixed network tests
Clarify documentation on how to add custom Omniauth provider to GitLab
Merge pull request #4664 from tdm00/clarify-adding-custom-oauth-provider

Clarify documentation on how to add custom Omniauth provider to GitLab
Fix filter context. Dont duplicate target project name for MR
Revert notification specs
Merge branch 'karlhungus-mr-on-fork' of /home/git/repositories/gitlab/gitlabhq
Compact list for commits page
Merge branch 'master' of github.com:gitlabhq/gitlabhq
update devise to 2.2.5
Create a wiki when wiki_enabled:true

Change-Id: I7588f71572bcb878a24decf16a6ffb134890b0ac