Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a1a1d1f7
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,发现更多精彩内容 >>
提交
a1a1d1f7
编写于
4月 07, 2016
作者:
J
James Lopez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactored create_or_update_import_data
上级
15044e7d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
10 addition
and
19 deletion
+10
-19
app/models/project.rb
app/models/project.rb
+7
-16
lib/gitlab/bitbucket_import/project_creator.rb
lib/gitlab/bitbucket_import/project_creator.rb
+1
-1
lib/gitlab/fogbugz_import/project_creator.rb
lib/gitlab/fogbugz_import/project_creator.rb
+1
-1
lib/gitlab/google_code_import/project_creator.rb
lib/gitlab/google_code_import/project_creator.rb
+1
-1
未找到文件。
app/models/project.rb
浏览文件 @
a1a1d1f7
...
...
@@ -404,7 +404,7 @@ class Project < ActiveRecord::Base
def
import_url
=
(
value
)
import_url
=
Gitlab
::
ImportUrl
.
new
(
value
)
create_or_update_import_data
(
import_url
.
credentials
)
create_or_update_import_data
(
credentials:
import_url
.
credentials
)
super
(
import_url
.
sanitized_url
)
end
...
...
@@ -417,26 +417,17 @@ class Project < ActiveRecord::Base
end
end
def
create_or_update_import_data
(
credentials
)
def
create_or_update_import_data
(
data:
nil
,
credentials:
nil
)
project_import_data
=
import_data
||
build_import_data
project_import_data
.
credentials
||=
{}
project_import_data
.
credentials
=
project_import_data
.
credentials
.
merge
(
credentials
)
project_import_data
.
save
end
project_import_data
.
data
=
data
if
data
if
credentials
project_import_data
.
credentials
||=
{}
project_import_data
.
credentials
=
project_import_data
.
credentials
.
merge
(
credentials
)
end
def
create_or_update_import_data
(
credentials
)
project_import_data
=
import_data
||
build_import_data
project_import_data
.
credentials
||=
{}
project_import_data
.
credentials
=
project_import_data
.
credentials
.
merge
(
credentials
)
project_import_data
.
save
end
def
update_import_data
(
data:
nil
,
credentials:
nil
)
import_data
.
data
=
data
if
data
import_data
.
credentials
=
import_data
.
credentials
.
merge
(
credentials
)
if
credentials
import_data
.
save
end
def
import?
external_import?
||
forked?
end
...
...
lib/gitlab/bitbucket_import/project_creator.rb
浏览文件 @
a1a1d1f7
...
...
@@ -23,7 +23,7 @@ module Gitlab
import_url:
"ssh://git@bitbucket.org/
#{
repo
[
"owner"
]
}
/
#{
repo
[
"slug"
]
}
.git"
,
).
execute
project
.
update_import_data
(
credentials:
{
bb_session:
session_data
})
project
.
create_or_
update_import_data
(
credentials:
{
bb_session:
session_data
})
project
end
...
...
lib/gitlab/fogbugz_import/project_creator.rb
浏览文件 @
a1a1d1f7
...
...
@@ -24,7 +24,7 @@ module Gitlab
import_url:
Project
::
UNKNOWN_IMPORT_URL
).
execute
project
.
update_import_data
(
data:
{
'repo'
=>
repo
.
raw_data
,
'user_map'
=>
user_map
},
credentials:
{
fb_session:
fb_session
})
project
.
create_or_
update_import_data
(
data:
{
'repo'
=>
repo
.
raw_data
,
'user_map'
=>
user_map
},
credentials:
{
fb_session:
fb_session
})
project
end
...
...
lib/gitlab/google_code_import/project_creator.rb
浏览文件 @
a1a1d1f7
...
...
@@ -24,7 +24,7 @@ module Gitlab
import_url:
repo
.
import_url
).
execute
project
.
update_import_data
(
data:
{
'repo'
=>
repo
.
raw_data
,
'user_map'
=>
user_map
})
project
.
create_or_
update_import_data
(
data:
{
'repo'
=>
repo
.
raw_data
,
'user_map'
=>
user_map
})
project
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录