Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
62c14ba2
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,发现更多精彩内容 >>
提交
62c14ba2
编写于
12月 01, 2015
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Render commit reference using short sha, but include full sha in comment.
上级
bd4ab21c
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
58 addition
and
11 deletion
+58
-11
app/models/commit.rb
app/models/commit.rb
+8
-0
app/models/commit_range.rb
app/models/commit_range.rb
+8
-0
app/models/concerns/referable.rb
app/models/concerns/referable.rb
+4
-0
lib/gitlab/markdown/abstract_reference_filter.rb
lib/gitlab/markdown/abstract_reference_filter.rb
+1
-1
spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
...lib/gitlab/markdown/commit_range_reference_filter_spec.rb
+3
-3
spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
+1
-1
spec/models/commit_range_spec.rb
spec/models/commit_range_spec.rb
+19
-3
spec/models/commit_spec.rb
spec/models/commit_spec.rb
+14
-3
未找到文件。
app/models/commit.rb
浏览文件 @
62c14ba2
...
...
@@ -86,6 +86,14 @@ class Commit
end
def
to_reference
(
from_project
=
nil
)
if
cross_project_reference?
(
from_project
)
project
.
to_reference
+
self
.
class
.
reference_prefix
+
self
.
id
else
self
.
id
end
end
def
reference_link_text
(
from_project
=
nil
)
if
cross_project_reference?
(
from_project
)
project
.
to_reference
+
self
.
class
.
reference_prefix
+
self
.
short_id
else
...
...
app/models/commit_range.rb
浏览文件 @
62c14ba2
...
...
@@ -95,6 +95,14 @@ class CommitRange
alias_method
:id
,
:to_s
def
to_reference
(
from_project
=
nil
)
if
cross_project_reference?
(
from_project
)
reference
=
project
.
to_reference
+
self
.
class
.
reference_prefix
+
self
.
id
else
self
.
id
end
end
def
reference_link_text
(
from_project
=
nil
)
reference
=
ref_from
+
notation
+
ref_to
if
cross_project_reference?
(
from_project
)
...
...
app/models/concerns/referable.rb
浏览文件 @
62c14ba2
...
...
@@ -21,6 +21,10 @@ module Referable
''
end
def
reference_link_text
(
from_project
=
nil
)
to_reference
(
from_project
)
end
module
ClassMethods
# The character that prefixes the actual reference identifier
#
...
...
lib/gitlab/markdown/abstract_reference_filter.rb
浏览文件 @
62c14ba2
...
...
@@ -82,7 +82,7 @@ module Gitlab
data
=
data_attribute
(
project:
project
.
id
,
object_sym
=>
object
.
id
,
original:
match
)
url
=
matches
[
:url
]
||
url_for_object
(
object
,
project
)
text
=
object
.
to_reference
(
context
[
:project
])
text
=
object
.
reference_link_text
(
context
[
:project
])
extras
=
object_link_text_extras
(
object
,
matches
)
text
+=
" (
#{
extras
.
join
(
", "
)
}
)"
if
extras
.
any?
...
...
spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
浏览文件 @
62c14ba2
...
...
@@ -53,7 +53,7 @@ module Gitlab::Markdown
it
'links with adjacent text'
do
doc
=
filter
(
"See (
#{
reference
}
.)"
)
exp
=
Regexp
.
escape
(
range
.
to_reference
)
exp
=
Regexp
.
escape
(
range
.
reference_link_text
)
expect
(
doc
.
to_html
).
to
match
(
/\(<a.+>
#{
exp
}
<\/a>\.\)/
)
end
...
...
@@ -125,7 +125,7 @@ module Gitlab::Markdown
it
'links with adjacent text'
do
doc
=
filter
(
"Fixed (
#{
reference
}
.)"
)
exp
=
Regexp
.
escape
(
"
#{
project2
.
to_reference
}
@
#{
range
.
to_reference
}
"
)
exp
=
Regexp
.
escape
(
"
#{
project2
.
to_reference
}
@
#{
range
.
reference_link_text
}
"
)
expect
(
doc
.
to_html
).
to
match
(
/\(<a.+>
#{
exp
}
<\/a>\.\)/
)
end
...
...
@@ -163,7 +163,7 @@ module Gitlab::Markdown
it
'links with adjacent text'
do
doc
=
filter
(
"Fixed (
#{
reference
}
.)"
)
exp
=
Regexp
.
escape
(
range
.
to_reference
(
project
))
exp
=
Regexp
.
escape
(
range
.
reference_link_text
(
project
))
expect
(
doc
.
to_html
).
to
match
(
/\(<a.+>
#{
exp
}
<\/a>\.\)/
)
end
...
...
spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
浏览文件 @
62c14ba2
...
...
@@ -148,7 +148,7 @@ module Gitlab::Markdown
it
'links with adjacent text'
do
doc
=
filter
(
"Fixed (
#{
reference
}
.)"
)
expect
(
doc
.
to_html
).
to
match
(
/\(<a.+>
#{
commit
.
to_reference
(
project
)
}
<\/a>\.\)/
)
expect
(
doc
.
to_html
).
to
match
(
/\(<a.+>
#{
commit
.
reference_link_text
(
project
)
}
<\/a>\.\)/
)
end
it
'ignores invalid commit IDs on the referenced project'
do
...
...
spec/models/commit_range_spec.rb
浏览文件 @
62c14ba2
...
...
@@ -38,15 +38,31 @@ describe CommitRange do
let
(
:cross
)
{
create
(
:project
)
}
it
'returns a String reference to the object'
do
expect
(
range
.
to_reference
).
to
eq
"
#{
sha_from
}
...
#{
sha_to
}
"
expect
(
range
.
to_reference
).
to
eq
"
#{
full_sha_from
}
...
#{
full_
sha_to
}
"
end
it
'returns a String reference to the object'
do
expect
(
range2
.
to_reference
).
to
eq
"
#{
sha_from
}
..
#{
sha_to
}
"
expect
(
range2
.
to_reference
).
to
eq
"
#{
full_sha_from
}
..
#{
full_
sha_to
}
"
end
it
'supports a cross-project reference'
do
expect
(
range
.
to_reference
(
cross
)).
to
eq
"
#{
project
.
to_reference
}
@
#{
sha_from
}
...
#{
sha_to
}
"
expect
(
range
.
to_reference
(
cross
)).
to
eq
"
#{
project
.
to_reference
}
@
#{
full_sha_from
}
...
#{
full_sha_to
}
"
end
end
describe
'#reference_link_text'
do
let
(
:cross
)
{
create
(
:project
)
}
it
'returns a String reference to the object'
do
expect
(
range
.
reference_link_text
).
to
eq
"
#{
sha_from
}
...
#{
sha_to
}
"
end
it
'returns a String reference to the object'
do
expect
(
range2
.
reference_link_text
).
to
eq
"
#{
sha_from
}
..
#{
sha_to
}
"
end
it
'supports a cross-project reference'
do
expect
(
range
.
reference_link_text
(
cross
)).
to
eq
"
#{
project
.
to_reference
}
@
#{
sha_from
}
...
#{
sha_to
}
"
end
end
...
...
spec/models/commit_spec.rb
浏览文件 @
62c14ba2
...
...
@@ -15,12 +15,23 @@ describe Commit do
describe
'#to_reference'
do
it
'returns a String reference to the object'
do
expect
(
commit
.
to_reference
).
to
eq
commit
.
short_
id
expect
(
commit
.
to_reference
).
to
eq
commit
.
id
end
it
'supports a cross-project reference'
do
cross
=
double
(
'project'
)
expect
(
commit
.
to_reference
(
cross
)).
to
eq
"
#{
project
.
to_reference
}
@
#{
commit
.
short_id
}
"
expect
(
commit
.
to_reference
(
cross
)).
to
eq
"
#{
project
.
to_reference
}
@
#{
commit
.
id
}
"
end
end
describe
'#reference_link_text'
do
it
'returns a String reference to the object'
do
expect
(
commit
.
reference_link_text
).
to
eq
commit
.
short_id
end
it
'supports a cross-project reference'
do
cross
=
double
(
'project'
)
expect
(
commit
.
reference_link_text
(
cross
)).
to
eq
"
#{
project
.
to_reference
}
@
#{
commit
.
short_id
}
"
end
end
...
...
@@ -88,7 +99,7 @@ eos
subject
{
create
(
:project
).
commit
}
let
(
:author
)
{
create
(
:user
,
email:
subject
.
author_email
)
}
let
(
:backref_text
)
{
"commit
#{
subject
.
short_
id
}
"
}
let
(
:backref_text
)
{
"commit
#{
subject
.
id
}
"
}
let
(
:set_mentionable_text
)
do
->
(
txt
)
{
allow
(
subject
).
to
receive
(
:safe_message
).
and_return
(
txt
)
}
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录