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
d54b6b9f
Commit
d54b6b9f
authored
Feb 15, 2021
by
ggelatti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Fixes GraphQL pipeline status notification with warnings"
This reverts commit
b591dcbe
.
parent
8756e392
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
1 addition
and
39 deletions
+1
-39
app/assets/javascripts/vue_merge_request_widget/queries/get_state.query.graphql
.../vue_merge_request_widget/queries/get_state.query.graphql
+0
-1
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
...cripts/vue_merge_request_widget/stores/mr_widget_store.js
+0
-5
app/graphql/types/ci/pipeline_type.rb
app/graphql/types/ci/pipeline_type.rb
+0
-3
changelogs/unreleased/ph-ph-fixWidgetGraphqlPipelineWarnings.yml
...ogs/unreleased/ph-ph-fixWidgetGraphqlPipelineWarnings.yml
+0
-5
doc/api/graphql/reference/gitlab_schema.graphql
doc/api/graphql/reference/gitlab_schema.graphql
+0
-5
doc/api/graphql/reference/gitlab_schema.json
doc/api/graphql/reference/gitlab_schema.json
+0
-18
doc/api/graphql/reference/index.md
doc/api/graphql/reference/index.md
+0
-1
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 @
d54b6b9f
...
@@ -14,7 +14,6 @@ query getState($projectPath: ID!, $iid: String!) {
...
@@ -14,7 +14,6 @@ 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 @
d54b6b9f
...
@@ -172,11 +172,6 @@ export default class MergeRequestStore {
...
@@ -172,11 +172,6 @@ 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 @
d54b6b9f
...
@@ -27,9 +27,6 @@ module Types
...
@@ -27,9 +27,6 @@ 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
deleted
100644 → 0
View file @
8756e392
---
title
:
Added warnings field to the pipelines GraphQL type
merge_request
:
54089
author
:
type
:
added
doc/api/graphql/reference/gitlab_schema.graphql
View file @
d54b6b9f
...
@@ -18566,11 +18566,6 @@ type Pipeline {
...
@@ -18566,11 +18566,6 @@ 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 @
d54b6b9f
...
@@ -54399,24 +54399,6 @@
...
@@ -54399,24 +54399,6 @@
},
},
"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 @
d54b6b9f
...
@@ -2807,7 +2807,6 @@ Information about pagination in a connection..
...
@@ -2807,7 +2807,6 @@ 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 @
d54b6b9f
...
@@ -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
warnings
upstream path project active user_permissions
]
]
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