Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
4b559c9a
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,体验更适合开发者的 AI 搜索 >>
提交
4b559c9a
编写于
8月 11, 2016
作者:
L
Lin Jen-Shin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Reverse ref and sha in args and rename pipeline to pipeline_for
上级
51724985
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
12 addition
and
10 deletion
+12
-10
app/models/merge_request.rb
app/models/merge_request.rb
+2
-1
app/models/project.rb
app/models/project.rb
+4
-3
app/views/projects/issues/_related_branches.html.haml
app/views/projects/issues/_related_branches.html.haml
+1
-1
db/fixtures/development/14_builds.rb
db/fixtures/development/14_builds.rb
+1
-1
lib/api/commit_statuses.rb
lib/api/commit_statuses.rb
+1
-1
spec/models/project_spec.rb
spec/models/project_spec.rb
+1
-1
spec/requests/api/commits_spec.rb
spec/requests/api/commits_spec.rb
+1
-1
spec/services/ci/image_for_build_service_spec.rb
spec/services/ci/image_for_build_service_spec.rb
+1
-1
未找到文件。
app/models/merge_request.rb
浏览文件 @
4b559c9a
...
...
@@ -666,7 +666,8 @@ class MergeRequest < ActiveRecord::Base
end
def
pipeline
@pipeline
||=
source_project
.
pipeline
(
diff_head_sha
,
source_branch
)
if
diff_head_sha
&&
source_project
return
unless
diff_head_sha
&&
source_project
@pipeline
||=
source_project
.
pipeline_for
(
source_branch
,
diff_head_sha
)
end
def
merge_commit
...
...
app/models/project.rb
浏览文件 @
4b559c9a
...
...
@@ -1086,12 +1086,13 @@ class Project < ActiveRecord::Base
!
namespace
.
share_with_group_lock
end
def
pipeline
(
sha
,
ref
)
def
pipeline
_for
(
ref
,
sha
)
pipelines
.
order
(
id: :desc
).
find_by
(
sha:
sha
,
ref:
ref
)
end
def
ensure_pipeline
(
sha
,
ref
,
current_user
=
nil
)
pipeline
(
sha
,
ref
)
||
pipelines
.
create
(
sha:
sha
,
ref:
ref
,
user:
current_user
)
def
ensure_pipeline
(
ref
,
sha
,
current_user
=
nil
)
pipeline_for
(
ref
,
sha
)
||
pipelines
.
create
(
sha:
sha
,
ref:
ref
,
user:
current_user
)
end
def
enable_ci
...
...
app/views/projects/issues/_related_branches.html.haml
浏览文件 @
4b559c9a
...
...
@@ -5,7 +5,7 @@
-
@related_branches
.
each
do
|
branch
|
%li
-
target
=
@project
.
repository
.
find_branch
(
branch
).
target
-
pipeline
=
@project
.
pipeline
(
target
.
sha
,
branch
)
if
target
-
pipeline
=
@project
.
pipeline
_for
(
branch
,
target
.
sha
)
if
target
-
if
pipeline
%span
.related-branch-ci-status
=
render_pipeline_status
(
pipeline
)
...
...
db/fixtures/development/14_builds.rb
浏览文件 @
4b559c9a
...
...
@@ -40,7 +40,7 @@ class Gitlab::Seeder::Builds
commits
=
@project
.
repository
.
commits
(
'master'
,
limit:
5
)
commits_sha
=
commits
.
map
{
|
commit
|
commit
.
raw
.
id
}
commits_sha
.
map
do
|
sha
|
@project
.
ensure_pipeline
(
sha
,
'master'
)
@project
.
ensure_pipeline
(
'master'
,
sha
)
end
rescue
[]
...
...
lib/api/commit_statuses.rb
浏览文件 @
4b559c9a
...
...
@@ -64,7 +64,7 @@ module API
ref
=
branches
.
first
end
pipeline
=
@project
.
ensure_pipeline
(
commit
.
sha
,
ref
,
current_user
)
pipeline
=
@project
.
ensure_pipeline
(
ref
,
commit
.
sha
,
current_user
)
name
=
params
[
:name
]
||
params
[
:context
]
status
=
GenericCommitStatus
.
running_or_pending
.
find_by
(
pipeline:
pipeline
,
name:
name
,
ref:
params
[
:ref
])
...
...
spec/models/project_spec.rb
浏览文件 @
4b559c9a
...
...
@@ -688,7 +688,7 @@ describe Project, models: true do
let
(
:project
)
{
create
:project
}
let
(
:pipeline
)
{
create
:ci_pipeline
,
project:
project
,
ref:
'master'
}
subject
{
project
.
pipeline
(
pipeline
.
sha
,
'master'
)
}
subject
{
project
.
pipeline
_for
(
'master'
,
pipeline
.
sha
)
}
it
{
is_expected
.
to
eq
(
pipeline
)
}
...
...
spec/requests/api/commits_spec.rb
浏览文件 @
4b559c9a
...
...
@@ -94,7 +94,7 @@ describe API::API, api: true do
end
it
"returns status for CI"
do
pipeline
=
project
.
ensure_pipeline
(
project
.
repository
.
commit
.
sha
,
'master'
)
pipeline
=
project
.
ensure_pipeline
(
'master'
,
project
.
repository
.
commit
.
sha
)
get
api
(
"/projects/
#{
project
.
id
}
/repository/commits/
#{
project
.
repository
.
commit
.
id
}
"
,
user
)
expect
(
response
).
to
have_http_status
(
200
)
expect
(
json_response
[
'status'
]).
to
eq
(
pipeline
.
status
)
...
...
spec/services/ci/image_for_build_service_spec.rb
浏览文件 @
4b559c9a
...
...
@@ -5,7 +5,7 @@ module Ci
let
(
:service
)
{
ImageForBuildService
.
new
}
let
(
:project
)
{
FactoryGirl
.
create
(
:empty_project
)
}
let
(
:commit_sha
)
{
'01234567890123456789'
}
let
(
:commit
)
{
project
.
ensure_pipeline
(
commit_sha
,
'master'
)
}
let
(
:commit
)
{
project
.
ensure_pipeline
(
'master'
,
commit_sha
)
}
let
(
:build
)
{
FactoryGirl
.
create
(
:ci_build
,
pipeline:
commit
)
}
describe
'#execute'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录