Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
7407dfdc
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,发现更多精彩内容 >>
提交
7407dfdc
编写于
1月 16, 2019
作者:
N
Natalia Tepluhina
提交者:
Douwe Maan
1月 16, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Resolve "In Merge Request diff screen, master is not a hyperlink"
上级
eec16ee2
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
92 addition
and
30 deletion
+92
-30
app/assets/javascripts/diffs/components/compare_versions.vue
app/assets/javascripts/diffs/components/compare_versions.vue
+4
-0
app/assets/javascripts/diffs/components/compare_versions_dropdown.vue
...avascripts/diffs/components/compare_versions_dropdown.vue
+8
-6
app/serializers/merge_request_diff_entity.rb
app/serializers/merge_request_diff_entity.rb
+8
-0
changelogs/unreleased/52275-fix-master-to-be-hyperlink.yml
changelogs/unreleased/52275-fix-master-to-be-hyperlink.yml
+5
-0
spec/javascripts/diffs/components/compare_versions_dropdown_spec.js
...cripts/diffs/components/compare_versions_dropdown_spec.js
+33
-0
spec/javascripts/diffs/components/compare_versions_spec.js
spec/javascripts/diffs/components/compare_versions_spec.js
+6
-0
spec/javascripts/diffs/mock_data/merge_request_diffs.js
spec/javascripts/diffs/mock_data/merge_request_diffs.js
+28
-24
未找到文件。
app/assets/javascripts/diffs/components/compare_versions.vue
浏览文件 @
7407dfdc
...
...
@@ -54,6 +54,9 @@ export default {
showDropdowns
()
{
return
!
this
.
commit
&&
this
.
mergeRequestDiffs
.
length
;
},
baseVersionPath
()
{
return
this
.
mergeRequestDiff
.
base_version_path
;
},
},
methods
:
{
...
mapActions
(
'
diffs
'
,
[
...
...
@@ -95,6 +98,7 @@ export default {
and
<compare-versions-dropdown
:other-versions=
"comparableDiffs"
:base-version-path=
"baseVersionPath"
:start-version=
"startVersion"
:target-branch=
"targetBranch"
class=
"mr-version-compare-dropdown"
...
...
app/assets/javascripts/diffs/components/compare_versions_dropdown.vue
浏览文件 @
7407dfdc
...
...
@@ -34,14 +34,13 @@ export default {
required
:
false
,
default
:
false
,
},
baseVersionPath
:
{
type
:
String
,
required
:
false
,
default
:
null
,
},
},
computed
:
{
baseVersion
()
{
return
{
name
:
'
hii
'
,
versionIndex
:
-
1
,
};
},
targetVersions
()
{
if
(
this
.
mergeRequestVersion
)
{
return
this
.
otherVersions
;
...
...
@@ -62,6 +61,9 @@ export default {
);
},
href
(
version
)
{
if
(
this
.
isBase
(
version
))
{
return
this
.
baseVersionPath
;
}
if
(
this
.
showCommitCount
)
{
return
version
.
version_path
;
}
...
...
app/serializers/merge_request_diff_entity.rb
浏览文件 @
7407dfdc
...
...
@@ -24,6 +24,14 @@ class MergeRequestDiffEntity < Grape::Entity
short_sha
(
merge_request_diff
.
head_commit_sha
)
end
expose
:base_version_path
do
|
merge_request_diff
|
project
=
merge_request
.
target_project
next
unless
project
merge_request_version_path
(
project
,
merge_request
,
merge_request_diff
)
end
expose
:version_path
do
|
merge_request_diff
|
start_sha
=
options
[
:start_sha
]
project
=
merge_request
.
target_project
...
...
changelogs/unreleased/52275-fix-master-to-be-hyperlink.yml
0 → 100644
浏览文件 @
7407dfdc
---
title
:
Resolve In Merge Request diff screen, master is not a hyperlink
merge_request
:
23874
author
:
type
:
fixed
spec/javascripts/diffs/components/compare_versions_dropdown_spec.js
浏览文件 @
7407dfdc
// TODO: https://gitlab.com/gitlab-org/gitlab-ce/issues/48034
import
{
shallowMount
,
createLocalVue
}
from
'
@vue/test-utils
'
;
import
CompareVersionsDropdown
from
'
~/diffs/components/compare_versions_dropdown.vue
'
;
import
diffsMockData
from
'
../mock_data/merge_request_diffs
'
;
describe
(
'
CompareVersionsDropdown
'
,
()
=>
{
let
wrapper
;
const
targetBranch
=
{
branchName
:
'
tmp-wine-dev
'
,
versionIndex
:
-
1
};
const
factory
=
(
options
=
{})
=>
{
const
localVue
=
createLocalVue
();
wrapper
=
shallowMount
(
CompareVersionsDropdown
,
{
localVue
,
...
options
});
};
afterEach
(()
=>
{
wrapper
.
destroy
();
});
it
(
'
should render a correct base version link
'
,
()
=>
{
factory
({
propsData
:
{
baseVersionPath
:
'
/gnuwget/wget2/merge_requests/6/diffs?diff_id=37
'
,
otherVersions
:
diffsMockData
.
slice
(
1
),
targetBranch
,
},
});
const
links
=
wrapper
.
findAll
(
'
a
'
);
const
lastLink
=
links
.
wrappers
[
links
.
length
-
1
];
expect
(
lastLink
.
attributes
(
'
href
'
)).
toEqual
(
wrapper
.
props
(
'
baseVersionPath
'
));
});
});
spec/javascripts/diffs/components/compare_versions_spec.js
浏览文件 @
7407dfdc
...
...
@@ -100,6 +100,12 @@ describe('CompareVersions', () => {
});
});
describe
(
'
baseVersionPath
'
,
()
=>
{
it
(
'
should be set correctly from mergeRequestDiff
'
,
()
=>
{
expect
(
vm
.
baseVersionPath
).
toEqual
(
vm
.
mergeRequestDiff
.
base_version_path
);
});
});
describe
(
'
isWhitespaceVisible
'
,
()
=>
{
const
originalHref
=
window
.
location
.
href
;
...
...
spec/javascripts/diffs/mock_data/merge_request_diffs.js
浏览文件 @
7407dfdc
export
default
[
{
versionIndex
:
4
,
createdAt
:
'
2018-10-23T11:49:16.611Z
'
,
commitsCount
:
4
,
base_version_path
:
'
/gnuwget/wget2/merge_requests/6/diffs?diff_id=37
'
,
version_index
:
4
,
created_at
:
'
2018-10-23T11:49:16.611Z
'
,
commits_count
:
4
,
latest
:
true
,
short
CommitS
ha
:
'
de7a8f7f
'
,
version
P
ath
:
'
/gnuwget/wget2/merge_requests/6/diffs?diff_id=37
'
,
compare
P
ath
:
short
_commit_s
ha
:
'
de7a8f7f
'
,
version
_p
ath
:
'
/gnuwget/wget2/merge_requests/6/diffs?diff_id=37
'
,
compare
_p
ath
:
'
/gnuwget/wget2/merge_requests/6/diffs?diff_id=37&start_sha=de7a8f7f20c3ea2e0bef3ba01cfd41c21f6b4995
'
,
},
{
versionIndex
:
3
,
createdAt
:
'
2018-10-23T11:46:40.617Z
'
,
commitsCount
:
3
,
base_version_path
:
'
/gnuwget/wget2/merge_requests/6/diffs?diff_id=36
'
,
version_index
:
3
,
created_at
:
'
2018-10-23T11:46:40.617Z
'
,
commits_count
:
3
,
latest
:
false
,
short
CommitS
ha
:
'
e78fc18f
'
,
version
P
ath
:
'
/gnuwget/wget2/merge_requests/6/diffs?diff_id=36
'
,
compare
P
ath
:
short
_commit_s
ha
:
'
e78fc18f
'
,
version
_p
ath
:
'
/gnuwget/wget2/merge_requests/6/diffs?diff_id=36
'
,
compare
_p
ath
:
'
/gnuwget/wget2/merge_requests/6/diffs?diff_id=37&start_sha=e78fc18fa37acb2185c59ca94d4a964464feb50e
'
,
},
{
versionIndex
:
2
,
createdAt
:
'
2018-10-04T09:57:39.648Z
'
,
commitsCount
:
2
,
base_version_path
:
'
/gnuwget/wget2/merge_requests/6/diffs?diff_id=35
'
,
version_index
:
2
,
created_at
:
'
2018-10-04T09:57:39.648Z
'
,
commits_count
:
2
,
latest
:
false
,
short
CommitS
ha
:
'
48da7e7e
'
,
version
P
ath
:
'
/gnuwget/wget2/merge_requests/6/diffs?diff_id=35
'
,
compare
P
ath
:
short
_commit_s
ha
:
'
48da7e7e
'
,
version
_p
ath
:
'
/gnuwget/wget2/merge_requests/6/diffs?diff_id=35
'
,
compare
_p
ath
:
'
/gnuwget/wget2/merge_requests/6/diffs?diff_id=37&start_sha=48da7e7e9a99d41c852578bd9cb541ca4d864b3e
'
,
},
{
versionIndex
:
1
,
createdAt
:
'
2018-09-25T20:30:39.493Z
'
,
commitsCount
:
1
,
base_version_path
:
'
/gnuwget/wget2/merge_requests/6/diffs?diff_id=20
'
,
version_index
:
1
,
created_at
:
'
2018-09-25T20:30:39.493Z
'
,
commits_count
:
1
,
latest
:
false
,
short
CommitS
ha
:
'
47bac2ed
'
,
version
P
ath
:
'
/gnuwget/wget2/merge_requests/6/diffs?diff_id=20
'
,
compare
P
ath
:
short
_commit_s
ha
:
'
47bac2ed
'
,
version
_p
ath
:
'
/gnuwget/wget2/merge_requests/6/diffs?diff_id=20
'
,
compare
_p
ath
:
'
/gnuwget/wget2/merge_requests/6/diffs?diff_id=37&start_sha=47bac2ed972c5bee344c1cea159a22cd7f711dc0
'
,
},
];
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录