delta/gitlab/gitlab-ce.git/app/models/diff_note.rb, branch fix/serialized-commit-path gitlab.com: gitlab-org/gitlab-ce.git Optimize discussion notes resolving and unresolving 2016-09-06T15:14:09+00:00 Alejandro Rodríguez alejorro70@gmail.com 2016-09-02T20:29:47+00:00 ea155ccc3edd071a0ca5adfd774513892b19ab6f Use `update_all` to only require one query per discussion to update the notes resolved status. Some changes had to be made to the discussion spec to accout for the fact that notes are not individually updated now 
Use `update_all` to only require one query per discussion to
update the notes resolved status. Some changes had to be made to
the discussion spec to accout for the fact that notes are not
individually updated now
Move #to_discussion to NoteOnDiff 2016-08-30T15:30:42+00:00 Sean McGivern sean@gitlab.com 2016-08-30T15:30:42+00:00 9b57ad382e69044eb851f64cc0eb35896baa712a 






Call `set_discussion_id` again in DiffNote `before_validation` because the order is important
2016-08-19T23:24:12+00:00

Douwe Maan
douwe@selenight.nl

2016-08-19T22:22:59+00:00

d741303a5992b0d259a125baa62b66ca4df209da












Fix bug where notes weren’t shown in discussion when the code had changed after creation
2016-08-19T17:38:40+00:00

Douwe Maan
douwe@selenight.nl

2016-08-19T17:38:40+00:00

080924f979df39ad96eb1ab4a029d032bcba6e86












Improve performance of MR show page
2016-08-19T00:08:59+00:00

Douwe Maan
douwe@selenight.nl

2016-08-18T23:27:22+00:00

6a355d451eaca2fc10f5fcf31de13b05fa795b9b












Fix a lingering conflict.
2016-08-17T18:29:05+00:00

Connor Shea
connor.james.shea@gmail.com

2016-08-17T18:29:05+00:00

2df34c20cb3d0346f5bb53b995d41a8c36ad71cb












Merge branch 'master' into diff-line-comment-vuejs
2016-08-17T18:10:09+00:00

Connor Shea
connor.james.shea@gmail.com

2016-08-17T18:10:09+00:00

d8654744cd6c8fa4cbe4617c2428cd79d4bd5179












Store discussion_id on Note for faster discussion lookup.
2016-08-17T17:16:46+00:00

Douwe Maan
douwe@selenight.nl

2016-08-17T17:14:44+00:00

4a13aa9f34ab4114bc485e1ca8fa0db8daa0394b












Address review feedback
2016-08-16T16:04:26+00:00

Douwe Maan
douwe@selenight.nl

2016-08-15T23:45:23+00:00

41007f6d3c30a294bbf361ff900b3b19bb463291












Don't allow resolving invalid conflicts
2016-08-12T20:24:48+00:00

Sean McGivern
sean@gitlab.com

2016-08-04T09:31:44+00:00

427e724698185169536d68e95873415038286849

An MR can only be resolved in the UI if:
- It has conflicts.
- It has valid diff_refs (in other words, it supports new diff notes).
- It has no conflicts with one side missing.
- It has no conflicts in binary files.
- It has no conflicts in files too large to display.
- It has no conflicts containing invalid conflict markers.





An MR can only be resolved in the UI if:
- It has conflicts.
- It has valid diff_refs (in other words, it supports new diff notes).
- It has no conflicts with one side missing.
- It has no conflicts in binary files.
- It has no conflicts in files too large to display.
- It has no conflicts containing invalid conflict markers.