Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-07-27Enable frozen string in app/models/*.rbgfyoung
Partially addresses #47424.
2018-06-21Changes tab VUE refactoringFelipe Artur
2017-12-07Allow commenting on individual commits inside an MRDouwe Maan
2017-10-07Commenting on image diffsFelipe Artur
2017-07-21Add full JSON endpoints for issue notes and discussionsDouwe Maan
2017-06-01Fix replying to a commit discussion displayed in the context of an MRDouwe Maan
2017-05-31Move includes call to scopeDouwe Maan
2017-05-30Resolve N+1 query issue with discussionsDouwe Maan
2017-04-07Fix bug where commit comment would not show up in the right discussion on ↵Douwe Maan
the MR page
2017-04-06Refactor resolvability checks based on typeDouwe Maan
2017-04-05Add line breaks in long commentsDouwe Maan
2017-04-05Address review commentsDouwe Maan
2017-04-05Address review commentsDouwe Maan
2017-04-05Don't use original_discussion_idDouwe Maan
2017-04-05Extract commonalities between DiffDiscussion and LegacyDiffDiscussionDouwe Maan
2017-04-05Add specsDouwe Maan
2017-04-05Better notification emails for notes and (diff) discussionsDouwe Maan
2017-04-05Add option to start a new discussion on an MRDouwe Maan
2016-12-05Feature: delegate all open discussions to IssueBob Van Landuyt
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.
2016-11-28Tidy up text emailsSean McGivern
2016-11-25Add keyword arguments to truncated_diff methodhhoopes
* 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
2016-11-25Change diff highlight/truncate for reusabilityhhoopes
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.
2016-09-06Optimize discussion notes resolving and unresolvingAlejandro Rodríguez
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
2016-08-19Fix bug where notes weren’t shown in discussion when the code had changed ↵Douwe Maan
after creation
2016-08-17Store discussion_id on Note for faster discussion lookup.Douwe Maan
2016-08-16Address review feedbackDouwe Maan
2016-08-12Add specs for Discussion and MergeRequest modelsDouwe Maan
2016-08-04Merge branch 'master' into diff-line-comment-vuejsDouwe Maan
# Conflicts: # app/models/discussion.rb # db/schema.rb
2016-08-02Speedup DiffNote#active? on discussions, preloading noteables and avoid ↵Paco Guzman
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-07-29Use correct user for 'Discussion resolved by...'Douwe Maan
2016-07-27Fixed close merge request not hidingPhil Hughes
2016-07-27Fix Discussion#resolved? to be false for commit discussionsDouwe Maan
2016-07-26Add resolved and last updated status to collapsed discussionsDouwe Maan
2016-07-26Collapse/hide resolved discussionsDouwe Maan
2016-07-26Add access checks for diff note and discussion resolutionDouwe Maan
2016-07-26Add methods to resolve diff notes and discussionsDouwe Maan
2016-07-26Add resolved methods on DiscussionDouwe Maan
2016-07-21Add Discussion model to represent MR/diff discussionDouwe Maan