Merge branch 'freinink/384017-support-expected-old-oid-in-user-commit-files' into 'master'

Support expected_old_oid in user_commit_files

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/161981



Merged-by: Vasilii Iakliushin <viakliushin@gitlab.com>
Approved-by: Dmytro Biryukov <dbiryukov@gitlab.com>
Approved-by: Vasilii Iakliushin <viakliushin@gitlab.com>
Reviewed-by: Vasilii Iakliushin <viakliushin@gitlab.com>
Reviewed-by: Allison Browne <abrowne@gitlab.com>
Reviewed-by: Dmytro Biryukov <dbiryukov@gitlab.com>
Co-authored-by: Fred Reinink <freinink@gitlab.com>