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 |
||
---|---|---|
.. | ||
_commit.html.haml | ||
_commit_box.html.haml | ||
_commits.html.haml | ||
_diff_head.html.haml | ||
_diffs.html.haml | ||
_head.html.haml | ||
_text_diff.html.haml | ||
show.atom.builder | ||
show.html.haml | ||
show.js.haml |