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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
42855f11
Commit
42855f11
authored
Nov 22, 2016
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix wrong template rendered when CI/CD settings aren't update successfully
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
da0dd7ec
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
app/controllers/projects/pipelines_settings_controller.rb
app/controllers/projects/pipelines_settings_controller.rb
+1
-1
changelogs/unreleased/24804-wrong-render-index-should-be-render-show-in-projects-pipelinessettingscontroller-update.yml
...r-show-in-projects-pipelinessettingscontroller-update.yml
+4
-0
No files found.
app/controllers/projects/pipelines_settings_controller.rb
View file @
42855f11
...
@@ -17,7 +17,7 @@ class Projects::PipelinesSettingsController < Projects::ApplicationController
...
@@ -17,7 +17,7 @@ class Projects::PipelinesSettingsController < Projects::ApplicationController
flash
[
:notice
]
=
"CI/CD Pipelines settings for '
#{
@project
.
name
}
' were successfully updated."
flash
[
:notice
]
=
"CI/CD Pipelines settings for '
#{
@project
.
name
}
' were successfully updated."
redirect_to
namespace_project_pipelines_settings_path
(
@project
.
namespace
,
@project
)
redirect_to
namespace_project_pipelines_settings_path
(
@project
.
namespace
,
@project
)
else
else
render
'
index
'
render
'
show
'
end
end
end
end
...
...
changelogs/unreleased/24804-wrong-render-index-should-be-render-show-in-projects-pipelinessettingscontroller-update.yml
0 → 100644
View file @
42855f11
---
title
:
Fix wrong template rendered when CI/CD settings aren't update successfully
merge_request
:
7665
author
:
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