Skip to content
Snippets Groups Projects

Move EE differences out of CE diff files

Merged Phil Hughes requested to merge (removed):noteable-discussion-ee-differences into master
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?

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Filipa Lacerda
  • @iamphill thanks! just 2 questions

  • Filipa Lacerda resolved all discussions

    resolved all discussions

  • Filipa Lacerda approved this merge request

    approved this merge request

  • Filipa Lacerda mentioned in commit bd19a0e7

    mentioned in commit bd19a0e7

  • Mike Greiling mentioned in merge request !16694 (closed)

    mentioned in merge request !16694 (closed)

  • Please register or sign in to reply
    Loading