Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 2 deletions

diff --git a/app/assets/javascripts/error_tracking/components/error_tracking_list.vue b/app/assets/javascripts/error_tracking/components/error_tracking_list.vue
index d29d5aa0671..a07428dafea 100644
--- a/app/assets/javascripts/error_tracking/components/error_tracking_list.vue
+++ b/app/assets/javascripts/error_tracking/components/error_tracking_list.vue
@@ -150,6 +150,12 @@ export default {
     paginationRequired() {
       return !isEmpty(this.pagination);
     },
+    previousPage() {
+      return this.pagination.previous ? this.$options.PREV_PAGE : null;
+    },
+    nextPage() {
+      return this.pagination.next ? this.$options.NEXT_PAGE : null;
+    },
     errorTrackingHelpUrl() {
       return helpPagePath('operations/error_tracking');
     },
@@ -430,8 +436,8 @@ export default {
         <gl-pagination
           v-show="!loading"
           v-if="paginationRequired"
-          :prev-page="$options.PREV_PAGE"
-          :next-page="$options.NEXT_PAGE"
+          :prev-page="previousPage"
+          :next-page="nextPage"
           :value="pageValue"
           align="center"
           @input="goToPage"