Commit 1cb89809 authored by Stan Hu's avatar Stan Hu Committed by GitLab Release Tools Bot

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
parent 9a5567ff
......@@ -19,7 +19,7 @@ module Projects
redirect_to project_settings_ci_cd_path(@project)
else
render 'show'
redirect_to project_settings_ci_cd_path(@project), alert: result[:message]
end
end
end
......
---
title: Fix 500 in general pipeline settings when passing an invalid build timeout.
merge_request: 27416
author:
type: fixed
......@@ -189,6 +189,15 @@ describe Projects::Settings::CiCdController do
expect(project.build_timeout).to eq(5400)
end
end
context 'when build_timeout_human_readable is invalid' do
let(:params) { { build_timeout_human_readable: '5m' } }
it 'set specified timeout' do
expect(subject).to set_flash[:alert]
expect(response).to redirect_to(namespace_project_settings_ci_cd_path)
end
end
end
end
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment