Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

3 files changed, 7 insertions, 5 deletions

diff --git a/app/assets/javascripts/environments/components/environments_app.vue b/app/assets/javascripts/environments/components/environments_app.vue
index ed852895f10..602639f09a6 100644
--- a/app/assets/javascripts/environments/components/environments_app.vue
+++ b/app/assets/javascripts/environments/components/environments_app.vue
@@ -85,7 +85,7 @@ export default {
       this.store.updateEnvironmentProp(folder, 'isLoadingFolderContent', showLoader);
 
       this.service
-        .getFolderContent(folder.folder_path)
+        .getFolderContent(folder.folder_path, folder.state)
         .then((response) => this.store.setfolderContent(folder, response.data.environments))
         .then(() => this.store.updateEnvironmentProp(folder, 'isLoadingFolderContent', false))
         .catch(() => {
@@ -129,7 +129,7 @@ export default {
           :href="newEnvironmentPath"
           data-testid="new-environment"
           category="primary"
-          variant="success"
+          variant="confirm"
           >{{ $options.i18n.newEnvironmentButtonLabel }}</gl-button
         >
       </div>
@@ -164,7 +164,7 @@ export default {
               :href="newEnvironmentPath"
               data-testid="new-environment"
               category="primary"
-              variant="success"
+              variant="confirm"
               >{{ $options.i18n.newEnvironmentButtonLabel }}</gl-button
             >
           </div>
diff --git a/app/assets/javascripts/environments/mixins/environments_pagination_api_mixin.js b/app/assets/javascripts/environments/mixins/environments_pagination_api_mixin.js
index b62fe196a6f..a76c8e445ed 100644
--- a/app/assets/javascripts/environments/mixins/environments_pagination_api_mixin.js
+++ b/app/assets/javascripts/environments/mixins/environments_pagination_api_mixin.js
@@ -16,6 +16,7 @@ export default {
       let params = {
         scope,
         page: '1',
+        nested: true,
       };
 
       params = this.onChangeWithFilter(params);
@@ -27,6 +28,7 @@ export default {
       /* URLS parameters are strings, we need to parse to match types */
       let params = {
         page: Number(page).toString(),
+        nested: true,
       };
 
       if (this.scope) {
diff --git a/app/assets/javascripts/environments/services/environments_service.js b/app/assets/javascripts/environments/services/environments_service.js
index 122c8f84a2c..dbd82a3c985 100644
--- a/app/assets/javascripts/environments/services/environments_service.js
+++ b/app/assets/javascripts/environments/services/environments_service.js
@@ -21,7 +21,7 @@ export default class EnvironmentsService {
     return axios.delete(endpoint, {});
   }
 
-  getFolderContent(folderUrl) {
-    return axios.get(`${folderUrl}.json?per_page=${this.folderResults}`);
+  getFolderContent(folderUrl, scope) {
+    return axios.get(`${folderUrl}.json?per_page=${this.folderResults}&scope=${scope}`);
   }
 }