app/helpers/merge_requests_helper.rb · c9f4d7b0c1ae2f0b6b3b1cbea3d24b5e224b257a · nexedi / gitlab-ce

Phil Hughes authored Aug 10, 2021

This adds an alert component to each diff file that has conflicts.

https://gitlab.com/gitlab-org/gitlab/-/issues/281171

30a6f52a

merge_requests_helper.rb 7.4 KB