Make sure we didn't commit conflicts
What does this MR do?
Make sure we didn't commit conflicts
Are there points in the code the reviewer needs to double check?
-
Consensus that we want this -
Update build image to install ripgrep https://gitlab.com/gitlab-org/gitlab-build-images/merge_requests/48 -
Update image in .gitlab-ci.ymlto use the new one -
Remove demo conflicts in CHANGELOG.md
What are the relevant issue numbers?
Closes #35627 (closed)
Edited by username-removed-423915