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
a7cb1263
Commit
a7cb1263
authored
Jul 20, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix updating settings for pipelines
parent
8ead4b22
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
15 deletions
+8
-15
app/controllers/projects/pipelines_controller.rb
app/controllers/projects/pipelines_controller.rb
+8
-14
app/services/projects/update_service.rb
app/services/projects/update_service.rb
+0
-1
No files found.
app/controllers/projects/pipelines_controller.rb
View file @
a7cb1263
...
...
@@ -50,20 +50,14 @@ class Projects::PipelinesController < Projects::ApplicationController
end
def
update_settings
status
=
::
Projects
::
UpdateService
.
new
(
@project
,
current_user
,
pipelines_settings_params
).
execute
respond_to
do
|
format
|
if
status
flash
[
:notice
]
=
"CI/CD Pipelines settings for '
#{
@project
.
name
}
' was successfully updated."
format
.
html
do
redirect_to
(
settings_namespace_project_pipelines_path
(
@project
.
namespace
,
@project
),
notice:
"CI/CD Pipelines settings for '
#{
@project
.
name
}
' was successfully updated."
)
end
else
format
.
html
{
render
'settings'
}
end
if
@project
.
update_attributes
(
pipelines_settings_params
)
flash
[
:notice
]
=
"CI/CD Pipelines settings for '
#{
@project
.
name
}
' was successfully updated."
redirect_to
(
settings_namespace_project_pipelines_path
(
@project
.
namespace
,
@project
),
notice:
"CI/CD Pipelines settings for '
#{
@project
.
name
}
' was successfully updated."
)
else
render
'settings'
end
end
...
...
app/services/projects/update_service.rb
View file @
a7cb1263
...
...
@@ -23,7 +23,6 @@ module Projects
if
project
.
previous_changes
.
include?
(
'path'
)
project
.
rename_repo
end
true
end
end
end
...
...
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