| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Allow commenting on individual commits inside an MR | Douwe Maan | 2017-12-07 | 1 | -0/+1 |
| | | |||||
| * | Commenting on image diffs | Felipe Artur | 2017-10-07 | 1 | -0/+4 |
| | | |||||
| * | Add full JSON endpoints for issue notes and discussions | Douwe Maan | 2017-07-21 | 1 | -0/+4 |
| | | |||||
| * | Fix replying to a commit discussion displayed in the context of an MR | Douwe Maan | 2017-06-01 | 1 | -0/+6 |
| | | |||||
| * | Move includes call to scopedm-discussions-n-plus-1 | Douwe Maan | 2017-05-31 | 1 | -1/+1 |
| | | |||||
| * | Resolve N+1 query issue with discussions | Douwe Maan | 2017-05-29 | 1 | -1/+2 |
| | | |||||
| * | Fix bug where commit comment would not show up in the right discussion on ↵ | Douwe Maan | 2017-04-07 | 1 | -9/+9 |
| | | | | | the MR page | ||||
| * | Refactor resolvability checks based on type | Douwe Maan | 2017-04-06 | 1 | -0/+6 |
| | | |||||
| * | Add line breaks in long comments | Douwe Maan | 2017-04-05 | 1 | -2/+4 |
| | | |||||
| * | Address review comments | Douwe Maan | 2017-04-05 | 1 | -27/+19 |
| | | |||||
| * | Address review comments | Douwe Maan | 2017-04-05 | 1 | -0/+1 |
| | | |||||
| * | Don't use original_discussion_id | Douwe Maan | 2017-04-05 | 1 | -19/+4 |
| | | |||||
| * | Extract commonalities between DiffDiscussion and LegacyDiffDiscussion | Douwe Maan | 2017-04-05 | 1 | -75/+6 |
| | | |||||
| * | Add specs | Douwe Maan | 2017-04-05 | 1 | -9/+12 |
| | | |||||
| * | Better notification emails for notes and (diff) discussions | Douwe Maan | 2017-04-05 | 1 | -0/+4 |
| | | |||||
| * | Add option to start a new discussion on an MR | Douwe Maan | 2017-04-05 | 1 | -81/+71 |
| | | |||||
| * | Feature: delegate all open discussions to Issue | Bob Van Landuyt | 2016-12-05 | 1 | -0/+4 |
| | | | | | | | | | | | | | | When a merge request can only be merged when all discussions are resolved. This feature allows to easily delegate those discussions to a new issue, while marking them as resolved in the merge request. The user is presented with a new issue, prepared with mentions of all unresolved discussions, including the first unresolved note of the discussion, time and link to the note. When the issue is created, the discussions in the merge request will get a system note directing the user to the newly created issue. | ||||
| * | Tidy up text emails | Sean McGivern | 2016-11-28 | 1 | -2/+5 |
| | | |||||
| * | Add keyword arguments to truncated_diff method | hhoopes | 2016-11-25 | 1 | -3/+4 |
| | | | | | | * Added keyword arguments to truncated_diff_lines method to allow for using highlighting or not (html templates vs. text) * Tweaked templates for consistency and format appropriateness | ||||
| * | Change diff highlight/truncate for reusability | hhoopes | 2016-11-25 | 1 | -5/+7 |
| | | | | | | | Previously the `truncated_diff_lines` method for outputting a discussion diff took in already highlighted lines, which meant it wasn't reuseable for truncating ANY lines. In the way it was used, it also meant that for any email truncation, the whole diff was being highlighted before being truncated, meaning wasted time highlighting lines that wouldn't even be used (granted, they were being memoized, so perhaps this wasn't that great of an issue). I refactored truncation away from highlighting, in order to truncate formatted diffs for text templates in email, using `>`s to designate each line, but otherwise retaining the parsing already done to create `diff_lines`. Additionally, while notes on merge requests or commits had already been tested, there was no existing test for notes on a diff on an MR or commit. Added mailer tests for such, and a unit test for truncating diff 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 | -12/+27 |
| | | | | | | | | 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 | ||||
| * | Fix bug where notes weren’t shown in discussion when the code had changed ↵ | Douwe Maan | 2016-08-19 | 1 | -0/+1 |
| | | | | | after creation | ||||
| * | Store discussion_id on Note for faster discussion lookup. | Douwe Maan | 2016-08-17 | 1 | -2/+2 |
| | | |||||
| * | Address review feedback | Douwe Maan | 2016-08-16 | 1 | -0/+2 |
| | | |||||
| * | Add specs for Discussion and MergeRequest models | Douwe Maan | 2016-08-12 | 1 | -3/+5 |
| | | |||||
| * | Merge branch 'master' into diff-line-comment-vuejs | Douwe Maan | 2016-08-03 | 1 | -3/+15 |
| |\ | | | | | | | | | | | # Conflicts: # app/models/discussion.rb # db/schema.rb | ||||
| | * | Speedup DiffNote#active? on discussions, preloading noteables and avoid ↵ | Paco Guzman | 2016-08-02 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | Use correct user for 'Discussion resolved by...' | Douwe Maan | 2016-07-28 | 1 | -1/+12 |
| | | | |||||
| * | | Fixed close merge request not hiding | Phil Hughes | 2016-07-27 | 1 | -1/+1 |
| | | | |||||
| * | | Fix Discussion#resolved? to be false for commit discussions | Douwe Maan | 2016-07-26 | 1 | -1/+1 |
| | | | |||||
| * | | Add resolved and last updated status to collapsed discussions | Douwe Maan | 2016-07-25 | 1 | -0/+8 |
| | | | |||||
| * | | Collapse/hide resolved discussions | Douwe Maan | 2016-07-25 | 1 | -1/+13 |
| | | | |||||
| * | | Add access checks for diff note and discussion resolution | Douwe Maan | 2016-07-25 | 1 | -0/+8 |
| | | | |||||
| * | | Add methods to resolve diff notes and discussions | Douwe Maan | 2016-07-25 | 1 | -0/+12 |
| | | | |||||
| * | | Add resolved methods on Discussion | Douwe Maan | 2016-07-25 | 1 | -1/+19 |
| |/ | |||||
| * | Add Discussion model to represent MR/diff discussiondiscussion-model | Douwe Maan | 2016-07-20 | 1 | -0/+91 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |