Add latest changes from gitlab-org/gitlab@master

4 files changed, 19 insertions, 11 deletions

diff --git a/app/assets/javascripts/releases/components/issuable_stats.vue b/app/assets/javascripts/releases/components/issuable_stats.vue
index 0ae0e5c6d6a..d005d8e10dd 100644
--- a/app/assets/javascripts/releases/components/issuable_stats.vue
+++ b/app/assets/javascripts/releases/components/issuable_stats.vue
@@ -26,7 +26,7 @@ export default {
       required: false,
       default: null,
     },
-    openPath: {
+    openedPath: {
       type: String,
       required: false,
       default: '',
@@ -43,7 +43,7 @@ export default {
     },
   },
   computed: {
-    open() {
+    opened() {
       return this.total - (this.closed + (this.merged || 0));
     },
     showMerged() {
@@ -63,8 +63,8 @@ export default {
       <span class="gl-white-space-pre-wrap" data-testid="open-stat">
         <gl-sprintf :message="__('Open: %{open}')">
           <template #open>
-            <gl-link v-if="openPath" :href="openPath">{{ open }}</gl-link>
-            <template v-else>{{ open }}</template>
+            <gl-link v-if="openedPath" :href="openedPath">{{ opened }}</gl-link>
+            <template v-else>{{ opened }}</template>
           </template>
         </gl-sprintf>
       </span>
diff --git a/app/assets/javascripts/releases/components/release_block.vue b/app/assets/javascripts/releases/components/release_block.vue
index e9163a52792..b89e5f2df3f 100644
--- a/app/assets/javascripts/releases/components/release_block.vue
+++ b/app/assets/javascripts/releases/components/release_block.vue
@@ -87,9 +87,14 @@ export default {
     <release-block-header :release="release" />
     <div class="card-body">
       <div v-if="shouldRenderMilestoneInfo">
+        <!-- TODO: Switch open* links to opened* once fields have been updated in GraphQL -->
         <release-block-milestone-info
           :milestones="milestones"
-          :open-issues-path="release._links.issuesUrl"
+          :opened-issues-path="release._links.openedIssuesUrl"
+          :closed-issues-path="release._links.closedIssuesUrl"
+          :opened-merge-requests-path="release._links.openedMergeRequestsUrl"
+          :merged-merge-requests-path="release._links.mergedMergeRequestsUrl"
+          :closed-merge-requests-path="release._links.closedMergeRequestsUrl"
         />
         <hr class="mb-3 mt-0" />
       </div>
diff --git a/app/assets/javascripts/releases/components/release_block_milestone_info.vue b/app/assets/javascripts/releases/components/release_block_milestone_info.vue
index 152f400f624..daa9c3480f4 100644
--- a/app/assets/javascripts/releases/components/release_block_milestone_info.vue
+++ b/app/assets/javascripts/releases/components/release_block_milestone_info.vue
@@ -20,7 +20,7 @@ export default {
       type: Array,
       required: true,
     },
-    openIssuesPath: {
+    openedIssuesPath: {
       type: String,
       required: false,
       default: '',
@@ -30,7 +30,7 @@ export default {
       required: false,
       default: '',
     },
-    openMergeRequestsPath: {
+    openedMergeRequestsPath: {
       type: String,
       required: false,
       default: '',
@@ -173,7 +173,7 @@ export default {
       :label="__('Issues')"
       :total="issueCounts.total"
       :closed="issueCounts.closed"
-      :open-path="openIssuesPath"
+      :opened-path="openedIssuesPath"
       :closed-path="closedIssuesPath"
       data-testid="issue-stats"
     />
@@ -183,7 +183,7 @@ export default {
       :total="mergeRequestCounts.total"
       :merged="mergeRequestCounts.merged"
       :closed="mergeRequestCounts.closed"
-      :open-path="openMergeRequestsPath"
+      :opened-path="openedMergeRequestsPath"
       :merged-path="mergedMergeRequestsPath"
       :closed-path="closedMergeRequestsPath"
       data-testid="merge-request-stats"
diff --git a/app/assets/javascripts/releases/queries/release.fragment.graphql b/app/assets/javascripts/releases/queries/release.fragment.graphql
index 445ed616348..4e5f685be84 100644
--- a/app/assets/javascripts/releases/queries/release.fragment.graphql
+++ b/app/assets/javascripts/releases/queries/release.fragment.graphql
@@ -33,9 +33,12 @@ fragment Release on Release {
   }
   links {
     editUrl
-    issuesUrl
-    mergeRequestsUrl
     selfUrl
+    openedIssuesUrl
+    closedIssuesUrl
+    openedMergeRequestsUrl
+    mergedMergeRequestsUrl
+    closedMergeRequestsUrl
   }
   commit {
     sha