Commit 33ef4a85 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents edf694c8 23e5d9ed
...@@ -19,7 +19,7 @@ module Projects ...@@ -19,7 +19,7 @@ module Projects
redirect_to project_settings_ci_cd_path(@project) redirect_to project_settings_ci_cd_path(@project)
else else
render 'show' redirect_to project_settings_ci_cd_path(@project), alert: result[:message]
end end
end end
end end
......
---
title: Fix 500 in general pipeline settings when passing an invalid build timeout.
merge_request: 27416
author:
type: fixed
...@@ -191,6 +191,15 @@ describe Projects::Settings::CiCdController do ...@@ -191,6 +191,15 @@ describe Projects::Settings::CiCdController do
expect(project.build_timeout).to eq(5400) expect(project.build_timeout).to eq(5400)
end end
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 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