Skip to content

Remove merge_conflicts bundle

Mike Greiling requested to merge remove-merge-conflicts-bundle into master

Removes the merge_conflicts webpack bundle and rolls its functionality into pages/projects/merge_requests/conflicts/index.js instead.

What are the relevant issue numbers?

Part of gitlab-org/gitlab-ce#41341

Merge request reports

Loading