Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
291bd873
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,发现更多精彩内容 >>
提交
291bd873
编写于
3月 17, 2017
作者:
G
Gabriel Mazetto
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
One more change to the branch names to preserve metadata
上级
59588eba
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
9 addition
and
9 deletion
+9
-9
lib/gitlab/github_import/pull_request_formatter.rb
lib/gitlab/github_import/pull_request_formatter.rb
+2
-2
spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
+7
-7
未找到文件。
lib/gitlab/github_import/pull_request_formatter.rb
浏览文件 @
291bd873
...
...
@@ -47,7 +47,7 @@ module Gitlab
end
def
source_branch_name_prefixed
"gh-
#{
target_branch_short_sha
}
/
#{
number
}
"
"gh-
#{
target_branch_short_sha
}
/
#{
number
}
/
#{
source_branch_user
}
/
#{
source_branch_ref
}
"
end
def
source_branch_exists?
...
...
@@ -67,7 +67,7 @@ module Gitlab
end
def
target_branch_name_prefixed
"gl-
#{
target_branch_short_sha
}
/
#{
number
}
"
"gl-
#{
target_branch_short_sha
}
/
#{
number
}
/
#{
target_branch_user
}
/
#{
target_branch_ref
}
"
end
def
cross_project?
...
...
spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
浏览文件 @
291bd873
...
...
@@ -12,9 +12,9 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
let
(
:source_branch
)
{
double
(
ref:
'branch-merged'
,
repo:
source_repo
,
sha:
source_sha
)
}
let
(
:forked_source_repo
)
{
double
(
id:
2
,
fork:
true
,
name:
'otherproject'
,
full_name:
'company/otherproject'
)
}
let
(
:target_repo
)
{
repository
}
let
(
:target_branch
)
{
double
(
ref:
'master'
,
repo:
target_repo
,
sha:
target_sha
)
}
let
(
:removed_branch
)
{
double
(
ref:
'removed-branch'
,
repo:
source_repo
,
sha:
'2e5d3239642f9161dcbbc4b70a211a68e5e45e2b'
)
}
let
(
:forked_branch
)
{
double
(
ref:
'master'
,
repo:
forked_source_repo
,
sha:
'2e5d3239642f9161dcbbc4b70a211a68e5e45e2b'
)
}
let
(
:target_branch
)
{
double
(
ref:
'master'
,
repo:
target_repo
,
sha:
target_sha
,
user:
octocat
)
}
let
(
:removed_branch
)
{
double
(
ref:
'removed-branch'
,
repo:
source_repo
,
sha:
'2e5d3239642f9161dcbbc4b70a211a68e5e45e2b'
,
user:
octocat
)
}
let
(
:forked_branch
)
{
double
(
ref:
'master'
,
repo:
forked_source_repo
,
sha:
'2e5d3239642f9161dcbbc4b70a211a68e5e45e2b'
,
user:
octocat
)
}
let
(
:branch_deleted_repo
)
{
double
(
ref:
'master'
,
repo:
nil
,
sha:
'2e5d3239642f9161dcbbc4b70a211a68e5e45e2b'
,
user:
octocat
)
}
let
(
:octocat
)
{
double
(
id:
123456
,
login:
'octocat'
,
email:
'octocat@example.com'
)
}
let
(
:created_at
)
{
DateTime
.
strptime
(
'2011-01-26T19:01:12Z'
)
}
...
...
@@ -207,7 +207,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
let
(
:raw_data
)
{
double
(
base_data
.
merge
(
head:
removed_branch
))
}
it
'prefixes branch name with to avoid collision'
do
expect
(
pull_request
.
source_branch_name
).
to
eq
"gh-
#{
target_short_sha
}
/1347"
expect
(
pull_request
.
source_branch_name
).
to
eq
"gh-
#{
target_short_sha
}
/1347
/octocat/removed-branch
"
end
end
...
...
@@ -215,7 +215,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
let
(
:raw_data
)
{
double
(
base_data
.
merge
(
head:
forked_branch
))
}
it
'prefixes branch name with to avoid collision'
do
expect
(
pull_request
.
source_branch_name
).
to
eq
"gh-
#{
target_short_sha
}
/1347"
expect
(
pull_request
.
source_branch_name
).
to
eq
"gh-
#{
target_short_sha
}
/1347
/octocat/master
"
end
end
...
...
@@ -223,7 +223,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
let
(
:raw_data
)
{
double
(
base_data
.
merge
(
head:
branch_deleted_repo
))
}
it
'prefixes branch name with to avoid collision'
do
expect
(
pull_request
.
source_branch_name
).
to
eq
"gh-
#{
target_short_sha
}
/1347"
expect
(
pull_request
.
source_branch_name
).
to
eq
"gh-
#{
target_short_sha
}
/1347
/octocat/master
"
end
end
end
...
...
@@ -241,7 +241,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
let
(
:raw_data
)
{
double
(
base_data
.
merge
(
base:
removed_branch
))
}
it
'prefixes branch name with to avoid collision'
do
expect
(
pull_request
.
target_branch_name
).
to
eq
'gl-2e5d3239/1347'
expect
(
pull_request
.
target_branch_name
).
to
eq
'gl-2e5d3239/1347
/octocat/removed-branch
'
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录