Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
7833d3fb
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,发现更多精彩内容 >>
未验证
提交
7833d3fb
编写于
10月 05, 2017
作者:
R
Rémy Coutable
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improve & simplify GitHub's representation classes
Signed-off-by:
N
Rémy Coutable
<
remy@rymai.me
>
上级
f50b95b0
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
17 deletion
+15
-17
lib/github/import.rb
lib/github/import.rb
+2
-2
lib/github/representation/branch.rb
lib/github/representation/branch.rb
+6
-8
lib/github/representation/issue.rb
lib/github/representation/issue.rb
+1
-1
lib/github/representation/pull_request.rb
lib/github/representation/pull_request.rb
+6
-6
未找到文件。
lib/github/import.rb
浏览文件 @
7833d3fb
...
...
@@ -211,7 +211,7 @@ module Github
# for both features, like manipulating assignees, labels
# and milestones, are provided within the Issues API.
if
representation
.
pull_request?
return
unless
representation
.
labels?
||
representation
.
has_
comments?
return
unless
representation
.
labels?
||
representation
.
comments?
merge_request
=
MergeRequest
.
find_by!
(
target_project_id:
project
.
id
,
iid:
representation
.
iid
)
...
...
@@ -248,7 +248,7 @@ module Github
end
def
fetch_comments_conditionally
(
issuable
,
representation
)
if
representation
.
has_
comments?
if
representation
.
comments?
comments_url
=
"/repos/
#{
repo
}
/issues/
#{
issuable
.
iid
}
/comments"
fetch_comments
(
issuable
,
:comment
,
comments_url
)
end
...
...
lib/github/representation/branch.rb
浏览文件 @
7833d3fb
...
...
@@ -7,10 +7,14 @@ module Github
raw
.
dig
(
'user'
,
'login'
)
||
'unknown'
end
def
repo?
raw
[
'repo'
].
present?
end
def
repo
return
@repo
if
defined?
(
@repo
)
return
unless
repo?
@repo
=
Github
::
Representation
::
Repo
.
new
(
raw
[
'repo'
])
if
raw
[
'repo'
].
present?
@repo
||=
Github
::
Representation
::
Repo
.
new
(
raw
[
'repo'
])
end
def
ref
...
...
@@ -25,12 +29,6 @@ module Github
Commit
.
truncate_sha
(
sha
)
end
def
exists?
return
@exists
if
defined?
(
@exists
)
@exists
=
repository
.
branch_exists?
(
ref
)
end
def
valid?
sha
.
present?
&&
ref
.
present?
end
...
...
lib/github/representation/issue.rb
浏览文件 @
7833d3fb
...
...
@@ -5,7 +5,7 @@ module Github
raw
[
'state'
]
==
'closed'
?
'closed'
:
'opened'
end
def
has_
comments?
def
comments?
raw
[
'comments'
]
>
0
end
...
...
lib/github/representation/pull_request.rb
浏览文件 @
7833d3fb
module
Github
module
Representation
class
PullRequest
<
Representation
::
Issuable
delegate
:
user
,
:repo
,
:ref
,
:
sha
,
to: :source_branch
,
prefix:
true
delegate
:
user
,
:exists?
,
:repo
,
:ref
,
:sha
,
:short_
sha
,
to: :target_branch
,
prefix:
true
delegate
:sha
,
to: :source_branch
,
prefix:
true
delegate
:sha
,
to: :target_branch
,
prefix:
true
def
source_project
project
...
...
@@ -11,7 +11,7 @@ module Github
def
source_branch_name
# Mimic the "user:branch" displayed in the MR widget,
# i.e. "Request to merge rymai:add-external-mounts into master"
cross_project?
?
"
#{
source_branch
_user
}
:
#{
source_branch_ref
}
"
:
source_branch_
ref
cross_project?
?
"
#{
source_branch
.
user
}
:
#{
source_branch
.
ref
}
"
:
source_branch
.
ref
end
def
target_project
...
...
@@ -19,7 +19,7 @@ module Github
end
def
target_branch_name
target_branch
_
ref
target_branch
.
ref
end
def
state
...
...
@@ -62,9 +62,9 @@ module Github
end
def
cross_project?
return
true
if
source_branch_repo
.
nil
?
return
true
unless
source_branch
.
repo
?
source_branch
_repo
.
id
!=
target_branch_
repo
.
id
source_branch
.
repo
.
id
!=
target_branch
.
repo
.
id
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录