Fix 500 when editing CI services
This commit is contained in:
parent
ae9f81a950
commit
40934ae39b
|
@ -24,6 +24,7 @@ v 8.1.0
|
|||
- Add a system note and update relevant merge requests when a branch is deleted or re-added (Stan Hu)
|
||||
- Make diff file view easier to use on mobile screens (Stan Hu)
|
||||
- Improved performance of finding users by username or Email address
|
||||
- Fix 500 when editing CI service
|
||||
- Fix bug where merge request comments created by API would not trigger notifications (Stan Hu)
|
||||
- Add support for creating directories from Files page (Stan Hu)
|
||||
- Allow removing of project without confirmation when JavaScript is disabled (Stan Hu)
|
||||
|
|
|
@ -14,17 +14,17 @@ class Projects::CiServicesController < Projects::ApplicationController
|
|||
end
|
||||
|
||||
def update
|
||||
if @service.update_attributes(service_params)
|
||||
redirect_to edit_namespace_project_ci_service_path(@project, @project.namespace, @service.to_param)
|
||||
if service.update_attributes(service_params)
|
||||
redirect_to edit_namespace_project_ci_service_path(@project.namespace, @project, service.to_param)
|
||||
else
|
||||
render 'edit'
|
||||
end
|
||||
end
|
||||
|
||||
def test
|
||||
last_build = @project.builds.last
|
||||
last_build = @project.ci_builds.last
|
||||
|
||||
if @service.execute(last_build)
|
||||
if service.execute(last_build)
|
||||
message = { notice: 'We successfully tested the service' }
|
||||
else
|
||||
message = { alert: 'We tried to test the service but error occurred' }
|
||||
|
|
Loading…
Reference in New Issue