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 |
||
---|---|---|
.. | ||
commits.scss | ||
editor.scss | ||
events.scss | ||
graph.scss | ||
header.scss | ||
issues.scss | ||
login.scss | ||
merge_requests.scss | ||
nav.scss | ||
notes.scss | ||
profile.scss | ||
projects.scss | ||
snippets.scss | ||
themes.scss | ||
tree.scss | ||
votes.scss |