| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Optimize discussion notes resolving and unresolving21109-discussion-resolve-runs-a-single-update-query-per-note-but-should-run-a-single-update-query-for-all-notes-instead | Alejandro Rodríguez | 2016-09-06 | 1 | -0/+18 |
| | | | | | | | | 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 NoteOnDiff21211-comment-on-diff-partially-broken-after-updating-to-8-11 | Sean McGivern | 2016-08-30 | 1 | -4/+0 |
| | | |||||
| * | Call `set_discussion_id` again in DiffNote `before_validation` because the ↵ | Douwe Maan | 2016-08-19 | 1 | -0/+3 |
| | | | | | order is important | ||||
| * | Fix bug where notes weren’t shown in discussion when the code had changed ↵ | Douwe Maan | 2016-08-19 | 1 | -0/+4 |
| | | | | | after creation | ||||
| * | Improve performance of MR show page | Douwe Maan | 2016-08-18 | 1 | -2/+0 |
| | | |||||
| * | Fix a lingering conflict. | Connor Shea | 2016-08-17 | 1 | -5/+1 |
| | | |||||
| * | Merge branch 'master' into diff-line-comment-vuejs | Connor Shea | 2016-08-17 | 1 | -0/+4 |
| |\ | |||||
| | * | Don't allow resolving invalid conflicts | Sean McGivern | 2016-08-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | Store discussion_id on Note for faster discussion lookup. | Douwe Maan | 2016-08-17 | 1 | -14/+23 |
| | | | |||||
| * | | Address review feedback | Douwe Maan | 2016-08-16 | 1 | -1/+1 |
| | | | |||||
| * | | Add specs for new Note and DiffNote methods. | Douwe Maan | 2016-08-12 | 1 | -0/+3 |
| | | | |||||
| * | | Merge branch 'master' into diff-line-comment-vuejs | Douwe Maan | 2016-08-03 | 1 | -2/+10 |
| |\ \ | |/ | | | | | | | | | # Conflicts: # app/models/discussion.rb # db/schema.rb | ||||
| | * | Speedup DiffNote#active? on discussions, preloading noteables and avoid ↵ | Paco Guzman | 2016-08-02 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | Backend tweaks | Douwe Maan | 2016-07-28 | 1 | -2/+13 |
| | | | |||||
| * | | Use sha1 of discussion ID. | Douwe Maan | 2016-07-25 | 1 | -2/+2 |
| | | | |||||
| * | | Add methods to resolve diff notes and discussions | Douwe Maan | 2016-07-25 | 1 | -0/+18 |
| | | | |||||
| * | | Add resolved_at and resolved_by_id to DiffNote | Douwe Maan | 2016-07-25 | 1 | -0/+13 |
| |/ | |||||
| * | Make `DiffNote#update_position` private | Douwe Maan | 2016-07-07 | 1 | -19/+14 |
| | | |||||
| * | Keep around DiffNote position commits | Douwe Maan | 2016-07-06 | 1 | -0/+13 |
| | | |||||
| * | Automatically update diff note positions when MR is pushed to | Douwe Maan | 2016-07-06 | 1 | -1/+21 |
| | | |||||
| * | Support new diff notes on MRs with diff_refs | Douwe Maan | 2016-07-06 | 1 | -1/+1 |
| | | |||||
| * | Add DiffNote model | Douwe Maan | 2016-07-06 | 1 | -0/+99 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |