The source project of this merge request has been removed.
Move EE differences out of CE diff files
All threads resolved!
All threads resolved!
What does this MR do?
Reduces EE conflicts in some diff note components.
Moved some batch comments stuff around to remove conflicts. Makes the DraftNote
component an async import, on CE this will resolve to an empty component and on EE it will resolve to the correct component.
What are the relevant issue numbers?
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/10001, https://gitlab.com/gitlab-org/gitlab-ee/issues/9959
Does this MR meet the acceptance criteria?
-
Changelog entry added, if necessary -
Documentation created/updated via this MR -
Documentation reviewed by technical writer or follow-up review issue created -
Tests added for this feature/bug -
Tested in all supported browsers -
Conforms to the code review guidelines -
Conforms to the merge request performance guidelines -
Conforms to the style guides -
Conforms to the database guides -
Link to e2e tests MR added if this MR has Requires e2e tests label. See the Test Planning Process. -
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? -
Security reports checked/validated by reviewer
Merge request reports
Activity
changed milestone to %11.9
- Resolved by Filipa Lacerda
assigned to @filipa
- Resolved by Filipa Lacerda
- Resolved by Filipa Lacerda
@iamphill thanks! just 2 questions
Thanks @iamphill
mentioned in commit bd19a0e7
mentioned in issue gitlab-org/release/tasks#695 (closed)
added devopscreate label
added Enterprise Edition label
mentioned in merge request !16694 (closed)
Please register or sign in to reply