BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
40934ae3
Commit
40934ae3
authored
Oct 22, 2015
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix 500 when editing CI services
parent
ae9f81a9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
CHANGELOG
CHANGELOG
+1
-0
ci_services_controller.rb
app/controllers/projects/ci_services_controller.rb
+4
-4
No files found.
CHANGELOG
View file @
40934ae3
...
...
@@ -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)
...
...
app/controllers/projects/ci_services_controller.rb
View file @
40934ae3
...
...
@@ -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'
}
...
...
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