Merge branch '498859-finalize' into 'master'

Sync FK `fk_rails_507416c33a_p`

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



Merged-by: Marius Bobin <mbobin@gitlab.com>
Approved-by: Max Orefice <morefice@gitlab.com>
Approved-by: Marius Bobin <mbobin@gitlab.com>
Reviewed-by: Max Orefice <morefice@gitlab.com>
Reviewed-by: Tianwen Chen <tchen@gitlab.com>
Co-authored-by: Tianwen Chen <tchen@gitlab.com>