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
94b1a56d
Commit
94b1a56d
authored
Jul 22, 2020
by
Jarek Ostrowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate service desk setting button to gl-button
MR:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37612
parent
b4b27440
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
...settings_service_desk/components/service_desk_setting.vue
+6
-4
changelogs/unreleased/219908-service-desk-setting-button.yml
changelogs/unreleased/219908-service-desk-setting-button.yml
+5
-0
No files found.
app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
View file @
94b1a56d
<
script
>
<
script
>
import
{
Gl
Deprecated
Button
,
GlFormSelect
,
GlToggle
,
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlFormSelect
,
GlToggle
,
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
{
__
}
from
'
~/locale
'
;
import
{
__
}
from
'
~/locale
'
;
import
tooltip
from
'
~/vue_shared/directives/tooltip
'
;
import
tooltip
from
'
~/vue_shared/directives/tooltip
'
;
import
glFeatureFlagsMixin
from
'
~/vue_shared/mixins/gl_feature_flags_mixin
'
;
import
glFeatureFlagsMixin
from
'
~/vue_shared/mixins/gl_feature_flags_mixin
'
;
...
@@ -13,7 +13,7 @@ export default {
...
@@ -13,7 +13,7 @@ export default {
},
},
components
:
{
components
:
{
ClipboardButton
,
ClipboardButton
,
Gl
Deprecated
Button
,
GlButton
,
GlFormSelect
,
GlFormSelect
,
GlToggle
,
GlToggle
,
GlLoadingIcon
,
GlLoadingIcon
,
...
@@ -157,12 +157,14 @@ export default {
...
@@ -157,12 +157,14 @@ export default {
}}
}}
</span>
</span>
</
template
>
</
template
>
<gl-
deprecated-
button
<gl-button
variant=
"success"
variant=
"success"
class=
"gl-mt-5"
:disabled=
"isTemplateSaving"
:disabled=
"isTemplateSaving"
@
click=
"onSaveTemplate"
@
click=
"onSaveTemplate"
>
{{ __('Save template') }}
</gl-deprecated-button
>
>
{{ __('Save template') }}
</gl-button>
</div>
</div>
</div>
</div>
</div>
</div>
...
...
changelogs/unreleased/219908-service-desk-setting-button.yml
0 → 100644
View file @
94b1a56d
---
title
:
Migrate service desk setting button to gl-button
merge_request
:
37612
author
:
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