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
a6d2beaa
Commit
a6d2beaa
authored
Aug 06, 2020
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Convert deprecated buttons in suggestion_diff_header.vue
parent
881661c2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue
...vue_shared/components/markdown/suggestion_diff_header.vue
+10
-10
No files found.
app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue
View file @
a6d2beaa
<
script
>
import
{
Gl
Deprecated
Button
,
GlLoadingIcon
,
GlTooltipDirective
,
GlIcon
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlLoadingIcon
,
GlTooltipDirective
,
GlIcon
}
from
'
@gitlab/ui
'
;
import
{
__
}
from
'
~/locale
'
;
import
glFeatureFlagsMixin
from
'
~/vue_shared/mixins/gl_feature_flags_mixin
'
;
export
default
{
components
:
{
GlIcon
,
Gl
Deprecated
Button
,
GlLoadingIcon
},
components
:
{
GlIcon
,
GlButton
,
GlLoadingIcon
},
directives
:
{
'
gl-tooltip
'
:
GlTooltipDirective
},
mixins
:
[
glFeatureFlagsMixin
()],
props
:
{
...
...
@@ -105,14 +105,14 @@ export default {
<span>
{{
applyingSuggestionsMessage
}}
</span>
</div>
<div
v-else-if=
"canApply && canBeBatched && isBatched"
class=
"d-flex align-items-center"
>
<gl-
deprecated-
button
<gl-button
class=
"btn-inverted js-remove-from-batch-btn btn-grouped"
:disabled=
"isApplying"
@
click=
"removeSuggestionFromBatch"
>
{{
__
(
'
Remove from batch
'
)
}}
</gl-
deprecated-
button>
<gl-
deprecated-
button
</gl-button>
<gl-button
v-gl-tooltip.viewport=
"__('This also resolves all related threads')"
class=
"btn-inverted js-apply-batch-btn btn-grouped"
:disabled=
"isApplying"
...
...
@@ -123,26 +123,26 @@ export default {
<span
class=
"badge badge-pill badge-pill-success"
>
{{
batchSuggestionsCount
}}
</span>
</gl-
deprecated-
button>
</gl-button>
</div>
<div
v-else
class=
"d-flex align-items-center"
>
<gl-
deprecated-
button
<gl-button
v-if=
"canBeBatched && !isDisableButton"
class=
"btn-inverted js-add-to-batch-btn btn-grouped"
:disabled=
"isDisableButton"
@
click=
"addSuggestionToBatch"
>
{{
__
(
'
Add suggestion to batch
'
)
}}
</gl-
deprecated-
button>
</gl-button>
<span
v-gl-tooltip.viewport=
"tooltipMessage"
tabindex=
"0"
>
<gl-
deprecated-
button
<gl-button
class=
"btn-inverted js-apply-btn btn-grouped"
:disabled=
"isDisableButton"
variant=
"success"
@
click=
"applySuggestion"
>
{{
__
(
'
Apply suggestion
'
)
}}
</gl-
deprecated-
button>
</gl-button>
</span>
</div>
</div>
...
...
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