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 |
||
---|---|---|
.. | ||
backend | ||
graph | ||
satellite | ||
app_logger.rb | ||
auth.rb | ||
git_logger.rb | ||
git_stats.rb | ||
inline_diff.rb | ||
logger.rb | ||
markdown.rb | ||
project_mover.rb | ||
regex.rb | ||
seeder.rb | ||
theme.rb |