summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKushal Pandya <kushalspandya@gmail.com>2019-01-09 16:15:57 +0000
committerKushal Pandya <kushalspandya@gmail.com>2019-01-09 16:15:57 +0000
commit00ac520e2025d79ce4c51650e6312ce043bfab1f (patch)
treeaafe2e4c49b4d5b9d88fc018a92e858ec199ddf9
parent81aacf9c6f6c8565638ee340d5df96e2f7d1de53 (diff)
parent4f79bd780a07f5cf4aa085c30de7c95132c8aa91 (diff)
downloadgitlab-ce-00ac520e2025d79ce4c51650e6312ce043bfab1f.tar.gz
Merge branch '55242-skeleton-loading-releases' into 'master'
Adds skeleton loading for releases Closes #55242 See merge request gitlab-org/gitlab-ce!24264
-rw-r--r--app/assets/javascripts/releases/components/app.vue6
-rw-r--r--changelogs/unreleased/55242-skeleton-loading-releases.yml5
2 files changed, 8 insertions, 3 deletions
diff --git a/app/assets/javascripts/releases/components/app.vue b/app/assets/javascripts/releases/components/app.vue
index 0ad5ee2915c..5a06c4fec58 100644
--- a/app/assets/javascripts/releases/components/app.vue
+++ b/app/assets/javascripts/releases/components/app.vue
@@ -1,12 +1,12 @@
<script>
import { mapState, mapActions } from 'vuex';
-import { GlLoadingIcon, GlEmptyState } from '@gitlab/ui';
+import { GlSkeletonLoading, GlEmptyState } from '@gitlab/ui';
import ReleaseBlock from './release_block.vue';
export default {
name: 'ReleasesApp',
components: {
- GlLoadingIcon,
+ GlSkeletonLoading,
GlEmptyState,
ReleaseBlock,
},
@@ -43,7 +43,7 @@ export default {
</script>
<template>
<div class="prepend-top-default">
- <gl-loading-icon v-if="isLoading" :size="2" class="js-loading prepend-top-20" />
+ <gl-skeleton-loading v-if="isLoading" class="js-loading" />
<gl-empty-state
v-else-if="shouldRenderEmptyState"
diff --git a/changelogs/unreleased/55242-skeleton-loading-releases.yml b/changelogs/unreleased/55242-skeleton-loading-releases.yml
new file mode 100644
index 00000000000..43cda64ce04
--- /dev/null
+++ b/changelogs/unreleased/55242-skeleton-loading-releases.yml
@@ -0,0 +1,5 @@
+---
+title: Adds skeleton loading to releases page
+merge_request:
+author:
+type: changed