Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c6707291
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,发现更多精彩内容 >>
提交
c6707291
编写于
5月 23, 2019
作者:
L
Luke Picciau
提交者:
Sean McGivern
5月 23, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Change system notes to use relative urls
上级
b02c2583
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
8 deletion
+13
-8
app/services/system_note_service.rb
app/services/system_note_service.rb
+6
-6
changelogs/unreleased/relative-urls-for-system-notes.yml
changelogs/unreleased/relative-urls-for-system-notes.yml
+5
-0
spec/services/system_note_service_spec.rb
spec/services/system_note_service_spec.rb
+2
-2
未找到文件。
app/services/system_note_service.rb
浏览文件 @
c6707291
...
...
@@ -25,7 +25,7 @@ module SystemNoteService
text_parts
=
[
"added
#{
commits_text
}
"
]
text_parts
<<
commits_list
(
noteable
,
new_commits
,
existing_commits
,
oldrev
)
text_parts
<<
"[Compare with previous version](
#{
diff_comparison_
url
(
noteable
,
project
,
oldrev
)
}
)"
text_parts
<<
"[Compare with previous version](
#{
diff_comparison_
path
(
noteable
,
project
,
oldrev
)
}
)"
body
=
text_parts
.
join
(
"
\n\n
"
)
...
...
@@ -41,7 +41,7 @@ module SystemNoteService
#
# Returns the created Note object
def
tag_commit
(
noteable
,
project
,
author
,
tag_name
)
link
=
url_helpers
.
project_tag_
url
(
project
,
id:
tag_name
)
link
=
url_helpers
.
project_tag_
path
(
project
,
id:
tag_name
)
body
=
"tagged commit
#{
noteable
.
sha
}
to [`
#{
tag_name
}
`](
#{
link
}
)"
create_note
(
NoteSummary
.
new
(
noteable
,
project
,
author
,
body
,
action:
'tag'
))
...
...
@@ -272,7 +272,7 @@ module SystemNoteService
text_parts
=
[
"changed this line in"
]
if
version_params
=
merge_request
.
version_params_for
(
diff_refs
)
line_code
=
change_position
.
line_code
(
project
.
repository
)
url
=
url_helpers
.
diffs_project_merge_request_
url
(
project
,
merge_request
,
version_params
.
merge
(
anchor:
line_code
))
url
=
url_helpers
.
diffs_project_merge_request_
path
(
project
,
merge_request
,
version_params
.
merge
(
anchor:
line_code
))
text_parts
<<
"[version
#{
version_index
}
of the diff](
#{
url
}
)"
else
...
...
@@ -405,7 +405,7 @@ module SystemNoteService
#
# "created branch `201-issue-branch-button`"
def
new_issue_branch
(
issue
,
project
,
author
,
branch
)
link
=
url_helpers
.
project_compare_
url
(
project
,
from:
project
.
default_branch
,
to:
branch
)
link
=
url_helpers
.
project_compare_
path
(
project
,
from:
project
.
default_branch
,
to:
branch
)
body
=
"created branch [`
#{
branch
}
`](
#{
link
}
) to address this issue"
...
...
@@ -668,10 +668,10 @@ module SystemNoteService
@url_helpers
||=
Gitlab
::
Routing
.
url_helpers
end
def
diff_comparison_
url
(
merge_request
,
project
,
oldrev
)
def
diff_comparison_
path
(
merge_request
,
project
,
oldrev
)
diff_id
=
merge_request
.
merge_request_diff
.
id
url_helpers
.
diffs_project_merge_request_
url
(
url_helpers
.
diffs_project_merge_request_
path
(
project
,
merge_request
,
diff_id:
diff_id
,
...
...
changelogs/unreleased/relative-urls-for-system-notes.yml
0 → 100644
浏览文件 @
c6707291
---
title
:
Change links in system notes to use relative paths
merge_request
:
28588
author
:
Luke Picciau
type
:
fixed
spec/services/system_note_service_spec.rb
浏览文件 @
c6707291
...
...
@@ -132,7 +132,7 @@ describe SystemNoteService do
end
it
'sets the note text'
do
link
=
"
http://localhost
/
#{
project
.
full_path
}
/-/tags/
#{
tag_name
}
"
link
=
"/
#{
project
.
full_path
}
/-/tags/
#{
tag_name
}
"
expect
(
subject
.
note
).
to
eq
"tagged commit
#{
noteable
.
sha
}
to [`
#{
tag_name
}
`](
#{
link
}
)"
end
...
...
@@ -1139,7 +1139,7 @@ describe SystemNoteService do
diff_id
=
merge_request
.
merge_request_diff
.
id
line_code
=
change_position
.
line_code
(
project
.
repository
)
expect
(
subject
.
note
).
to
include
(
diffs_project_merge_request_
url
(
project
,
merge_request
,
diff_id:
diff_id
,
anchor:
line_code
))
expect
(
subject
.
note
).
to
include
(
diffs_project_merge_request_
path
(
project
,
merge_request
,
diff_id:
diff_id
,
anchor:
line_code
))
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录