Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
050f8896
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 搜索 >>
提交
050f8896
编写于
10月 17, 2019
作者:
G
GitLab Bot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add latest changes from gitlab-org/gitlab@master
上级
b7e6df1a
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
16 addition
and
32 deletion
+16
-32
app/assets/javascripts/monitoring/components/charts/time_series.vue
.../javascripts/monitoring/components/charts/time_series.vue
+6
-0
app/assets/javascripts/monitoring/components/embed.vue
app/assets/javascripts/monitoring/components/embed.vue
+1
-1
changelogs/unreleased/psi-indy-embed-zooms.yml
changelogs/unreleased/psi-indy-embed-zooms.yml
+5
-0
spec/features/boards/sidebar_spec.rb
spec/features/boards/sidebar_spec.rb
+0
-31
spec/frontend/monitoring/embed/embed_spec.js
spec/frontend/monitoring/embed/embed_spec.js
+4
-0
未找到文件。
app/assets/javascripts/monitoring/components/charts/time_series.vue
浏览文件 @
050f8896
...
...
@@ -63,6 +63,11 @@ export default {
required
:
false
,
default
:
s__
(
'
Metrics|Max
'
),
},
groupId
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
},
data
()
{
return
{
...
...
@@ -290,6 +295,7 @@ export default {
:is=
"glChartComponent"
ref=
"chart"
v-bind=
"$attrs"
:group-id=
"groupId"
:data=
"chartData"
:option=
"chartOptions"
:format-tooltip-text=
"formatTooltipText"
...
...
app/assets/javascripts/monitoring/components/embed.vue
浏览文件 @
050f8896
...
...
@@ -98,7 +98,7 @@ export default {
class=
"w-100"
:graph-data=
"graphData"
:container-width=
"elWidth"
group-id=
"monitor-area-chart
"
:group-id=
"dashboardUrl
"
:project-path=
"null"
:show-border=
"true"
:single-embed=
"isSingleChart"
...
...
changelogs/unreleased/psi-indy-embed-zooms.yml
0 → 100644
浏览文件 @
050f8896
---
title
:
Embed metrics time window scroll no longer affects other embeds
merge_request
:
18109
author
:
type
:
fixed
spec/features/boards/sidebar_spec.rb
浏览文件 @
050f8896
...
...
@@ -14,8 +14,6 @@ describe 'Issue Boards', :js do
let!
(
:bug
)
{
create
(
:label
,
project:
project
,
name:
'Bug'
)
}
let!
(
:regression
)
{
create
(
:label
,
project:
project
,
name:
'Regression'
)
}
let!
(
:stretch
)
{
create
(
:label
,
project:
project
,
name:
'Stretch'
)
}
let!
(
:scoped_label_1
)
{
create
(
:label
,
project:
project
,
name:
'Scoped::Label1'
)
}
let!
(
:scoped_label_2
)
{
create
(
:label
,
project:
project
,
name:
'Scoped::Label2'
)
}
let!
(
:issue1
)
{
create
(
:labeled_issue
,
project:
project
,
assignees:
[
user
],
milestone:
milestone
,
labels:
[
development
],
relative_position:
2
)
}
let!
(
:issue2
)
{
create
(
:labeled_issue
,
project:
project
,
labels:
[
development
,
stretch
],
relative_position:
1
)
}
let
(
:board
)
{
create
(
:board
,
project:
project
)
}
...
...
@@ -29,8 +27,6 @@ describe 'Issue Boards', :js do
end
before
do
stub_licensed_features
(
scoped_labels:
true
)
project
.
add_maintainer
(
user
)
sign_in
(
user
)
...
...
@@ -313,33 +309,6 @@ describe 'Issue Boards', :js do
expect
(
card
).
to
have_content
(
bug
.
title
)
end
it
'removes existing scoped label'
do
click_card
(
card
)
page
.
within
(
'.labels'
)
do
click_link
'Edit'
wait_for_requests
click_link
scoped_label_1
.
title
click_link
scoped_label_2
.
title
wait_for_requests
find
(
'.dropdown-menu-close-icon'
).
click
page
.
within
(
'.value'
)
do
expect
(
page
).
to
have_selector
(
'.scoped-label-wrapper'
,
count:
1
)
expect
(
page
).
not_to
have_content
(
scoped_label_1
.
title
)
expect
(
page
).
to
have_content
(
scoped_label_2
.
title
)
end
end
expect
(
card
).
to
have_selector
(
'.scoped-label-wrapper'
,
count:
1
)
expect
(
card
).
not_to
have_content
(
scoped_label_1
.
title
)
expect
(
card
).
to
have_content
(
scoped_label_2
.
title
)
end
it
'adds a multiple labels'
do
click_card
(
card
)
...
...
spec/frontend/monitoring/embed/embed_spec.js
浏览文件 @
050f8896
...
...
@@ -74,5 +74,9 @@ describe('Embed', () => {
expect
(
wrapper
.
find
(
MonitorTimeSeriesChart
).
exists
()).
toBe
(
true
);
expect
(
wrapper
.
findAll
(
MonitorTimeSeriesChart
).
length
).
toBe
(
2
);
});
it
(
'
includes groupId with dashboardUrl
'
,
()
=>
{
expect
(
wrapper
.
find
(
MonitorTimeSeriesChart
).
props
(
'
groupId
'
)).
toBe
(
TEST_HOST
);
});
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录