Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
b4297573
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 搜索 >>
提交
b4297573
编写于
10月 15, 2018
作者:
M
Mark Chao
提交者:
Phil Hughes
10月 15, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Only display merge commit SHA when it exists
上级
0a89c0b8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
29 addition
and
12 deletion
+29
-12
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue
...rge_request_widget/components/states/mr_widget_merged.vue
+14
-12
changelogs/unreleased/48889-message-for-were-merged-into.yml
changelogs/unreleased/48889-message-for-were-merged-into.yml
+5
-0
spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js
.../vue_mr_widget/components/states/mr_widget_merged_spec.js
+10
-0
未找到文件。
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue
浏览文件 @
b4297573
...
...
@@ -162,18 +162,20 @@
<span
class=
"label-branch"
>
<a
:href=
"mr.targetBranchPath"
>
{{
mr
.
targetBranch
}}
</a>
</span>
with
<a
:href=
"mr.mergeCommitPath"
class=
"commit-sha js-mr-merged-commit-sha"
v-text=
"mr.shortMergeCommitSha"
>
</a>
<clipboard-button
:title=
"__('Copy commit SHA to clipboard')"
:text=
"mr.mergeCommitSha"
css-class=
"btn-default btn-transparent btn-clipboard js-mr-merged-copy-sha"
/>
<template
v-if=
"mr.mergeCommitSha"
>
with
<a
:href=
"mr.mergeCommitPath"
class=
"commit-sha js-mr-merged-commit-sha"
v-text=
"mr.shortMergeCommitSha"
>
</a>
<clipboard-button
:title=
"__('Copy commit SHA to clipboard')"
:text=
"mr.mergeCommitSha"
css-class=
"btn-default btn-transparent btn-clipboard js-mr-merged-copy-sha"
/>
</
template
>
</p>
<p
v-if=
"mr.sourceBranchRemoved"
>
{{ s__("mrWidget|The source branch has been removed") }}
...
...
changelogs/unreleased/48889-message-for-were-merged-into.yml
0 → 100644
浏览文件 @
b4297573
---
title
:
Fix 'merged with' UI being displayed when merge request has no merge commit
merge_request
:
22022
author
:
type
:
fixed
spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js
浏览文件 @
b4297573
...
...
@@ -157,6 +157,16 @@ describe('MRWidgetMerged', () => {
expect
(
selectors
.
copyMergeShaButton
.
getAttribute
(
'
data-clipboard-text
'
)).
toBe
(
vm
.
mr
.
mergeCommitSha
);
});
it
(
'
hides button to copy commit SHA if SHA does not exist
'
,
(
done
)
=>
{
vm
.
mr
.
mergeCommitSha
=
null
;
Vue
.
nextTick
(()
=>
{
expect
(
selectors
.
copyMergeShaButton
).
not
.
toExist
();
expect
(
vm
.
$el
.
querySelector
(
'
.mr-info-list
'
).
innerText
).
not
.
toContain
(
'
with
'
);
done
();
});
});
it
(
'
shows merge commit SHA link
'
,
()
=>
{
expect
(
selectors
.
mergeCommitShaLink
).
toExist
();
expect
(
selectors
.
mergeCommitShaLink
.
text
).
toContain
(
vm
.
mr
.
shortMergeCommitSha
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录