diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 11:10:13 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 11:10:13 +0000 |
commit | 0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch) | |
tree | 7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /app/assets/javascripts/graphql_shared | |
parent | 72123183a20411a36d607d70b12d57c484394c8e (diff) | |
download | gitlab-ce-0ea3fcec397b69815975647f5e2aa5fe944a8486.tar.gz |
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'app/assets/javascripts/graphql_shared')
-rw-r--r-- | app/assets/javascripts/graphql_shared/fragments/issuable_timelogs.fragment.graphql | 3 | ||||
-rw-r--r-- | app/assets/javascripts/graphql_shared/possible_types.json | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/javascripts/graphql_shared/fragments/issuable_timelogs.fragment.graphql b/app/assets/javascripts/graphql_shared/fragments/issuable_timelogs.fragment.graphql index 824997f8e33..fb771d7ec8a 100644 --- a/app/assets/javascripts/graphql_shared/fragments/issuable_timelogs.fragment.graphql +++ b/app/assets/javascripts/graphql_shared/fragments/issuable_timelogs.fragment.graphql @@ -11,4 +11,7 @@ fragment TimelogFragment on Timelog { body } summary + userPermissions { + adminTimelog + } } diff --git a/app/assets/javascripts/graphql_shared/possible_types.json b/app/assets/javascripts/graphql_shared/possible_types.json index 7ca3f20ec1c..50b40526ee0 100644 --- a/app/assets/javascripts/graphql_shared/possible_types.json +++ b/app/assets/javascripts/graphql_shared/possible_types.json @@ -129,5 +129,9 @@ "VulnerabilityLocationGeneric", "VulnerabilityLocationSast", "VulnerabilityLocationSecretDetection" + ], + "WorkItemWidget": [ + "WorkItemWidgetDescription", + "WorkItemWidgetHierarchy" ] } |