diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-26 12:10:16 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-26 12:10:16 +0300 |
commit | 2c49951e8c1f4fb95d15cac3dd0677d6882d2add (patch) | |
tree | acca123398daa394dd9810ac47ac07319c53e9a9 /app/assets/javascripts/performance_bar | |
parent | fb553bbc1899eddaddb07cd9685cdabffbed9962 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/performance_bar')
3 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/performance_bar/components/performance_bar_app.vue b/app/assets/javascripts/performance_bar/components/performance_bar_app.vue index cccb5e1be06..165feb1b6aa 100644 --- a/app/assets/javascripts/performance_bar/components/performance_bar_app.vue +++ b/app/assets/javascripts/performance_bar/components/performance_bar_app.vue @@ -1,4 +1,5 @@ <script> +/* eslint-disable vue/no-v-html */ import { glEmojiTag } from '~/emoji'; import AddRequest from './add_request.vue'; diff --git a/app/assets/javascripts/performance_bar/components/request_selector.vue b/app/assets/javascripts/performance_bar/components/request_selector.vue index c22a648d17f..5a9d3a6d313 100644 --- a/app/assets/javascripts/performance_bar/components/request_selector.vue +++ b/app/assets/javascripts/performance_bar/components/request_selector.vue @@ -1,4 +1,5 @@ <script> +/* eslint-disable vue/no-v-html */ import { GlPopover } from '@gitlab/ui'; import { glEmojiTag } from '~/emoji'; import { n__ } from '~/locale'; diff --git a/app/assets/javascripts/performance_bar/components/request_warning.vue b/app/assets/javascripts/performance_bar/components/request_warning.vue index 0128d5bd733..b61e1e5b7a9 100644 --- a/app/assets/javascripts/performance_bar/components/request_warning.vue +++ b/app/assets/javascripts/performance_bar/components/request_warning.vue @@ -1,4 +1,5 @@ <script> +/* eslint-disable vue/no-v-html */ import { GlPopover } from '@gitlab/ui'; import { glEmojiTag } from '~/emoji'; |