Merge branch '47532-follow-up-from-resolve-add-deploy-strategies-to-auto-devops-settings' into 'master'

Resolve "Follow-up from "Resolve "Add deploy strategies to Auto DevOps settings"""

Closes #47532

See merge request gitlab-org/gitlab-ce!19554