Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d36aa74e
Commit
d36aa74e
authored
May 08, 2020
by
Mikolaj Wawrzyniak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use iso8601 timestamps in annotation grapql
To assure firefox compatibility we should use iso stadard fromat
parent
56f2d758
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
9 deletions
+15
-9
app/graphql/types/metrics/dashboards/annotation_type.rb
app/graphql/types/metrics/dashboards/annotation_type.rb
+2
-2
changelogs/unreleased/mwaw-216963-annotations-missing-from-metric-charts.yml
...ed/mwaw-216963-annotations-missing-from-metric-charts.yml
+6
-0
doc/api/graphql/reference/gitlab_schema.graphql
doc/api/graphql/reference/gitlab_schema.graphql
+2
-2
doc/api/graphql/reference/gitlab_schema.json
doc/api/graphql/reference/gitlab_schema.json
+2
-2
doc/api/graphql/reference/index.md
doc/api/graphql/reference/index.md
+2
-2
spec/requests/api/graphql/metrics/dashboard/annotations_spec.rb
...equests/api/graphql/metrics/dashboard/annotations_spec.rb
+1
-1
No files found.
app/graphql/types/metrics/dashboards/annotation_type.rb
View file @
d36aa74e
...
@@ -16,10 +16,10 @@ module Types
...
@@ -16,10 +16,10 @@ module Types
field
:panel_id
,
GraphQL
::
STRING_TYPE
,
null:
true
,
field
:panel_id
,
GraphQL
::
STRING_TYPE
,
null:
true
,
description:
'ID of a dashboard panel to which the annotation should be scoped'
description:
'ID of a dashboard panel to which the annotation should be scoped'
field
:starting_at
,
GraphQL
::
STRING_TYPE
,
null:
true
,
field
:starting_at
,
Types
::
TimeType
,
null:
true
,
description:
'Timestamp marking start of annotated time span'
description:
'Timestamp marking start of annotated time span'
field
:ending_at
,
GraphQL
::
STRING_TYPE
,
null:
true
,
field
:ending_at
,
Types
::
TimeType
,
null:
true
,
description:
'Timestamp marking end of annotated time span'
description:
'Timestamp marking end of annotated time span'
def
panel_id
def
panel_id
...
...
changelogs/unreleased/mwaw-216963-annotations-missing-from-metric-charts.yml
0 → 100644
View file @
d36aa74e
---
title
:
Use iso 8601 timestamp format in metrics dashboard annotations graphql resource
to assure multi browser compatibility
merge_request
:
31474
author
:
type
:
fixed
doc/api/graphql/reference/gitlab_schema.graphql
View file @
d36aa74e
...
@@ -6031,7 +6031,7 @@ type MetricsDashboardAnnotation {
...
@@ -6031,7 +6031,7 @@ type MetricsDashboardAnnotation {
"""
"""
Timestamp
marking
end
of
annotated
time
span
Timestamp
marking
end
of
annotated
time
span
"""
"""
endingAt
:
String
endingAt
:
Time
"""
"""
ID
of
the
annotation
ID
of
the
annotation
...
@@ -6046,7 +6046,7 @@ type MetricsDashboardAnnotation {
...
@@ -6046,7 +6046,7 @@ type MetricsDashboardAnnotation {
"""
"""
Timestamp
marking
start
of
annotated
time
span
Timestamp
marking
start
of
annotated
time
span
"""
"""
startingAt
:
String
startingAt
:
Time
}
}
"""
"""
...
...
doc/api/graphql/reference/gitlab_schema.json
View file @
d36aa74e
...
@@ -16936,7 +16936,7 @@
...
@@ -16936,7 +16936,7 @@
],
],
"type"
:
{
"type"
:
{
"kind"
:
"SCALAR"
,
"kind"
:
"SCALAR"
,
"name"
:
"
String
"
,
"name"
:
"
Time
"
,
"ofType"
:
null
"ofType"
:
null
},
},
"isDeprecated"
:
false
,
"isDeprecated"
:
false
,
...
@@ -16982,7 +16982,7 @@
...
@@ -16982,7 +16982,7 @@
],
],
"type"
:
{
"type"
:
{
"kind"
:
"SCALAR"
,
"kind"
:
"SCALAR"
,
"name"
:
"
String
"
,
"name"
:
"
Time
"
,
"ofType"
:
null
"ofType"
:
null
},
},
"isDeprecated"
:
false
,
"isDeprecated"
:
false
,
...
...
doc/api/graphql/reference/index.md
View file @
d36aa74e
...
@@ -915,10 +915,10 @@ Autogenerated return type of MergeRequestSetWip
...
@@ -915,10 +915,10 @@ Autogenerated return type of MergeRequestSetWip
| Name | Type | Description |
| Name | Type | Description |
| --- | ---- | ---------- |
| --- | ---- | ---------- |
|
`description`
| String | Description of the annotation |
|
`description`
| String | Description of the annotation |
|
`endingAt`
|
String
| Timestamp marking end of annotated time span |
|
`endingAt`
|
Time
| Timestamp marking end of annotated time span |
|
`id`
| ID! | ID of the annotation |
|
`id`
| ID! | ID of the annotation |
|
`panelId`
| String | ID of a dashboard panel to which the annotation should be scoped |
|
`panelId`
| String | ID of a dashboard panel to which the annotation should be scoped |
|
`startingAt`
|
String
| Timestamp marking start of annotated time span |
|
`startingAt`
|
Time
| Timestamp marking start of annotated time span |
## Milestone
## Milestone
...
...
spec/requests/api/graphql/metrics/dashboard/annotations_spec.rb
View file @
d36aa74e
...
@@ -82,7 +82,7 @@ describe 'Getting Metrics Dashboard Annotations' do
...
@@ -82,7 +82,7 @@ describe 'Getting Metrics Dashboard Annotations' do
"description"
=>
annotation
.
description
,
"description"
=>
annotation
.
description
,
"id"
=>
annotation
.
to_global_id
.
to_s
,
"id"
=>
annotation
.
to_global_id
.
to_s
,
"panelId"
=>
annotation
.
panel_xid
,
"panelId"
=>
annotation
.
panel_xid
,
"startingAt"
=>
annotation
.
starting_at
.
to_s
,
"startingAt"
=>
annotation
.
starting_at
.
iso8601
,
"endingAt"
=>
nil
"endingAt"
=>
nil
}]
}]
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment