Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
5b0210a0
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 搜索 >>
提交
5b0210a0
编写于
7月 10, 2018
作者:
S
Sean McGivern
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix ProcessCommitWorker when upstream project is deleted
上级
49d7f92f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
42 addition
and
8 deletion
+42
-8
app/workers/process_commit_worker.rb
app/workers/process_commit_worker.rb
+3
-2
changelogs/unreleased/45592-nomethoderror-undefined-method-commit-for-nil-nilclass-in-sidekiq-caused-by-a-merge-commit-in-a-forked-project-with-upstream-project-deleted.yml
...mit-in-a-forked-project-with-upstream-project-deleted.yml
+5
-0
spec/workers/process_commit_worker_spec.rb
spec/workers/process_commit_worker_spec.rb
+34
-6
未找到文件。
app/workers/process_commit_worker.rb
浏览文件 @
5b0210a0
...
...
@@ -79,9 +79,10 @@ class ProcessCommitWorker
# Avoid reprocessing commits that already exist in the upstream
# when project is forked. This will also prevent duplicated system notes.
def
commit_exists_in_upstream?
(
project
,
commit_hash
)
return
false
unless
project
.
forked?
upstream_project
=
project
.
fork_source
return
false
unless
upstream_project
upstream_project
=
project
.
forked_from_project
commit_id
=
commit_hash
.
with_indifferent_access
[
:id
]
upstream_project
.
commit
(
commit_id
).
present?
end
...
...
changelogs/unreleased/45592-nomethoderror-undefined-method-commit-for-nil-nilclass-in-sidekiq-caused-by-a-merge-commit-in-a-forked-project-with-upstream-project-deleted.yml
0 → 100644
浏览文件 @
5b0210a0
---
title
:
Process commits as normal in forks when the upstream project is deleted
merge_request
:
20534
author
:
type
:
fixed
spec/workers/process_commit_worker_spec.rb
浏览文件 @
5b0210a0
require
'spec_helper'
describe
ProcessCommitWorker
do
include
ProjectForksHelper
let
(
:worker
)
{
described_class
.
new
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
,
:public
,
:repository
)
}
...
...
@@ -32,15 +34,41 @@ describe ProcessCommitWorker do
worker
.
perform
(
project
.
id
,
user
.
id
,
commit
.
to_hash
)
end
context
'when commit already exists in upstream project'
do
let
(
:forked
)
{
create
(
:project
,
:public
,
:repository
)
}
context
'when the project is forked'
do
context
'when commit already exists in the upstream project'
do
it
'does not process the commit message'
do
forked
=
fork_project
(
project
,
user
,
repository:
true
)
expect
(
worker
).
not_to
receive
(
:process_commit_message
)
worker
.
perform
(
forked
.
id
,
user
.
id
,
forked
.
commit
.
to_hash
)
end
end
context
'when the commit does not exist in the upstream project'
do
it
'processes the commit message'
do
empty_project
=
create
(
:project
,
:public
)
forked
=
fork_project
(
empty_project
,
user
,
repository:
true
)
TestEnv
.
copy_repo
(
forked
,
bare_repo:
TestEnv
.
factory_repo_path_bare
,
refs:
TestEnv
::
BRANCH_SHA
)
expect
(
worker
).
to
receive
(
:process_commit_message
)
worker
.
perform
(
forked
.
id
,
user
.
id
,
forked
.
commit
.
to_hash
)
end
end
it
'does not process commit message'
do
create
(
:forked_project_link
,
forked_to_project:
forked
,
forked_from_project:
project
)
context
'when the upstream project no longer exists'
do
it
'processes the commit message'
do
forked
=
fork_project
(
project
,
user
,
repository:
true
)
project
.
destroy!
expect
(
worker
).
not_
to
receive
(
:process_commit_message
)
expect
(
worker
).
to
receive
(
:process_commit_message
)
worker
.
perform
(
forked
.
id
,
user
.
id
,
forked
.
commit
.
to_hash
)
worker
.
perform
(
forked
.
id
,
user
.
id
,
forked
.
commit
.
to_hash
)
end
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录