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
1ee37122
Commit
1ee37122
authored
Aug 07, 2020
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate custom metric form buttons
parent
f407d692
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
app/assets/javascripts/custom_metrics/components/custom_metrics_form.vue
...scripts/custom_metrics/components/custom_metrics_form.vue
+5
-10
changelogs/unreleased/219758-replace-gl-deprecated-button-with-gl-button-in-app-assets-javascri.yml
...precated-button-with-gl-button-in-app-assets-javascri.yml
+5
-0
No files found.
app/assets/javascripts/custom_metrics/components/custom_metrics_form.vue
View file @
1ee37122
<
script
>
<
script
>
import
{
Gl
Deprecated
Button
}
from
'
@gitlab/ui
'
;
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
{
__
,
s__
}
from
'
~/locale
'
;
import
{
__
,
s__
}
from
'
~/locale
'
;
import
csrf
from
'
~/lib/utils/csrf
'
;
import
csrf
from
'
~/lib/utils/csrf
'
;
import
CustomMetricsFormFields
from
'
./custom_metrics_form_fields.vue
'
;
import
CustomMetricsFormFields
from
'
./custom_metrics_form_fields.vue
'
;
...
@@ -10,7 +10,7 @@ export default {
...
@@ -10,7 +10,7 @@ export default {
components
:
{
components
:
{
CustomMetricsFormFields
,
CustomMetricsFormFields
,
DeleteCustomMetricModal
,
DeleteCustomMetricModal
,
Gl
Deprecated
Button
,
GlButton
,
},
},
props
:
{
props
:
{
customMetricsPath
:
{
customMetricsPath
:
{
...
@@ -76,15 +76,10 @@ export default {
...
@@ -76,15 +76,10 @@ export default {
@
formValidation=
"formValidation"
@
formValidation=
"formValidation"
/>
/>
<div
class=
"form-actions"
>
<div
class=
"form-actions"
>
<gl-
deprecated-button
variant=
"success
"
:disabled=
"!formIsValid"
@
click=
"submit"
>
<gl-
button
variant=
"success"
category=
"primary
"
:disabled=
"!formIsValid"
@
click=
"submit"
>
{{
saveButtonText
}}
{{
saveButtonText
}}
</gl-deprecated-button>
</gl-button>
<gl-deprecated-button
<gl-button
class=
"float-right"
:href=
"editProjectServicePath"
>
{{
__
(
'
Cancel
'
)
}}
</gl-button>
variant=
"secondary"
class=
"float-right"
:href=
"editProjectServicePath"
>
{{
__
(
'
Cancel
'
)
}}
</gl-deprecated-button
>
<delete-custom-metric-modal
<delete-custom-metric-modal
v-if=
"metricPersisted"
v-if=
"metricPersisted"
:delete-metric-url=
"customMetricsPath"
:delete-metric-url=
"customMetricsPath"
...
...
changelogs/unreleased/219758-replace-gl-deprecated-button-with-gl-button-in-app-assets-javascri.yml
0 → 100644
View file @
1ee37122
---
title
:
Migrate custom metric form buttons
merge_request
:
38896
author
:
George Tsiolis
type
:
changed
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