Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 5 deletions

diff --git a/app/assets/javascripts/boards/components/board_content_sidebar.vue b/app/assets/javascripts/boards/components/board_content_sidebar.vue
index 0320b4d925e..d25169b5b9d 100644
--- a/app/assets/javascripts/boards/components/board_content_sidebar.vue
+++ b/app/assets/javascripts/boards/components/board_content_sidebar.vue
@@ -138,9 +138,8 @@ export default {
 <template>
   <mounting-portal mount-to="#js-right-sidebar-portal" name="board-content-sidebar" append>
     <gl-drawer
-      v-if="showSidebar"
       v-bind="$attrs"
-      :open="isSidebarOpen"
+      :open="showSidebar"
       class="boards-sidebar gl-absolute"
       variant="sidebar"
       @close="handleClose"
diff --git a/app/assets/javascripts/boards/components/board_settings_sidebar.vue b/app/assets/javascripts/boards/components/board_settings_sidebar.vue
index c559e4cdbd3..e93edad675c 100644
--- a/app/assets/javascripts/boards/components/board_settings_sidebar.vue
+++ b/app/assets/javascripts/boards/components/board_settings_sidebar.vue
@@ -58,7 +58,7 @@ export default {
       return ListTypeTitles[ListType.label];
     },
     showSidebar() {
-      return this.sidebarType === LIST;
+      return this.sidebarType === LIST && this.isSidebarOpen;
     },
   },
   created() {
@@ -87,10 +87,9 @@ export default {
 <template>
   <mounting-portal mount-to="#js-right-sidebar-portal" name="board-settings-sidebar" append>
     <gl-drawer
-      v-if="showSidebar"
       v-bind="$attrs"
       class="js-board-settings-sidebar gl-absolute"
-      :open="isSidebarOpen"
+      :open="showSidebar"
       variant="sidebar"
       @close="unsetActiveId"
     >