Fixed merge spec conflict Closes #8939 See merge request gitlab-org/gitlab-ee!8934
Attach a file by drag & drop or click to upload
