3022786948
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 |
||
---|---|---|
.. | ||
_clone_panel.html.haml | ||
_form.html.haml | ||
_new_form.html.haml | ||
_project_head.html.haml | ||
create.js.haml | ||
edit.html.haml | ||
empty.html.haml | ||
files.html.haml | ||
graph.html.haml | ||
new.html.haml | ||
show.html.haml | ||
show.js.haml | ||
tree.js.haml | ||
update.js.haml | ||
update_failed.js.haml | ||
wall.html.haml |