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 |
||
---|---|---|
.. | ||
behaviors | ||
extensions | ||
admin.js.coffee | ||
application.js | ||
commits.js | ||
dashboard.js.coffee | ||
gfm_auto_complete.js.coffee | ||
issues.js | ||
main.js.coffee | ||
merge_requests.js.coffee | ||
milestones.js.coffee | ||
notes.js | ||
pager.js | ||
profile.js.coffee | ||
projects.js.coffee | ||
tree.js.coffee |