Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2022-02-22 | 1 | -1/+1 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2021-08-20 | 1 | -13/+15 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2021-01-14 | 1 | -0/+4 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-11-23 | 1 | -1/+1 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-11-23 | 1 | -1/+1 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-06-05 | 1 | -1/+1 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-05-04 | 1 | -4/+6 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-02-17 | 1 | -1/+1 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-12-18 | 1 | -12/+28 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-12-04 | 1 | -2/+2 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-11-21 | 1 | -5/+1 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-09-23 | 1 | -0/+4 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-09-16 | 1 | -9/+4 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-09-13 | 1 | -0/+2 |
| | |||||
* | Make diff_refs_match_commit validation reusable | Patrick Bajao | 2019-08-01 | 1 | -7/+0 |
| | | | | | Move it to DiffPositionableNote concern which will be re-used in EE in DraftNote model. | ||||
* | Lock suggestions_filter_enabled as true | Kerri Miller | 2019-06-05 | 1 | -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 reachable | Oswaldo Ferreira | 2019-06-05 | 1 | -1/+1 |
| | |||||
* | Get `repository` from noteable in DiffNotes | Bob Van Landuyt | 2019-06-03 | 1 | -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 method | Bob Van Landuyt | 2019-06-03 | 1 | -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-line | Oswaldo Ferreira | 2019-03-27 | 1 | -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 filtering | Oswaldo Ferreira | 2019-03-20 | 1 | -1/+1 |
| | | | | | Implements the filtering logic for `suggestion:-x+y` syntax. | ||||
* | Use shorthand version of method call | Oswaldo Ferreira | 2019-02-26 | 1 | -2/+1 |
| | |||||
* | Always fetch MR latest version when creating suggestions | Oswaldo Ferreira | 2019-02-26 | 1 | -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 diffs | Oswaldo Ferreira | 2018-12-13 | 1 | -0/+13 |
| | |||||
* | Comment on any expanded diff line on MRsosw-comment-on-any-line-on-diffs-w-feature-flag | Oswaldo Ferreira | 2018-11-09 | 1 | -17/+28 |
| | |||||
* | Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"osw-revert-comment-in-any-diff-line | Oswaldo Ferreira | 2018-11-07 | 1 | -28/+17 |
| | | | | | This reverts commit a82a595728d54bdc12e51dfcfb22e9eddc449143, reversing changes made to e7df959b8f99875edd246c7ac7779c3203e8755e. | ||||
* | Merge branch 'osw-comment-on-any-line-on-diffs' into 'master' | Douwe Maan | 2018-11-07 | 1 | -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 MRs | Oswaldo Ferreira | 2018-11-06 | 1 | -17/+28 |
| | | |||||
* | | Remove EE-specific code from DiscussionNoteremove-ee-specific-code-from-plan-and-create-models | Sean McGivern | 2018-10-26 | 1 | -2/+4 |
|/ | |||||
* | Backport CE changes from draft_notes addition in EE | Mario de la Ossa | 2018-10-04 | 1 | -67/+1 |
| | |||||
* | Use standalone diff stats RPC on every comparison view | Oswaldo Ferreira | 2018-09-19 | 1 | -1/+1 |
| | |||||
* | Backport Repository#keep_around changes from EE to CE | Michael Kozono | 2018-08-27 | 1 | -6/+10 |
| | |||||
* | Enable frozen string in app/models/*.rbrepo-forks/gitlab-ce-frozen-string-enable-app-models | gfyoung | 2018-07-26 | 1 | -0/+2 |
| | | | | Partially addresses #47424. | ||||
* | Persist truncated note diffs on a new table45190-create-notes-diff-files | Oswaldo Ferreira | 2018-05-24 | 1 | -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 discussions | Oswaldo Ferreira | 2018-04-30 | 1 | -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 Maan | 2017-12-22 | 1 | -5/+1 |
| | | | | DiffNote#diff_line by removing expensive diff position calculation and comparison | ||||
* | Allow commenting on individual commits inside an MR | Douwe Maan | 2017-12-07 | 1 | -0/+7 |
| | |||||
* | Prevents position update for image diff notesissue_40058 | Felipe Artur | 2017-11-13 | 1 | -1/+2 |
| | |||||
* | Commenting on image diffs | Felipe Artur | 2017-10-07 | 1 | -2/+12 |
| | |||||
* | Rename ActiverecordSerialize cop | Yorick Peterse | 2017-07-06 | 1 | -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 Bizon | 2017-06-01 | 1 | -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-position | Douwe Maan | 2017-05-31 | 1 | -5/+13 |
| | | |||||
* | | Added Cop to blacklist the use of serializedocument-not-using-serialize | Yorick Peterse | 2017-05-31 | 1 | -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 Speicher | 2017-05-25 | 1 | -2/+2 |
|\ | | | | | | | | | Clean up diff rendering See merge request !11390 | ||||
| * | Pass fallback_diff_refs to Diff::File instead of using view helpers | Douwe Maan | 2017-05-23 | 1 | -2/+2 |
| | | |||||
* | | Add system note with link to diff comparison when MR discussion becomes outdated | Douwe Maan | 2017-05-23 | 1 | -2/+5 |
|/ | |||||
* | Allow commenting on older versions of the diff and comparisons between diff ↵dm-link-discussion-to-outdated-diff | Douwe Maan | 2017-05-03 | 1 | -3/+4 |
| | | | | versions | ||||
* | Link to outdated diff in older MR version from outdated diff discussion | Douwe Maan | 2017-04-08 | 1 | -8/+6 |
| | |||||
* | Refactor resolvability checks based on type | Douwe Maan | 2017-04-06 | 1 | -0/+2 |
| | |||||
* | Address review comments | Douwe Maan | 2017-04-05 | 1 | -0/+1 |
| |