diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-08-23 21:28:07 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-08-23 21:28:07 +0000 |
commit | 02591b043052eb4f8041f8cf51546fab272d7b61 (patch) | |
tree | 95e0e7d2d3d48438ff8e3e3cfbb76f325a861ab9 /.pkgr.yml | |
parent | aa6fe141b3052036d9d55681f81a8c290e262990 (diff) | |
parent | 6692bca49d0c652eb50f5fcefb77f0afcce3588d (diff) | |
download | gitlab-ce-02591b043052eb4f8041f8cf51546fab272d7b61.tar.gz |
Merge branch 'disable-commenting-on-unrelatable-diff-line' into 'master'
Disable commenting on unrelatable diff line
## What does this MR do?
Fixes a bug where users can comment on diff lines that can't be commented on and attached to.
This is the case for unfolded lines and lines that appear as snippets in the discussion tab.
**!5864 should be merged before this MR.**
## Are there points in the code the reviewer needs to double check?
:confused:
## Why was this MR needed?
Comments were getting lost on the discussion feed, unable to find their related diff.
## What are the relevant issue numbers?
Closes #20633.
## Screenshots (if relevant)
![diffs-comment-fix](/uploads/f902b687fda75492e38397f9705283e0/diffs-comment-fix.mp4)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5681
Diffstat (limited to '.pkgr.yml')
0 files changed, 0 insertions, 0 deletions