Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
e44016b9
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 搜索 >>
提交
e44016b9
编写于
5月 18, 2017
作者:
F
Felipe Artur
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Prevent commits from upstream repositories to be re-processed by forks
上级
258f578f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
29 addition
and
0 deletion
+29
-0
app/workers/process_commit_worker.rb
app/workers/process_commit_worker.rb
+13
-0
changelogs/unreleased/issue_19262.yml
changelogs/unreleased/issue_19262.yml
+4
-0
spec/workers/process_commit_worker_spec.rb
spec/workers/process_commit_worker_spec.rb
+12
-0
未找到文件。
app/workers/process_commit_worker.rb
浏览文件 @
e44016b9
...
...
@@ -17,6 +17,7 @@ class ProcessCommitWorker
project
=
Project
.
find_by
(
id:
project_id
)
return
unless
project
return
if
commit_exists_in_upstream?
(
project
,
commit_hash
)
user
=
User
.
find_by
(
id:
user_id
)
...
...
@@ -76,4 +77,16 @@ class ProcessCommitWorker
Commit
.
from_hash
(
hash
,
project
)
end
private
# Avoid to re-process commits messages that already exists 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
.
forked_from_project
commit_id
=
commit_hash
.
with_indifferent_access
[
:id
]
upstream_project
.
commit
(
commit_id
).
present?
end
end
changelogs/unreleased/issue_19262.yml
0 → 100644
浏览文件 @
e44016b9
---
title
:
Prevent commits from upstream repositories to be re-processed by forks
merge_request
:
author
:
spec/workers/process_commit_worker_spec.rb
浏览文件 @
e44016b9
...
...
@@ -39,6 +39,18 @@ 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
)
}
it
'does not process commit message'
do
create
(
:forked_project_link
,
forked_to_project:
forked
,
forked_from_project:
project
)
expect
(
worker
).
not_to
receive
(
:process_commit_message
)
worker
.
perform
(
forked
.
id
,
user
.
id
,
forked
.
commit
.
to_hash
)
end
end
end
describe
'#process_commit_message'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录