Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
163730f0
Commit
163730f0
authored
5 years ago
by
Matija Čupić
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Redirect to settings page on invalid update
parent
a89e8149
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
app/controllers/projects/settings/ci_cd_controller.rb
app/controllers/projects/settings/ci_cd_controller.rb
+1
-1
spec/controllers/projects/settings/ci_cd_controller_spec.rb
spec/controllers/projects/settings/ci_cd_controller_spec.rb
+9
-0
No files found.
app/controllers/projects/settings/ci_cd_controller.rb
View file @
163730f0
...
...
@@ -19,7 +19,7 @@ module Projects
redirect_to
project_settings_ci_cd_path
(
@project
)
else
re
nder
'show'
re
direct_to
project_settings_ci_cd_path
(
@project
),
alert:
result
[
:message
]
end
end
end
...
...
This diff is collapsed.
Click to expand it.
spec/controllers/projects/settings/ci_cd_controller_spec.rb
View file @
163730f0
...
...
@@ -191,6 +191,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
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment