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
8764a223
Commit
8764a223
authored
Mar 14, 2020
by
Peter Leitzen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Expose issue state as `status` on status page
parent
92fbe822
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
ee/app/serializers/status_page/incident_entity.rb
ee/app/serializers/status_page/incident_entity.rb
+1
-1
ee/spec/fixtures/api/schemas/status_page/basic_incident.json
ee/spec/fixtures/api/schemas/status_page/basic_incident.json
+2
-2
ee/spec/serializers/status_page/incident_entity_spec.rb
ee/spec/serializers/status_page/incident_entity_spec.rb
+1
-1
No files found.
ee/app/serializers/status_page/incident_entity.rb
View file @
8764a223
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
module
StatusPage
module
StatusPage
class
IncidentEntity
<
Grape
::
Entity
class
IncidentEntity
<
Grape
::
Entity
expose
:iid
,
as: :id
expose
:iid
,
as: :id
expose
:state
expose
:state
,
as: :status
expose
:title_html
,
as: :title
expose
:title_html
,
as: :title
expose
:description_html
,
as: :description
expose
:description_html
,
as: :description
expose
:updated_at
expose
:updated_at
...
...
ee/spec/fixtures/api/schemas/status_page/basic_incident.json
View file @
8764a223
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
"type"
:
"object"
,
"type"
:
"object"
,
"required"
:
[
"required"
:
[
"id"
,
"id"
,
"stat
e
"
,
"stat
us
"
,
"title"
,
"title"
,
"description"
,
"description"
,
"links"
,
"links"
,
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
],
],
"properties"
:
{
"properties"
:
{
"id"
:
{
"type"
:
"integer"
},
"id"
:
{
"type"
:
"integer"
},
"stat
e
"
:
{
"stat
us
"
:
{
"type"
:
"string"
,
"type"
:
"string"
,
"enum"
:
[
"opened"
,
"closed"
]
"enum"
:
[
"opened"
,
"closed"
]
},
},
...
...
ee/spec/serializers/status_page/incident_entity_spec.rb
View file @
8764a223
...
@@ -14,7 +14,7 @@ describe StatusPage::IncidentEntity do
...
@@ -14,7 +14,7 @@ describe StatusPage::IncidentEntity do
it
'exposes JSON fields'
do
it
'exposes JSON fields'
do
expect
(
json
).
to
eq
(
expect
(
json
).
to
eq
(
id:
issue
.
iid
,
id:
issue
.
iid
,
stat
e
:
issue
.
state
,
stat
us
:
issue
.
state
,
title:
issue
.
title_html
,
title:
issue
.
title_html
,
description:
issue
.
description_html
,
description:
issue
.
description_html
,
updated_at:
issue
.
updated_at
,
updated_at:
issue
.
updated_at
,
...
...
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