Add latest changes from gitlab-org/gitlab@13-2-stable-ee

6 files changed, 7 insertions, 34 deletions

diff --git a/app/assets/javascripts/environments/components/container.vue b/app/assets/javascripts/environments/components/container.vue
index 899d7ec8521..4c6d233c4d2 100644
--- a/app/assets/javascripts/environments/components/container.vue
+++ b/app/assets/javascripts/environments/components/container.vue
@@ -67,12 +67,7 @@ export default {
 
 <template>
   <div class="environments-container">
-    <gl-loading-icon
-      v-if="isLoading"
-      size="md"
-      class="prepend-top-default"
-      label="Loading environments"
-    />
+    <gl-loading-icon v-if="isLoading" size="md" class="gl-mt-3" label="Loading environments" />
 
     <slot name="emptyState"></slot>
 
diff --git a/app/assets/javascripts/environments/components/empty_state.vue b/app/assets/javascripts/environments/components/empty_state.vue
index ca2ac4c3c53..977da12e8a9 100644
--- a/app/assets/javascripts/environments/components/empty_state.vue
+++ b/app/assets/javascripts/environments/components/empty_state.vue
@@ -2,14 +2,6 @@
 export default {
   name: 'EnvironmentsEmptyState',
   props: {
-    newPath: {
-      type: String,
-      required: true,
-    },
-    canCreateEnvironment: {
-      type: Boolean,
-      required: true,
-    },
     helpPath: {
       type: String,
       required: true,
@@ -28,18 +20,8 @@ export default {
           s__(`Environments|Environments are places where
         code gets deployed, such as staging or production.`)
         }}
-        <a :href="helpPath"> {{ s__('Environments|Read more about environments') }} </a>
+        <a :href="helpPath"> {{ s__('Environments|More information') }} </a>
       </p>
-
-      <div class="text-center">
-        <a
-          v-if="canCreateEnvironment"
-          :href="newPath"
-          class="btn btn-success js-new-environment-button"
-        >
-          {{ s__('Environments|New environment') }}
-        </a>
-      </div>
     </div>
   </div>
 </template>
diff --git a/app/assets/javascripts/environments/components/environments_app.vue b/app/assets/javascripts/environments/components/environments_app.vue
index b8bcca814cd..d26bd14a937 100644
--- a/app/assets/javascripts/environments/components/environments_app.vue
+++ b/app/assets/javascripts/environments/components/environments_app.vue
@@ -159,11 +159,7 @@ export default {
       @onChangePage="onChangePage"
     >
       <template v-if="!isLoading && state.environments.length === 0" #emptyState>
-        <empty-state
-          :new-path="newEnvironmentPath"
-          :help-path="helpPagePath"
-          :can-create-environment="canCreateEnvironment"
-        />
+        <empty-state :help-path="helpPagePath" />
       </template>
     </container>
   </div>
diff --git a/app/assets/javascripts/environments/components/environments_table.vue b/app/assets/javascripts/environments/components/environments_table.vue
index 380e16c7b71..ab1818e61fa 100644
--- a/app/assets/javascripts/environments/components/environments_table.vue
+++ b/app/assets/javascripts/environments/components/environments_table.vue
@@ -188,7 +188,7 @@ export default {
 
       <template v-if="shouldRenderFolderContent(model)">
         <div v-if="model.isLoadingFolderContent" :key="`loading-item-${i}`">
-          <gl-loading-icon size="md" class="prepend-top-16" />
+          <gl-loading-icon size="md" class="gl-mt-5" />
         </div>
 
         <template v-else>
diff --git a/app/assets/javascripts/environments/mixins/environments_mixin.js b/app/assets/javascripts/environments/mixins/environments_mixin.js
index 73dc8c02485..f2b464464e9 100644
--- a/app/assets/javascripts/environments/mixins/environments_mixin.js
+++ b/app/assets/javascripts/environments/mixins/environments_mixin.js
@@ -145,7 +145,7 @@ export default {
 
     deleteEnvironment(environment) {
       const endpoint = environment.delete_path;
-      const mountedToShow = environment.mounted_to_show;
+      const { onSingleEnvironmentPage } = environment;
       const errorMessage = s__(
         'Environments|An error occurred while deleting the environment. Check if the environment stopped; if not, stop it and try again.',
       );
@@ -153,7 +153,7 @@ export default {
       this.service
         .deleteAction(endpoint)
         .then(() => {
-          if (!mountedToShow) {
+          if (!onSingleEnvironmentPage) {
             // Reload as a first solution to bust the ETag cache
             window.location.reload();
             return;
diff --git a/app/assets/javascripts/environments/mount_show.js b/app/assets/javascripts/environments/mount_show.js
index 1929ed080a1..d0b68b0c14f 100644
--- a/app/assets/javascripts/environments/mount_show.js
+++ b/app/assets/javascripts/environments/mount_show.js
@@ -15,7 +15,7 @@ export default () => {
     data() {
       const environment = JSON.parse(JSON.stringify(container.dataset));
       environment.delete_path = environment.deletePath;
-      environment.mounted_to_show = true;
+      environment.onSingleEnvironmentPage = true;
 
       return {
         environment,