Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
789d1d17
Commit
789d1d17
authored
Jan 24, 2020
by
Dhiraj Bodicherla
Committed by
Phil Hughes
Jan 24, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Alert widget in monitoring dashboard uses gon instead of vue mixin
parent
5609ce5a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
ee/app/assets/javascripts/monitoring/components/alert_widget_form.vue
...s/javascripts/monitoring/components/alert_widget_form.vue
+3
-1
No files found.
ee/app/assets/javascripts/monitoring/components/alert_widget_form.vue
View file @
789d1d17
...
...
@@ -15,6 +15,7 @@ import {
import
{
__
,
s__
}
from
'
~/locale
'
;
import
Translate
from
'
~/vue_shared/translate
'
;
import
TrackEventDirective
from
'
~/vue_shared/directives/track_event
'
;
import
glFeatureFlagsMixin
from
'
~/vue_shared/mixins/gl_feature_flags_mixin
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
{
alertsValidator
,
queriesValidator
}
from
'
../validators
'
;
...
...
@@ -54,6 +55,7 @@ export default {
GlTooltip
:
GlTooltipDirective
,
TrackEvent
:
TrackEventDirective
,
},
mixins
:
[
glFeatureFlagsMixin
()],
props
:
{
disabled
:
{
type
:
Boolean
,
...
...
@@ -104,7 +106,7 @@ export default {
return
this
.
disabled
||
!
(
this
.
prometheusMetricId
||
this
.
isValidQuery
);
},
supportsComputedAlerts
()
{
return
gon
.
features
&&
gon
.
f
eatures
.
prometheusComputedAlerts
;
return
this
.
glF
eatures
.
prometheusComputedAlerts
;
},
queryDropdownLabel
()
{
return
this
.
currentQuery
.
label
||
s__
(
'
PrometheusAlerts|Select query
'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment