Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
8f0cef0b
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,发现更多精彩内容 >>
提交
8f0cef0b
编写于
12月 14, 2016
作者:
V
Valery Sizov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
BB importer: Refactoring user importing logic[ci skip]
上级
f20ea1f5
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
14 addition
and
22 deletion
+14
-22
lib/bitbucket/representation/base.rb
lib/bitbucket/representation/base.rb
+0
-4
lib/bitbucket/representation/comment.rb
lib/bitbucket/representation/comment.rb
+1
-1
lib/bitbucket/representation/issue.rb
lib/bitbucket/representation/issue.rb
+1
-1
lib/bitbucket/representation/pull_request.rb
lib/bitbucket/representation/pull_request.rb
+1
-1
lib/bitbucket/representation/user.rb
lib/bitbucket/representation/user.rb
+1
-5
lib/gitlab/bitbucket_import/importer.rb
lib/gitlab/bitbucket_import/importer.rb
+10
-10
未找到文件。
lib/bitbucket/representation/base.rb
浏览文件 @
8f0cef0b
...
...
@@ -5,10 +5,6 @@ module Bitbucket
@raw
=
raw
end
def
user_representation
(
raw
)
User
.
new
(
raw
)
end
def
self
.
decorate
(
entries
)
entries
.
map
{
|
entry
|
new
(
entry
)}
end
...
...
lib/bitbucket/representation/comment.rb
浏览文件 @
8f0cef0b
...
...
@@ -2,7 +2,7 @@ module Bitbucket
module
Representation
class
Comment
<
Representation
::
Base
def
author
user
_representation
(
user
)
user
[
'username'
]
end
def
note
...
...
lib/bitbucket/representation/issue.rb
浏览文件 @
8f0cef0b
...
...
@@ -12,7 +12,7 @@ module Bitbucket
end
def
author
user_representation
(
raw
.
fetch
(
'reporter'
,
{})
)
raw
.
dig
(
'reporter'
,
'username'
)
end
def
description
...
...
lib/bitbucket/representation/pull_request.rb
浏览文件 @
8f0cef0b
...
...
@@ -2,7 +2,7 @@ module Bitbucket
module
Representation
class
PullRequest
<
Representation
::
Base
def
author
user_representation
(
raw
.
fetch
(
'author'
,
{})
)
raw
.
dig
(
'author'
,
'username'
)
end
def
description
...
...
lib/bitbucket/representation/user.rb
浏览文件 @
8f0cef0b
...
...
@@ -2,11 +2,7 @@ module Bitbucket
module
Representation
class
User
<
Representation
::
Base
def
username
raw
[
'username'
]
||
'Anonymous'
end
def
uuid
raw
[
'uuid'
]
raw
[
'username'
]
end
end
end
...
...
lib/gitlab/bitbucket_import/importer.rb
浏览文件 @
8f0cef0b
...
...
@@ -24,21 +24,21 @@ module Gitlab
private
def
gitlab_user_id
(
project
,
user
)
if
user
.
uuid
user
=
find_user
_by_uuid
(
user
.
uuid
)
def
gitlab_user_id
(
project
,
user
name
)
if
user
name
user
=
find_user
(
username
)
(
user
&&
user
.
id
)
||
project
.
creator_id
else
project
.
creator_id
end
end
def
find_user
_by_uuid
(
uuid
)
User
.
joins
(
:identities
).
find_by
(
"identities.extern_uid = ? AND identities.provider = 'bitbucket'"
,
u
uid
)
def
find_user
(
username
)
User
.
joins
(
:identities
).
find_by
(
"identities.extern_uid = ? AND identities.provider = 'bitbucket'"
,
u
sername
)
end
def
existing_gitlab_user?
(
user
)
user
.
uuid
&&
find_user_by_uuid
(
user
.
uuid
)
def
existing_gitlab_user?
(
user
name
)
user
name
&&
find_user
(
username
)
end
def
repo
...
...
@@ -52,7 +52,7 @@ module Gitlab
client
.
issues
(
repo
).
each
do
|
issue
|
description
=
''
description
+=
@formatter
.
author_line
(
issue
.
author
.
username
)
unless
existing_gitlab_user?
(
issue
.
author
)
description
+=
@formatter
.
author_line
(
issue
.
author
)
unless
existing_gitlab_user?
(
issue
.
author
)
description
+=
issue
.
description
label_name
=
issue
.
kind
...
...
@@ -79,7 +79,7 @@ module Gitlab
next
unless
comment
.
note
.
present?
note
=
''
note
+=
@formatter
.
author_line
(
comment
.
author
.
username
)
unless
existing_gitlab_user?
(
comment
.
author
)
note
+=
@formatter
.
author_line
(
comment
.
author
)
unless
existing_gitlab_user?
(
comment
.
author
)
note
+=
comment
.
note
issue
.
notes
.
create!
(
...
...
@@ -108,7 +108,7 @@ module Gitlab
pull_requests
.
each
do
|
pull_request
|
begin
description
=
''
description
+=
@formatter
.
author_line
(
pull_request
.
author
.
username
)
unless
existing_gitlab_user?
(
pull_request
.
author
)
description
+=
@formatter
.
author_line
(
pull_request
.
author
)
unless
existing_gitlab_user?
(
pull_request
.
author
)
description
+=
pull_request
.
description
merge_request
=
project
.
merge_requests
.
create
(
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录