• Riyad Preukschas's avatar
    Merge branch 'master' into discussions · db2c1536
    Riyad Preukschas authored
    Conflicts:
    	app/assets/stylesheets/main.scss
    	app/models/project.rb
    	app/views/notes/_common_form.html.haml
    	app/views/notes/_per_line_form.html.haml
    	lib/gitlab/markdown.rb
    	spec/models/note_spec.rb
    db2c1536
note.rb 3.9 KB