Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-30 18:09:46 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-30 18:09:46 +0300
commitdd240e5cc4e0abc4eef8b97962c247dab43e3777 (patch)
treebc0752959bc0713afb555e358bb43d65cf04f48e /app/assets/javascripts/design_management
parent6aa5c04c74d2d70ee7d19ef3a155b2def9dd46de (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/design_management')
-rw-r--r--app/assets/javascripts/design_management/pages/index.vue8
1 files changed, 3 insertions, 5 deletions
diff --git a/app/assets/javascripts/design_management/pages/index.vue b/app/assets/javascripts/design_management/pages/index.vue
index 7bf9454240b..fb6a91abcdc 100644
--- a/app/assets/javascripts/design_management/pages/index.vue
+++ b/app/assets/javascripts/design_management/pages/index.vue
@@ -113,9 +113,7 @@ export default {
return !this.isSaving && !this.hasDesigns;
},
isDesignCollectionCopying() {
- return (
- this.designCollection && ['PENDING', 'COPYING'].includes(this.designCollection.copyState)
- );
+ return this.designCollection && this.designCollection.copyState === 'IN_PROGRESS';
},
designDropzoneWrapperClass() {
return this.isDesignListEmpty
@@ -370,11 +368,11 @@ export default {
</gl-alert>
<header
v-else-if="isDesignCollectionCopying"
- class="card gl-p-3"
+ class="card"
data-testid="design-collection-is-copying"
>
<div class="card-header design-card-header border-bottom-0">
- <div class="card-title gl-my-0 gl-h-7">
+ <div class="card-title gl-display-flex gl-align-items-center gl-my-0 gl-h-7">
{{
s__(
'DesignManagement|Your designs are being copied and are on their way… Please refresh to update.',