Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-04-21 18:10:09 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-04-21 18:10:09 +0300
commit48e30ea32f840f5c92e71e34f7a3166b4fc35576 (patch)
treed48e49ca3f10b7ad0c929a57abcb09205352d606 /app/assets/javascripts/sidebar
parent77839aae00dbe2dd955b946739d07fdcbac4468b (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/sidebar')
-rw-r--r--app/assets/javascripts/sidebar/queries/group_milestones.query.graphql2
-rw-r--r--app/assets/javascripts/sidebar/queries/merge_request_milestone.query.graphql2
-rw-r--r--app/assets/javascripts/sidebar/queries/milestone.fragment.graphql2
-rw-r--r--app/assets/javascripts/sidebar/queries/project_issue_milestone.query.graphql2
-rw-r--r--app/assets/javascripts/sidebar/queries/project_milestones.query.graphql2
5 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/sidebar/queries/group_milestones.query.graphql b/app/assets/javascripts/sidebar/queries/group_milestones.query.graphql
index dceab61ed26..b00ad3d483e 100644
--- a/app/assets/javascripts/sidebar/queries/group_milestones.query.graphql
+++ b/app/assets/javascripts/sidebar/queries/group_milestones.query.graphql
@@ -12,7 +12,7 @@ query groupMilestones($fullPath: ID!, $title: String, $state: MilestoneStateEnum
includeAncestors: true
) {
nodes {
- ...MilestoneFragment
+ ...SidebarMilestoneFragment
state
}
}
diff --git a/app/assets/javascripts/sidebar/queries/merge_request_milestone.query.graphql b/app/assets/javascripts/sidebar/queries/merge_request_milestone.query.graphql
index b0a16677cf2..9983c79d263 100644
--- a/app/assets/javascripts/sidebar/queries/merge_request_milestone.query.graphql
+++ b/app/assets/javascripts/sidebar/queries/merge_request_milestone.query.graphql
@@ -8,7 +8,7 @@ query mergeRequestMilestone($fullPath: ID!, $iid: String!) {
__typename
id
attribute: milestone {
- ...MilestoneFragment
+ ...SidebarMilestoneFragment
}
}
}
diff --git a/app/assets/javascripts/sidebar/queries/milestone.fragment.graphql b/app/assets/javascripts/sidebar/queries/milestone.fragment.graphql
index d4f7e703692..570e88966e5 100644
--- a/app/assets/javascripts/sidebar/queries/milestone.fragment.graphql
+++ b/app/assets/javascripts/sidebar/queries/milestone.fragment.graphql
@@ -1,4 +1,4 @@
-fragment MilestoneFragment on Milestone {
+fragment SidebarMilestoneFragment on Milestone {
id
title
webUrl: webPath
diff --git a/app/assets/javascripts/sidebar/queries/project_issue_milestone.query.graphql b/app/assets/javascripts/sidebar/queries/project_issue_milestone.query.graphql
index c7f3adc9aca..d481324e56a 100644
--- a/app/assets/javascripts/sidebar/queries/project_issue_milestone.query.graphql
+++ b/app/assets/javascripts/sidebar/queries/project_issue_milestone.query.graphql
@@ -8,7 +8,7 @@ query projectIssueMilestone($fullPath: ID!, $iid: String!) {
__typename
id
attribute: milestone {
- ...MilestoneFragment
+ ...SidebarMilestoneFragment
}
}
}
diff --git a/app/assets/javascripts/sidebar/queries/project_milestones.query.graphql b/app/assets/javascripts/sidebar/queries/project_milestones.query.graphql
index d9eab18628d..e431b331c5d 100644
--- a/app/assets/javascripts/sidebar/queries/project_milestones.query.graphql
+++ b/app/assets/javascripts/sidebar/queries/project_milestones.query.graphql
@@ -12,7 +12,7 @@ query projectMilestones($fullPath: ID!, $title: String, $state: MilestoneStateEn
includeAncestors: true
) {
nodes {
- ...MilestoneFragment
+ ...SidebarMilestoneFragment
state
}
}