summaryrefslogtreecommitdiff
path: root/app/models/diff_note.rb
Commit message (Collapse)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2022-02-221-1/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2021-08-201-13/+15
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2021-01-141-0/+4
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-11-231-1/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-11-231-1/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-06-051-1/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-05-041-4/+6
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-02-171-1/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-12-181-12/+28
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-12-041-2/+2
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-11-211-5/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-231-0/+4
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-161-9/+4
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-131-0/+2
|
* Make diff_refs_match_commit validation reusablePatrick Bajao2019-08-011-7/+0
| | | | | Move it to DiffPositionableNote concern which will be re-used in EE in DraftNote model.
* Lock suggestions_filter_enabled as trueKerri Miller2019-06-051-1/+1
| | | | | | Most/all of the work we're doing in this method is done at creation/edit time, so do we need to also check at render? Assume if you've gotten to this point, it's ok to enable the suggestion filter.
* Avoid 500's when commit is not reachableOswaldo Ferreira2019-06-051-1/+1
|
* Get `repository` from noteable in DiffNotesBob Van Landuyt2019-06-031-5/+9
| | | | | | | | | Getting the `repository` directly from the noteable in DiffNotes allows us to use a different repository when the DiffNote is not on a project repository. It is only the first step in decoupling the DiffNote from a project's main repository.
* Make `resolvable_types` a class methodBob Van Landuyt2019-06-031-1/+3
| | | | | This turns Notable::RESOLVABLE_TYPES into a `Notable.resolvable_types`. That allows us to override it in EE.
* Prepare suggestion implementation for multi-lineOswaldo Ferreira2019-03-271-2/+2
| | | | | | Adds the groundwork needed in order to persist multi-line suggestions, while providing the parsing strategy which will be reused for the **Preview** as well.
* Implement multi-line suggestions filteringOswaldo Ferreira2019-03-201-1/+1
| | | | | Implements the filtering logic for `suggestion:-x+y` syntax.
* Use shorthand version of method callOswaldo Ferreira2019-02-261-2/+1
|
* Always fetch MR latest version when creating suggestionsOswaldo Ferreira2019-02-261-0/+9
| | | | | | | | This is an issue that can only be seen through EE. Further details can be seen on https://gitlab.com/gitlab-org/gitlab-ee/issues/9876. In general we should always use the latest diff version of a file in order to both create and apply suggestions.
* Allow suggesting single line changes in diffsOswaldo Ferreira2018-12-131-0/+13
|
* Comment on any expanded diff line on MRsosw-comment-on-any-line-on-diffs-w-feature-flagOswaldo Ferreira2018-11-091-17/+28
|
* Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"osw-revert-comment-in-any-diff-lineOswaldo Ferreira2018-11-071-28/+17
| | | | | This reverts commit a82a595728d54bdc12e51dfcfb22e9eddc449143, reversing changes made to e7df959b8f99875edd246c7ac7779c3203e8755e.
* Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'Douwe Maan2018-11-071-17/+28
|\ | | | | | | | | Comment on any expanded diff line on MRs See merge request gitlab-org/gitlab-ce!22398
| * Comment on any expanded diff line on MRsOswaldo Ferreira2018-11-061-17/+28
| |
* | Remove EE-specific code from DiscussionNoteremove-ee-specific-code-from-plan-and-create-modelsSean McGivern2018-10-261-2/+4
|/
* Backport CE changes from draft_notes addition in EEMario de la Ossa2018-10-041-67/+1
|
* Use standalone diff stats RPC on every comparison viewOswaldo Ferreira2018-09-191-1/+1
|
* Backport Repository#keep_around changes from EE to CEMichael Kozono2018-08-271-6/+10
|
* Enable frozen string in app/models/*.rbrepo-forks/gitlab-ce-frozen-string-enable-app-modelsgfyoung2018-07-261-0/+2
| | | | Partially addresses #47424.
* Persist truncated note diffs on a new table45190-create-notes-diff-filesOswaldo Ferreira2018-05-241-15/+52
| | | | | We request Gitaly in a N+1 manner to build discussion diffs. Once the diffs are from different revisions, it's hard to make a single request to the service in order to build the whole response. With this change we solve this problem and simplify a lot fetching this piece of info.
* Use persisted diff data instead fetching Git on discussionsOswaldo Ferreira2018-04-301-1/+14
| | | | Today, when fetching diffs of a note, we always go to Gitaly in order to diff between commits and return the diff of each discussion note. With this change we avoid doing that for notes on the "current version" of the MR.
* Improve performance of DiffDiscussion#truncated_diff_lines and ↵Douwe Maan2017-12-221-5/+1
| | | | DiffNote#diff_line by removing expensive diff position calculation and comparison
* Allow commenting on individual commits inside an MRDouwe Maan2017-12-071-0/+7
|
* Prevents position update for image diff notesissue_40058Felipe Artur2017-11-131-1/+2
|
* Commenting on image diffsFelipe Artur2017-10-071-2/+12
|
* Rename ActiverecordSerialize copYorick Peterse2017-07-061-3/+3
| | | | | This cop has been renamed to ActiveRecordSerialize to match the way "ActiveRecord" is usually written.
* Merge branch 'dm-update-discussion-diff-position' into 'master'Grzegorz Bizon2017-06-011-5/+13
|\ | | | | | | | | | | | | Update diff discussion position per discussion instead of per note Closes #33157 See merge request !11833
| * Update diff discussion position per discussion instead of per notedm-update-discussion-diff-positionDouwe Maan2017-05-311-5/+13
| |
* | Added Cop to blacklist the use of serializedocument-not-using-serializeYorick Peterse2017-05-311-3/+3
|/ | | | | This Cop blacklists the use of ActiveRecord's "serialize" method, except for cases where we already use this.
* Merge branch 'dm-diff-cleanup' into 'master'Robert Speicher2017-05-251-2/+2
|\ | | | | | | | | Clean up diff rendering See merge request !11390
| * Pass fallback_diff_refs to Diff::File instead of using view helpersDouwe Maan2017-05-231-2/+2
| |
* | Add system note with link to diff comparison when MR discussion becomes outdatedDouwe Maan2017-05-231-2/+5
|/
* Allow commenting on older versions of the diff and comparisons between diff ↵dm-link-discussion-to-outdated-diffDouwe Maan2017-05-031-3/+4
| | | | versions
* Link to outdated diff in older MR version from outdated diff discussionDouwe Maan2017-04-081-8/+6
|
* Refactor resolvability checks based on typeDouwe Maan2017-04-061-0/+2
|
* Address review commentsDouwe Maan2017-04-051-0/+1
|