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
ad315537
Commit
ad315537
authored
Oct 01, 2020
by
Marcia Ramos
Committed by
Jose Ivan Vargas
Oct 01, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate button in alert_widget_form.vue
parent
ac455522
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
18 deletions
+14
-18
app/assets/javascripts/monitoring/components/alert_widget_form.vue
...s/javascripts/monitoring/components/alert_widget_form.vue
+8
-11
changelogs/unreleased/okr-alert-widget-form.yml
changelogs/unreleased/okr-alert-widget-form.yml
+5
-0
ee/app/assets/stylesheets/pages/environments.scss
ee/app/assets/stylesheets/pages/environments.scss
+1
-7
No files found.
app/assets/javascripts/monitoring/components/alert_widget_form.vue
View file @
ad315537
...
@@ -3,7 +3,7 @@ import { isEmpty, findKey } from 'lodash';
...
@@ -3,7 +3,7 @@ import { isEmpty, findKey } from 'lodash';
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
{
import
{
GlLink
,
GlLink
,
Gl
Deprecated
Button
,
GlButton
,
GlButtonGroup
,
GlButtonGroup
,
GlFormGroup
,
GlFormGroup
,
GlFormInput
,
GlFormInput
,
...
@@ -36,7 +36,7 @@ const SUBMIT_BUTTON_CLASS = {
...
@@ -36,7 +36,7 @@ const SUBMIT_BUTTON_CLASS = {
export
default
{
export
default
{
components
:
{
components
:
{
Gl
Deprecated
Button
,
GlButton
,
GlButtonGroup
,
GlButtonGroup
,
GlFormGroup
,
GlFormGroup
,
GlFormInput
,
GlFormInput
,
...
@@ -267,30 +267,27 @@ export default {
...
@@ -267,30 +267,27 @@ export default {
</gl-dropdown>
</gl-dropdown>
</gl-form-group>
</gl-form-group>
<gl-button-group
class=
"mb-3"
:label=
"s__('PrometheusAlerts|Operator')"
>
<gl-button-group
class=
"mb-3"
:label=
"s__('PrometheusAlerts|Operator')"
>
<gl-
deprecated-
button
<gl-button
:class=
"{ active: operator === operators.greaterThan }"
:class=
"{ active: operator === operators.greaterThan }"
:disabled=
"formDisabled"
:disabled=
"formDisabled"
type=
"button"
@
click=
"operator = operators.greaterThan"
@
click=
"operator = operators.greaterThan"
>
>
{{ operators.greaterThan }}
{{ operators.greaterThan }}
</gl-
deprecated-
button>
</gl-button>
<gl-
deprecated-
button
<gl-button
:class=
"{ active: operator === operators.equalTo }"
:class=
"{ active: operator === operators.equalTo }"
:disabled=
"formDisabled"
:disabled=
"formDisabled"
type=
"button"
@
click=
"operator = operators.equalTo"
@
click=
"operator = operators.equalTo"
>
>
{{ operators.equalTo }}
{{ operators.equalTo }}
</gl-
deprecated-
button>
</gl-button>
<gl-
deprecated-
button
<gl-button
:class=
"{ active: operator === operators.lessThan }"
:class=
"{ active: operator === operators.lessThan }"
:disabled=
"formDisabled"
:disabled=
"formDisabled"
type=
"button"
@
click=
"operator = operators.lessThan"
@
click=
"operator = operators.lessThan"
>
>
{{ operators.lessThan }}
{{ operators.lessThan }}
</gl-
deprecated-
button>
</gl-button>
</gl-button-group>
</gl-button-group>
<gl-form-group
:label=
"s__('PrometheusAlerts|Threshold')"
label-for=
"alerts-threshold"
>
<gl-form-group
:label=
"s__('PrometheusAlerts|Threshold')"
label-for=
"alerts-threshold"
>
<gl-form-input
<gl-form-input
...
...
changelogs/unreleased/okr-alert-widget-form.yml
0 → 100644
View file @
ad315537
---
title
:
Migrate button in alert_widget_form.vue
merge_request
:
43720
author
:
type
:
other
ee/app/assets/stylesheets/pages/environments.scss
View file @
ad315537
...
@@ -123,14 +123,8 @@
...
@@ -123,14 +123,8 @@
}
}
.alert-form
{
.alert-form
{
.btn-group
,
.btn-group
{
.action-group
{
display
:
flex
;
display
:
flex
;
.btn
{
flex
:
1
auto
;
box-shadow
:
none
;
}
}
}
}
}
...
...
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