kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'fix-ci-services-editing' into 'master' 

Fix 500 when editing CI services

Fixes #3090

See merge request !1663
This commit is contained in:
Robert Speicher 2015-10-22 12:03:20 +00:00
parent b3e10e37f7 40934ae39b
commit b97977afef
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -26,6 +26,7 @@ v 8.1.0
- Add a system note and update relevant merge requests when a branch is deleted or re-added (Stan Hu) - 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) - Make diff file view easier to use on mobile screens (Stan Hu)
- Improved performance of finding users by username or Email address - 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) - 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) - Add support for creating directories from Files page (Stan Hu)
- Allow removing of project without confirmation when JavaScript is disabled (Stan Hu) - Allow removing of project without confirmation when JavaScript is disabled (Stan Hu)

8
app/controllers/projects/ci_services_controller.rb
View File

@ -14,17 +14,17 @@ class Projects::CiServicesController < Projects::ApplicationController
end end
def update def update
if @service.update_attributes(service_params) if service.update_attributes(service_params)
redirect_to edit_namespace_project_ci_service_path(@project, @project.namespace, @service.to_param) redirect_to edit_namespace_project_ci_service_path(@project.namespace, @project, service.to_param)
else else
render 'edit' render 'edit'
end end
end end
def test 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' } message = { notice: 'We successfully tested the service' }
else else
message = { alert: 'We tried to test the service but error occurred' } message = { alert: 'We tried to test the service but error occurred' }