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
new animated-screenshots

- half size: 1465 KB -> 641KB
- mutch better quality
- no MakeAGIF.com branding
- HTTPS link (via github gist) so there is no github-camo proxy needed (camo makes this image loading 0.55s slower in my short test)
- all source-files are available here: https://gist.github.com/fnkr/2f9badd56bfe0ed04ee7
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
improve MergeRequest edit page
Mention Merge requests on forks in changelog
Fix assign-to-me buttton
Remove unecessary paddding at Branches#recent page
Fix form mr issue with ci
quickfix