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
26c0a705
Commit
26c0a705
authored
Dec 20, 2019
by
Samantha Ming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove spinner when approval require input is changed
parent
3a19c93d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
17 deletions
+5
-17
ee/app/assets/javascripts/approvals/components/app.vue
ee/app/assets/javascripts/approvals/components/app.vue
+0
-2
ee/changelogs/unreleased/38090-remove-spinner-on-approval-change.yml
...gs/unreleased/38090-remove-spinner-on-approval-change.yml
+5
-0
ee/spec/javascripts/approvals/components/app_spec.js
ee/spec/javascripts/approvals/components/app_spec.js
+0
-15
No files found.
ee/app/assets/javascripts/approvals/components/app.vue
View file @
26c0a705
...
@@ -14,7 +14,6 @@ export default {
...
@@ -14,7 +14,6 @@ export default {
computed
:
{
computed
:
{
...
mapState
({
...
mapState
({
settings
:
'
settings
'
,
settings
:
'
settings
'
,
isLoading
:
state
=>
state
.
approvals
.
isLoading
,
hasLoaded
:
state
=>
state
.
approvals
.
hasLoaded
,
hasLoaded
:
state
=>
state
.
approvals
.
hasLoaded
,
}),
}),
createModalId
()
{
createModalId
()
{
...
@@ -42,7 +41,6 @@ export default {
...
@@ -42,7 +41,6 @@ export default {
<slot
name=
"rules"
></slot>
<slot
name=
"rules"
></slot>
</div>
</div>
<div
v-if=
"settings.canEdit && settings.allowMultiRule"
class=
"border-bottom py-3 px-2"
>
<div
v-if=
"settings.canEdit && settings.allowMultiRule"
class=
"border-bottom py-3 px-2"
>
<gl-loading-icon
v-if=
"isLoading"
/>
<div
v-if=
"settings.allowMultiRule"
class=
"d-flex"
>
<div
v-if=
"settings.allowMultiRule"
class=
"d-flex"
>
<gl-button
<gl-button
class=
"ml-auto btn-info btn-inverted"
class=
"ml-auto btn-info btn-inverted"
...
...
ee/changelogs/unreleased/38090-remove-spinner-on-approval-change.yml
0 → 100644
View file @
26c0a705
---
title
:
Remove spinner when approval require input is changed
merge_request
:
22186
author
:
type
:
fixed
ee/spec/javascripts/approvals/components/app_spec.js
View file @
26c0a705
...
@@ -102,13 +102,6 @@ describe('EE Approvals App', () => {
...
@@ -102,13 +102,6 @@ describe('EE Approvals App', () => {
expect
(
findRules
().
exists
()).
toBe
(
true
);
expect
(
findRules
().
exists
()).
toBe
(
true
);
});
});
it
(
'
shows loading icon if loading
'
,
()
=>
{
store
.
modules
.
approvals
.
state
.
isLoading
=
true
;
factory
();
expect
(
findLoadingIcon
().
exists
()).
toBe
(
true
);
});
it
(
'
does not show loading icon if not loading
'
,
()
=>
{
it
(
'
does not show loading icon if not loading
'
,
()
=>
{
store
.
modules
.
approvals
.
state
.
isLoading
=
false
;
store
.
modules
.
approvals
.
state
.
isLoading
=
false
;
factory
();
factory
();
...
@@ -149,14 +142,6 @@ describe('EE Approvals App', () => {
...
@@ -149,14 +142,6 @@ describe('EE Approvals App', () => {
undefined
,
undefined
,
);
);
});
});
it
(
'
shows loading icon and rules if loading
'
,
()
=>
{
store
.
modules
.
approvals
.
state
.
isLoading
=
true
;
factory
();
expect
(
findRules
().
exists
()).
toBe
(
true
);
expect
(
findLoadingIcon
().
exists
()).
toBe
(
true
);
});
});
});
});
});
...
...
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