080924f979
Fix bug where notes weren’t shown in discussion when the code had changed after creation
2016-08-19 12:38:40 -05:00
4a13aa9f34
Store discussion_id on Note for faster discussion lookup.
2016-08-17 12:16:46 -05:00
41007f6d3c
Address review feedback
2016-08-16 11:04:26 -05:00
f48642e260
Add specs for Discussion and MergeRequest models
2016-08-12 15:49:36 -05:00
538e66d71c
Merge branch 'master' into diff-line-comment-vuejs
...
# Conflicts:
# app/models/discussion.rb
# db/schema.rb
2016-08-03 15:32:00 -07:00
8716ff7f63
Speedup DiffNote#active? on discussions, preloading noteables and avoid touching git repository to return diff_refs when possible
...
- Preloading noteable we share the same noteable instance when more than one
discussion refers to the same noteable.
- Any other call to that object that is cached in that object will be for any
discussion.
- In those cases where merge_request_diff has all the sha stored to build a diff_refs get that
diff_refs using directly those sha instead accessing to the git repository to first get the
commits and later the sha.
2016-08-02 16:04:15 +02:00
d9a949c17c
Use correct user for 'Discussion resolved by...'
2016-07-28 21:14:45 -06:00
b53ccd112d
Fixed close merge request not hiding
2016-07-27 10:17:05 +01:00
c6d96fdfbc
Fix Discussion#resolved? to be false for commit discussions
2016-07-26 16:48:33 -06:00
b3180d3486
Add resolved and last updated status to collapsed discussions
2016-07-25 22:49:21 -06:00
d76d051b22
Collapse/hide resolved discussions
2016-07-25 22:46:13 -06:00
ed6c8238f3
Add access checks for diff note and discussion resolution
2016-07-25 22:40:44 -06:00
bbab5d014f
Add methods to resolve diff notes and discussions
2016-07-25 22:37:22 -06:00
c9aee48ced
Add resolved methods on Discussion
2016-07-25 22:36:03 -06:00
79214be727
Add Discussion model to represent MR/diff discussion
2016-07-20 16:18:18 -06:00
Douwe Maan