diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-17 12:10:08 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-17 12:10:08 +0300 |
| commit | 325318e2ddfcaedf0527053dd3c9bd62db547089 (patch) | |
| tree | 2525b4135802427a95233219d9d339ceadb51280 /app/assets/javascripts/alert_management | |
| parent | c64b892786865a3b87701450c6ca62fcab0fa044 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/alert_management')
| -rw-r--r-- | app/assets/javascripts/alert_management/components/alert_details.vue | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/alert_management/graphql/fragments/detail_item.fragment.graphql | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/javascripts/alert_management/components/alert_details.vue b/app/assets/javascripts/alert_management/components/alert_details.vue index 8c3ec527ef6..49eff61e12f 100644 --- a/app/assets/javascripts/alert_management/components/alert_details.vue +++ b/app/assets/javascripts/alert_management/components/alert_details.vue @@ -324,6 +324,12 @@ export default { </div> <div class="gl-pl-2" data-testid="service">{{ alert.service }}</div> </div> + <div v-if="alert.runbook" class="gl-my-5 gl-display-flex"> + <div class="bold gl-w-13 gl-text-right gl-pr-3"> + {{ s__('AlertManagement|Runbook') }}: + </div> + <div class="gl-pl-2" data-testid="runbook">{{ alert.runbook }}</div> + </div> <template> <div v-if="alert.notes.nodes" class="issuable-discussion py-5"> <ul class="notes main-notes-list timeline"> diff --git a/app/assets/javascripts/alert_management/graphql/fragments/detail_item.fragment.graphql b/app/assets/javascripts/alert_management/graphql/fragments/detail_item.fragment.graphql index 92eb828bdf8..0712ff12c23 100644 --- a/app/assets/javascripts/alert_management/graphql/fragments/detail_item.fragment.graphql +++ b/app/assets/javascripts/alert_management/graphql/fragments/detail_item.fragment.graphql @@ -11,6 +11,7 @@ fragment AlertDetailItem on AlertManagementAlert { updatedAt endedAt details + runbook todos { nodes { id |