Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6419fe36
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,体验更适合开发者的 AI 搜索 >>
提交
6419fe36
编写于
9月 01, 2016
作者:
B
Brian Kintz
提交者:
Rémy Coutable
11月 02, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use the server's base URL without relative URL part when creating links in JIRA
Signed-off-by:
N
Rémy Coutable
<
remy@rymai.me
>
上级
d7859912
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
24 addition
and
1 deletion
+24
-1
CHANGELOG.md
CHANGELOG.md
+1
-0
app/models/project_services/jira_service.rb
app/models/project_services/jira_service.rb
+1
-1
spec/models/project_services/jira_service_spec.rb
spec/models/project_services/jira_service_spec.rb
+22
-0
未找到文件。
CHANGELOG.md
浏览文件 @
6419fe36
...
...
@@ -29,6 +29,7 @@ Please view this file on the master branch, on stable branches it's out of date.
-
Do not show tooltip for active element !7105 (winniehell)
-
Escape ref and path for relative links !6050 (winniehell)
-
Fixed link typo on /help/ui to Alerts section. !6915 (Sam Rose)
-
Fix broken issue/merge request links in JIRA comments. !6143 (Brian Kintz)
-
Fix filtering of milestones with quotes in title (airatshigapov)
-
Refactor less readable existance checking code from CoffeeScript !6289 (jlogandavison)
-
Update mail_room and enable sentinel support to Reply By Email (!7101)
...
...
app/models/project_services/jira_service.rb
浏览文件 @
6419fe36
...
...
@@ -237,7 +237,7 @@ class JiraService < IssueTrackerService
end
def
resource_url
(
resource
)
"
#{
Settings
.
gitlab
[
'url'
]
.
chomp
(
"/"
)
}#{
resource
}
"
"
#{
Settings
.
gitlab
.
base_url
.
chomp
(
"/"
)
}#{
resource
}
"
end
def
build_entity_url
(
entity_name
,
entity_id
)
...
...
spec/models/project_services/jira_service_spec.rb
浏览文件 @
6419fe36
require
'spec_helper'
include
Gitlab
::
Routing
.
url_helpers
describe
JiraService
,
models:
true
do
describe
"Associations"
do
...
...
@@ -66,6 +67,27 @@ describe JiraService, models: true do
).
once
end
it
"references the GitLab commit/merge request"
do
@jira_service
.
execute
(
merge_request
,
ExternalIssue
.
new
(
"JIRA-123"
,
project
))
expect
(
WebMock
).
to
have_requested
(
:post
,
@comment_url
).
with
(
body:
/
#{
Gitlab
.
config
.
gitlab
.
url
}
\/
#{
project
.
path_with_namespace
}
\/commit\/
#{
merge_request
.
diff_head_sha
}
/
).
once
end
it
"references the GitLab commit/merge request (relative URL)"
do
stub_config_setting
(
relative_url_root:
'/gitlab'
)
stub_config_setting
(
url:
Settings
.
send
(
:build_gitlab_url
))
Project
.
default_url_options
[
:script_name
]
=
"/gitlab"
@jira_service
.
execute
(
merge_request
,
ExternalIssue
.
new
(
"JIRA-123"
,
project
))
expect
(
WebMock
).
to
have_requested
(
:post
,
@comment_url
).
with
(
body:
/
#{
Gitlab
.
config
.
gitlab
.
url
}
\/
#{
project
.
path_with_namespace
}
\/commit\/
#{
merge_request
.
diff_head_sha
}
/
).
once
end
it
"calls the api with jira_issue_transition_id"
do
@jira_service
.
jira_issue_transition_id
=
'this-is-a-custom-id'
@jira_service
.
execute
(
merge_request
,
ExternalIssue
.
new
(
"JIRA-123"
,
project
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录