diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2018-05-03 22:00:30 +0300 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-05-03 22:00:30 +0300 |
commit | 76ab3f01a61ca15dd81fe6da9e2512d2465488b1 (patch) | |
tree | b25499fa3ee5c523ab9899ccd919b094f6df428e | |
parent | 622aeea9e23ad42196d3736915574167069c7860 (diff) | |
parent | 8d29dd960c1ba8f2f40a1f37cbc937afcbfc291c (diff) |
Merge branch 'add-loading-icon-padding-for-pipeline-environments' into 'master'
Add loading icon padding for pipeline environments
See merge request gitlab-org/gitlab-ce!18631
-rw-r--r-- | app/assets/javascripts/environments/components/container.vue | 1 | ||||
-rw-r--r-- | changelogs/unreleased/add-loading-icon-padding-for-pipeline-environments.yml | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/environments/components/container.vue b/app/assets/javascripts/environments/components/container.vue index dbee81fa320..6bd7c6b49cb 100644 --- a/app/assets/javascripts/environments/components/container.vue +++ b/app/assets/javascripts/environments/components/container.vue @@ -43,6 +43,7 @@ <div class="environments-container"> <loading-icon + class="prepend-top-default" label="Loading environments" v-if="isLoading" size="3" diff --git a/changelogs/unreleased/add-loading-icon-padding-for-pipeline-environments.yml b/changelogs/unreleased/add-loading-icon-padding-for-pipeline-environments.yml new file mode 100644 index 00000000000..a6304418517 --- /dev/null +++ b/changelogs/unreleased/add-loading-icon-padding-for-pipeline-environments.yml @@ -0,0 +1,5 @@ +--- +title: Add loading icon padding for pipeline environments +merge_request: 18631 +author: George Tsiolis +type: fixed |