Resolves "Reviews: Resolving or unresolving discussions with “Add comment now” does not work"
What does this MR do?
In the batch comments feature, when you submit the comment right away, without saving it as draft first, the resolution of discussion wasn't working properly.
This adds a check that will recognize whether BatchComments are active or not and check the checkbox properly when commenting right away.
It also adds rspec tests to cover the scenarios of resolving/unresolving both when adding comment right away as well as through draft => publish review flow.
What are the relevant issue numbers?
Closes #7921 (closed)
Does this MR meet the acceptance criteria?
-
Changelog entry added, if necessary -
Documentation created/updated -
Tests added for this feature/bug -
Conforms to the code review guidelines -
Conforms to the merge request performance guidelines -
Conforms to the style guides -
EE specific content should be in the top level /ee
folder -
For a paid feature, have we considered GitLab.com plans, how it works for groups, and is there a design for promoting it to users who aren't on the correct plan?
Merge request reports
Activity
1 Message Consider setting merge_request
to 7866 in ee/changelogs/unreleased/7921-fix-batch-comments-resolution.yml. See the documentation.Generated by
DangerEdited by 🤖 GitLab Bot 🤖assigned to @andr3
assigned to @timzallmann
@timzallmann can you please review this fix? It has a backport to CE and needs to be picked into 11.4. Does the backport also need to have ~"Pick into 11.4"? Thanks in advance! Happy to explain further.
Passing this along to @iamphill if that's alright. :) He's back.
assigned to @iamphill
mentioned in commit 0ec8038a
Picked into https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7929, will merge into
11-4-stable
ready for11.4 RC6
mentioned in commit 32fa4daf
mentioned in issue gitlab-org/release/tasks#485 (closed)
mentioned in issue gitlab-org/release/tasks#515 (closed)
added Enterprise Edition label
added groupcode review label