gitlab

Fix issue gitlab-org/gitlab#416662

See merge request gitlab-org/gitlab!133338



Merged-by: Vijay Hawoldar <vhawoldar@gitlab.com>
Approved-by: Mohamed Hamda <mhamda@gitlab.com>
Approved-by: Fiona Neill <fneill@gitlab.com>
Approved-by: Sheldon Led <sheldonled@gitlab.com>
Approved-by: Vijay Hawoldar <vhawoldar@gitlab.com>
Reviewed-by: Marco Zille <marco.zille@gmail.com>
Reviewed-by: Vijay Hawoldar <vhawoldar@gitlab.com>
Reviewed-by: Sheldon Led <sheldonled@gitlab.com>
Reviewed-by: Marc-Andre Vezeau <vezeauma@gmail.com>
Reviewed-by: Omar Qunsul <oqunsul@gitlab.com>
Reviewed-by: Mohamed Hamda <mhamda@gitlab.com>
Co-authored-by: Marc-Andre Vezeau <vezeauma@gmail.com>