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
c24b86fe
Commit
c24b86fe
authored
Oct 22, 2020
by
Brandon Labuschagne
Committed by
Paul Slaughter
Oct 22, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate fa spinner to GlLoadingIcon
This change is being done for mr_widget_auto_merge_enabled.vue
parent
96a0248c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue
...widget/components/states/mr_widget_auto_merge_enabled.vue
+4
-2
changelogs/unreleased/202279-migrate-fa-spinner-to-spinner-for-app-assets-javascripts-vue_merge.yml
...inner-to-spinner-for-app-assets-javascripts-vue_merge.yml
+5
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue
View file @
c24b86fe
<
script
>
<
script
>
import
{
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
autoMergeMixin
from
'
ee_else_ce/vue_merge_request_widget/mixins/auto_merge
'
;
import
autoMergeMixin
from
'
ee_else_ce/vue_merge_request_widget/mixins/auto_merge
'
;
import
{
deprecatedCreateFlash
as
Flash
}
from
'
../../../flash
'
;
import
{
deprecatedCreateFlash
as
Flash
}
from
'
../../../flash
'
;
import
statusIcon
from
'
../mr_widget_status_icon.vue
'
;
import
statusIcon
from
'
../mr_widget_status_icon.vue
'
;
...
@@ -12,6 +13,7 @@ export default {
...
@@ -12,6 +13,7 @@ export default {
components
:
{
components
:
{
MrWidgetAuthor
,
MrWidgetAuthor
,
statusIcon
,
statusIcon
,
GlLoadingIcon
,
},
},
mixins
:
[
autoMergeMixin
],
mixins
:
[
autoMergeMixin
],
props
:
{
props
:
{
...
@@ -100,7 +102,7 @@ export default {
...
@@ -100,7 +102,7 @@ export default {
class=
"btn btn-sm btn-default js-cancel-auto-merge"
class=
"btn btn-sm btn-default js-cancel-auto-merge"
@
click.prevent=
"cancelAutomaticMerge"
@
click.prevent=
"cancelAutomaticMerge"
>
>
<
i
v-if=
"isCancellingAutoMerge"
class=
"fa fa-spinner fa-spin"
aria-hidden=
"true"
>
</i
>
<
gl-loading-icon
v-if=
"isCancellingAutoMerge"
inline
class=
"gl-mr-1"
/
>
{{
cancelButtonText
}}
{{
cancelButtonText
}}
</a>
</a>
</h4>
</h4>
...
@@ -122,7 +124,7 @@ export default {
...
@@ -122,7 +124,7 @@ export default {
href=
"#"
href=
"#"
@
click.prevent=
"removeSourceBranch"
@
click.prevent=
"removeSourceBranch"
>
>
<
i
v-if=
"isRemovingSourceBranch"
class=
"fa fa-spinner fa-spin"
aria-hidden=
"true"
>
</i
>
<
gl-loading-icon
v-if=
"isRemovingSourceBranch"
inline
class=
"gl-mr-1"
/
>
{{
s__
(
'
mrWidget|Delete source branch
'
)
}}
{{
s__
(
'
mrWidget|Delete source branch
'
)
}}
</a>
</a>
</p>
</p>
...
...
changelogs/unreleased/202279-migrate-fa-spinner-to-spinner-for-app-assets-javascripts-vue_merge.yml
0 → 100644
View file @
c24b86fe
---
title
:
Update loading icon for buttons used in MR's set to merge automatically
merge_request
:
45693
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