Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
0d43b927
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0d43b927
编写于
5月 12, 2016
作者:
K
Kamil Trzcinski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix CI tests
上级
86cedb08
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
12 addition
and
9 deletion
+12
-9
app/controllers/projects/pipelines_controller.rb
app/controllers/projects/pipelines_controller.rb
+5
-3
app/models/project.rb
app/models/project.rb
+1
-1
app/services/ci/create_pipeline_service.rb
app/services/ci/create_pipeline_service.rb
+1
-1
app/views/projects/commit/_ci_stage.html.haml
app/views/projects/commit/_ci_stage.html.haml
+3
-2
app/views/projects/pipelines/index.html.haml
app/views/projects/pipelines/index.html.haml
+2
-2
未找到文件。
app/controllers/projects/pipelines_controller.rb
浏览文件 @
0d43b927
...
...
@@ -7,8 +7,10 @@ class Projects::PipelinesController < Projects::ApplicationController
def
index
@scope
=
params
[
:scope
]
@all_pipelines
=
project
.
ci_commits
@pipelines
=
PipelinesFinder
.
new
(
project
).
execute
(
@all_pipelines
,
@scope
)
all_pipelines
=
project
.
ci_commits
@pipelines_count
=
all_pipelines
.
count
@running_or_pending_count
=
all_pipelines
.
running_or_pending
.
count
@pipelines
=
PipelinesFinder
.
new
(
project
).
execute
(
all_pipelines
,
@scope
)
@pipelines
=
@pipelines
.
order
(
id: :desc
).
page
(
params
[
:page
]).
per
(
30
)
end
...
...
@@ -22,7 +24,7 @@ class Projects::PipelinesController < Projects::ApplicationController
rescue
ArgumentError
=>
e
@error
=
e
.
message
render
'new'
rescue
=>
e
rescue
@error
=
'Undefined error'
render
'new'
end
...
...
app/models/project.rb
浏览文件 @
0d43b927
...
...
@@ -354,7 +354,7 @@ class Project < ActiveRecord::Base
join_body
=
"INNER JOIN (
SELECT project_id, COUNT(*) AS amount
FROM notes
WHERE created_at >=
#{
sanitize
(
since
)
}
WHERE created_at >=
#{
sanitize
(
since
)
}
project.ci_commits
GROUP BY project_id
) join_note_counts ON projects.id = join_note_counts.project_id"
...
...
app/services/ci/create_pipeline_service.rb
浏览文件 @
0d43b927
...
...
@@ -39,4 +39,4 @@ module Ci
@pipeline
||=
project
.
ci_commits
.
new
(
sha:
commit
.
id
,
ref:
params
[
:ref
],
before_sha:
Gitlab
::
Git
::
BLANK_SHA
)
end
end
end
\ No newline at end of file
end
app/views/projects/commit/_ci_stage.html.haml
浏览文件 @
0d43b927
...
...
@@ -6,8 +6,9 @@
-
status
=
latest
.
status
%span
{
class:
"ci-status-link ci-status-icon-#{status}"
}
=
ci_icon_for_status
(
status
)
=
stage
.
titleize
.
pluralize
-
if
stage
=
stage
.
titleize
.
pluralize
=
render
latest
.
ordered
,
coverage:
@project
.
build_coverage_enabled?
,
tage:
false
,
ref:
false
,
allow_retry:
true
=
render
retried
.
ordered
,
coverage:
@project
.
build_coverage_enabled?
,
stage:
false
,
ref:
false
,
retried:
true
%tr
...
...
app/views/projects/pipelines/index.html.haml
浏览文件 @
0d43b927
...
...
@@ -7,13 +7,13 @@
=
link_to
project_pipelines_path
(
@project
)
do
All
%span
.badge.js-totalbuilds-count
=
number_with_delimiter
(
@
all_pipelines
.
count
)
=
number_with_delimiter
(
@
pipelines_
count
)
%li
{
class:
(
'active'
if
@scope
==
'running'
)}
=
link_to
project_pipelines_path
(
@project
,
scope: :running
)
do
Running
%span
.badge.js-running-count
=
number_with_delimiter
(
@
all_pipelines
.
running_or_pending
.
count
)
=
number_with_delimiter
(
@
running_or_pending_
count
)
%li
{
class:
(
'active'
if
@scope
==
'branches'
)}
=
link_to
project_pipelines_path
(
@project
,
scope: :branches
)
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录