diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-24 21:09:09 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-24 21:09:09 +0000 |
commit | 167894d0e7c98aae1c6d4f5a060ad6d58ea3f382 (patch) | |
tree | dd0ce964cf0db395b0b143a079c58bb4aabae591 /app/assets | |
parent | 411cc77938f99b495e0fe802705d275a28e939ef (diff) | |
download | gitlab-ce-167894d0e7c98aae1c6d4f5a060ad6d58ea3f382.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/error_tracking/components/error_tracking_list.vue | 22 | ||||
-rw-r--r-- | app/assets/javascripts/vue_shared/components/markdown/header.vue | 4 |
2 files changed, 13 insertions, 13 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 e57e17c38c1..6f3a5f683f8 100644 --- a/app/assets/javascripts/error_tracking/components/error_tracking_list.vue +++ b/app/assets/javascripts/error_tracking/components/error_tracking_list.vue @@ -299,17 +299,17 @@ export default { stacked="sm" tbody-tr-class="table-row mb-4" > - <template v-slot:head(error)> + <template #head(error)> <div class="d-none d-sm-block">{{ __('Open errors') }}</div> </template> - <template v-slot:head(events)="data"> + <template #head(events)="data"> <div class="text-sm-right">{{ data.label }}</div> </template> - <template v-slot:head(users)="data"> + <template #head(users)="data"> <div class="text-sm-right">{{ data.label }}</div> </template> - <template v-slot:error="errors"> + <template #cell(error)="errors"> <div class="d-flex flex-column"> <gl-link class="d-flex mw-100 text-dark" :href="getDetailsLink(errors.item.id)"> <strong class="text-truncate">{{ errors.item.title.trim() }}</strong> @@ -319,20 +319,20 @@ export default { </span> </div> </template> - <template v-slot:events="errors"> + <template #cell(events)="errors"> <div class="text-right">{{ errors.item.count }}</div> </template> - <template v-slot:users="errors"> + <template #cell(users)="errors"> <div class="text-right">{{ errors.item.userCount }}</div> </template> - <template v-slot:lastSeen="errors"> + <template #cell(lastSeen)="errors"> <div class="text-md-left text-right"> <time-ago :time="errors.item.lastSeen" class="text-secondary" /> </div> </template> - <template v-slot:ignore="errors"> + <template #cell(ignore)="errors"> <gl-button ref="ignoreError" v-gl-tooltip.hover @@ -342,7 +342,7 @@ export default { <gl-icon name="eye-slash" :size="12" /> </gl-button> </template> - <template v-slot:resolved="errors"> + <template #cell(resolved)="errors"> <gl-button ref="resolveError" v-gl-tooltip @@ -352,7 +352,7 @@ export default { <gl-icon name="check-circle" :size="12" /> </gl-button> </template> - <template v-slot:details="errors"> + <template #cell(details)="errors"> <gl-button :href="getDetailsLink(errors.item.id)" variant="outline-info" @@ -361,7 +361,7 @@ export default { {{ __('More details') }} </gl-button> </template> - <template v-slot:empty> + <template #empty> {{ __('No errors to display.') }} <gl-link class="js-try-again" @click="restartPolling"> {{ __('Check again') }} diff --git a/app/assets/javascripts/vue_shared/components/markdown/header.vue b/app/assets/javascripts/vue_shared/components/markdown/header.vue index fee5d6d5e3a..36cbb230d30 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/header.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/header.vue @@ -128,8 +128,8 @@ export default { @click="handleSuggestDismissed" /> <gl-popover - v-if="showSuggestPopover" - :target="() => $refs.suggestButton" + v-if="showSuggestPopover && $refs.suggestButton" + :target="$refs.suggestButton" :css-classes="['diff-suggest-popover']" placement="bottom" :show="showSuggestPopover" |