• Riyad Preukschas's avatar
    Merge commit 'master' into discussions · 30227869
    Riyad Preukschas authored
    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
    30227869
markdown.rb 5.99 KB