Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
m0_70890014
gitlabhq
提交
b97977af
G
gitlabhq
项目概览
m0_70890014
/
gitlabhq
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlabhq
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b97977af
编写于
10月 22, 2015
作者:
R
Robert Speicher
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix-ci-services-editing' into 'master'
Fix 500 when editing CI services Fixes #3090 See merge request !1663
上级
b3e10e37
40934ae3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
4 deletion
+5
-4
CHANGELOG
CHANGELOG
+1
-0
app/controllers/projects/ci_services_controller.rb
app/controllers/projects/ci_services_controller.rb
+4
-4
未找到文件。
CHANGELOG
浏览文件 @
b97977af
...
...
@@ -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)
- 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
浏览文件 @
b97977af
...
...
@@ -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'
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录