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
08bf344d
Commit
08bf344d
authored
Feb 16, 2021
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'revert-mr-54089-incident-3632' into 'master'"
This reverts merge request !54268
parent
ec0090a1
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
39 additions
and
1 deletion
+39
-1
app/assets/javascripts/vue_merge_request_widget/queries/get_state.query.graphql
.../vue_merge_request_widget/queries/get_state.query.graphql
+1
-0
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
...cripts/vue_merge_request_widget/stores/mr_widget_store.js
+5
-0
app/graphql/types/ci/pipeline_type.rb
app/graphql/types/ci/pipeline_type.rb
+3
-0
changelogs/unreleased/ph-ph-fixWidgetGraphqlPipelineWarnings.yml
...ogs/unreleased/ph-ph-fixWidgetGraphqlPipelineWarnings.yml
+5
-0
doc/api/graphql/reference/gitlab_schema.graphql
doc/api/graphql/reference/gitlab_schema.graphql
+5
-0
doc/api/graphql/reference/gitlab_schema.json
doc/api/graphql/reference/gitlab_schema.json
+18
-0
doc/api/graphql/reference/index.md
doc/api/graphql/reference/index.md
+1
-0
spec/graphql/types/ci/pipeline_type_spec.rb
spec/graphql/types/ci/pipeline_type_spec.rb
+1
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/queries/get_state.query.graphql
View file @
08bf344d
...
@@ -14,6 +14,7 @@ query getState($projectPath: ID!, $iid: String!) {
...
@@ -14,6 +14,7 @@ query getState($projectPath: ID!, $iid: String!) {
pipelines
(
first
:
1
)
{
pipelines
(
first
:
1
)
{
nodes
{
nodes
{
status
status
warnings
}
}
}
}
shouldBeRebased
shouldBeRebased
...
...
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
View file @
08bf344d
...
@@ -172,6 +172,11 @@ export default class MergeRequestStore {
...
@@ -172,6 +172,11 @@ export default class MergeRequestStore {
this
.
canBeMerged
=
mergeRequest
.
mergeStatus
===
'
can_be_merged
'
;
this
.
canBeMerged
=
mergeRequest
.
mergeStatus
===
'
can_be_merged
'
;
this
.
canMerge
=
mergeRequest
.
userPermissions
.
canMerge
;
this
.
canMerge
=
mergeRequest
.
userPermissions
.
canMerge
;
this
.
ciStatus
=
pipeline
?.
status
.
toLowerCase
();
this
.
ciStatus
=
pipeline
?.
status
.
toLowerCase
();
if
(
pipeline
?.
warnings
&&
this
.
ciStatus
===
'
success
'
)
{
this
.
ciStatus
=
`
${
this
.
ciStatus
}
-with-warnings`
;
}
this
.
commitsCount
=
mergeRequest
.
commitCount
||
10
;
this
.
commitsCount
=
mergeRequest
.
commitCount
||
10
;
this
.
branchMissing
=
!
mergeRequest
.
sourceBranchExists
||
!
mergeRequest
.
targetBranchExists
;
this
.
branchMissing
=
!
mergeRequest
.
sourceBranchExists
||
!
mergeRequest
.
targetBranchExists
;
this
.
hasConflicts
=
mergeRequest
.
conflicts
;
this
.
hasConflicts
=
mergeRequest
.
conflicts
;
...
...
app/graphql/types/ci/pipeline_type.rb
View file @
08bf344d
...
@@ -27,6 +27,9 @@ module Types
...
@@ -27,6 +27,9 @@ module Types
field
:status
,
PipelineStatusEnum
,
null:
false
,
field
:status
,
PipelineStatusEnum
,
null:
false
,
description:
"Status of the pipeline (
#{
::
Ci
::
Pipeline
.
all_state_names
.
compact
.
join
(
', '
).
upcase
}
)"
description:
"Status of the pipeline (
#{
::
Ci
::
Pipeline
.
all_state_names
.
compact
.
join
(
', '
).
upcase
}
)"
field
:warnings
,
GraphQL
::
BOOLEAN_TYPE
,
null:
false
,
method: :has_warnings?
,
description:
"Indicates if a pipeline has warnings."
field
:detailed_status
,
Types
::
Ci
::
DetailedStatusType
,
null:
false
,
field
:detailed_status
,
Types
::
Ci
::
DetailedStatusType
,
null:
false
,
description:
'Detailed status of the pipeline.'
description:
'Detailed status of the pipeline.'
...
...
changelogs/unreleased/ph-ph-fixWidgetGraphqlPipelineWarnings.yml
0 → 100644
View file @
08bf344d
---
title
:
Added warnings field to the pipelines GraphQL type
merge_request
:
54089
author
:
type
:
added
doc/api/graphql/reference/gitlab_schema.graphql
View file @
08bf344d
...
@@ -18638,6 +18638,11 @@ type Pipeline {
...
@@ -18638,6 +18638,11 @@ type Pipeline {
Permissions
for
the
current
user
on
the
resource
Permissions
for
the
current
user
on
the
resource
"""
"""
userPermissions
:
PipelinePermissions
!
userPermissions
:
PipelinePermissions
!
"""
Indicates
if
a
pipeline
has
warnings
.
"""
warnings
:
Boolean
!
}
}
type
PipelineAnalytics
{
type
PipelineAnalytics
{
...
...
doc/api/graphql/reference/gitlab_schema.json
View file @
08bf344d
...
@@ -54614,6 +54614,24 @@
...
@@ -54614,6 +54614,24 @@
},
},
"isDeprecated": false,
"isDeprecated": false,
"deprecationReason": null
"deprecationReason": null
},
{
"name": "warnings",
"description": "Indicates if a pipeline has warnings.",
"args": [
],
"type": {
"kind": "NON_NULL",
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Boolean",
"ofType": null
}
},
"isDeprecated": false,
"deprecationReason": null
}
}
],
],
"inputFields": null,
"inputFields": null,
doc/api/graphql/reference/index.md
View file @
08bf344d
...
@@ -2818,6 +2818,7 @@ Information about pagination in a connection..
...
@@ -2818,6 +2818,7 @@ Information about pagination in a connection..
|
`upstream`
| Pipeline | Pipeline that triggered the pipeline. |
|
`upstream`
| Pipeline | Pipeline that triggered the pipeline. |
|
`user`
| User | Pipeline user. |
|
`user`
| User | Pipeline user. |
|
`userPermissions`
| PipelinePermissions! | Permissions for the current user on the resource |
|
`userPermissions`
| PipelinePermissions! | Permissions for the current user on the resource |
|
`warnings`
| Boolean! | Indicates if a pipeline has warnings. |
### PipelineAnalytics
### PipelineAnalytics
...
...
spec/graphql/types/ci/pipeline_type_spec.rb
View file @
08bf344d
...
@@ -12,7 +12,7 @@ RSpec.describe Types::Ci::PipelineType do
...
@@ -12,7 +12,7 @@ RSpec.describe Types::Ci::PipelineType do
id iid sha before_sha status detailed_status config_source duration
id iid sha before_sha status detailed_status config_source duration
coverage created_at updated_at started_at finished_at committed_at
coverage created_at updated_at started_at finished_at committed_at
stages user retryable cancelable jobs source_job downstream
stages user retryable cancelable jobs source_job downstream
upstream path project active user_permissions
upstream path project active user_permissions
warnings
]
]
if
Gitlab
.
ee?
if
Gitlab
.
ee?
...
...
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