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
cddfe6ab
Commit
cddfe6ab
authored
Sep 30, 2020
by
Marcia Ramos
Committed by
Olena Horal-Koretska
Sep 30, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate button in fluentd_output_settings.vue
parent
2c22cf0e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
8 deletions
+14
-8
app/assets/javascripts/clusters/components/fluentd_output_settings.vue
...vascripts/clusters/components/fluentd_output_settings.vue
+9
-8
changelogs/unreleased/okr-fluentd-output-settings.yml
changelogs/unreleased/okr-fluentd-output-settings.yml
+5
-0
No files found.
app/assets/javascripts/clusters/components/fluentd_output_settings.vue
View file @
cddfe6ab
<
script
>
import
{
GlAlert
,
Gl
Deprecated
Button
,
GlButton
,
GlDeprecatedDropdown
,
GlDeprecatedDropdownItem
,
GlFormCheckbox
,
...
...
@@ -16,7 +16,7 @@ const { UPDATING, UNINSTALLING, INSTALLING, INSTALLED, UPDATED } = APPLICATION_S
export
default
{
components
:
{
GlAlert
,
Gl
Deprecated
Button
,
GlButton
,
GlDeprecatedDropdown
,
GlDeprecatedDropdownItem
,
GlFormCheckbox
,
...
...
@@ -221,20 +221,21 @@ export default {
<strong>
{{
s__
(
'
ClusterIntegration|Send Container Network Policies Logs
'
)
}}
</strong>
</gl-form-checkbox>
</div>
<div
v-if=
"showButtons"
class=
"
mt-3
"
>
<gl-
deprecated-
button
<div
v-if=
"showButtons"
class=
"
gl-mt-5 gl-display-flex
"
>
<gl-button
ref=
"saveBtn"
class=
"
mr-1
"
class=
"
gl-mr-3
"
variant=
"success"
category=
"primary"
:loading=
"isSaving"
:disabled=
"saveButtonDisabled"
@
click=
"updateApplication"
>
{{
saveButtonLabel
}}
</gl-
deprecated-
button>
<gl-
deprecated-
button
ref=
"cancelBtn"
:disabled=
"saveButtonDisabled"
@
click=
"resetStatus"
>
</gl-button>
<gl-button
ref=
"cancelBtn"
:disabled=
"saveButtonDisabled"
@
click=
"resetStatus"
>
{{
__
(
'
Cancel
'
)
}}
</gl-
deprecated-
button>
</gl-button>
</div>
</div>
</div>
...
...
changelogs/unreleased/okr-fluentd-output-settings.yml
0 → 100644
View file @
cddfe6ab
---
title
:
Migrate button in fluentd_output_settings.vue
merge_request
:
43724
author
:
type
:
other
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