Add latest changes from gitlab-org/gitlab@master

3 files changed, 4 insertions, 4 deletions

diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb
index 8f647a49a64..c0de311d218 100644
--- a/app/helpers/groups_helper.rb
+++ b/app/helpers/groups_helper.rb
@@ -43,7 +43,7 @@ module GroupsHelper
   end
 
   def group_information_title(group)
-    if Feature.enabled?(:sidebar_refactor, current_user)
+    if Feature.enabled?(:sidebar_refactor, current_user, default_enabled: :yaml)
       group.subgroup? ? _('Subgroup information') : _('Group information')
     else
       group.subgroup? ? _('Subgroup overview') : _('Group overview')
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb
index f03c4356015..3a6b9ed2cfc 100644
--- a/app/helpers/nav_helper.rb
+++ b/app/helpers/nav_helper.rb
@@ -12,7 +12,7 @@ module NavHelper
   def page_with_sidebar_class
     class_name = page_gutter_class
     class_name << 'page-with-contextual-sidebar' if defined?(@left_sidebar) && @left_sidebar
-    class_name << 'sidebar-refactoring' if Feature.enabled?(:sidebar_refactor, current_user)
+    class_name << 'sidebar-refactoring' if Feature.enabled?(:sidebar_refactor, current_user, default_enabled: :yaml)
     class_name << 'page-with-icon-sidebar' if collapsed_sidebar? && @left_sidebar
     class_name -= ['right-sidebar-expanded'] if defined?(@right_sidebar) && !@right_sidebar
 
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index f2a50ce1325..8800bd0643c 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -612,12 +612,12 @@ module ProjectsHelper
   end
 
   def settings_container_registry_expiration_policy_available?(project)
-    Feature.disabled?(:sidebar_refactor, current_user) &&
+    Feature.disabled?(:sidebar_refactor, current_user, default_enabled: :yaml) &&
       can_destroy_container_registry_image?(current_user, project)
   end
 
   def settings_packages_and_registries_enabled?(project)
-    Feature.enabled?(:sidebar_refactor, current_user) &&
+    Feature.enabled?(:sidebar_refactor, current_user, default_enabled: :yaml) &&
       can_destroy_container_registry_image?(current_user, project)
   end