Conflicts:
	app/assets/stylesheets/sections/notes.scss
	app/contexts/notes/load_context.rb
	app/models/project.rb
	app/observers/note_observer.rb
	app/roles/votes.rb
	app/views/commit/show.html.haml
	app/views/merge_requests/_show.html.haml
	app/views/merge_requests/diffs.js.haml
	app/views/merge_requests/show.js.haml
	app/views/notes/_note.html.haml
	features/steps/project/project_merge_requests.rb
	spec/models/note_spec.rb

Reload activities/events on the dashboard page via ajax

Update .gitignore

Most yml files are ignored in gitlab/config/, except resque.yml
=> add it to the list of ignored files.

Fixing request.fullpath URL encoding

fix exemple js data in help/web_hook

Fixes #2475

Fixes #2496