Merge branch '54656-500-error-on-save-of-general-pipeline-settings-timeout' into 'master'
Resolve "500 error on save of general pipeline settings timeout"
Closes gitlab-ee#11281
See merge request gitlab-org/gitlab-ce!27416
(cherry picked from commit 23e5d9ed)
163730f0 Redirect to settings page on invalid update
ef67a54a Add CHANGELOG entry