From 7b6a6bfc589deae23c8c0cefcc1f9dc4003f2093 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 14 Jan 2022 15:16:52 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/helpers/page_layout_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/helpers/page_layout_helper.rb') diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb index 2729951d685..fb74a52fcda 100644 --- a/app/helpers/page_layout_helper.rb +++ b/app/helpers/page_layout_helper.rb @@ -125,7 +125,7 @@ module PageLayoutHelper end def fluid_layout - current_user && current_user.layout == "fluid" + @force_fluid_layout == true || (current_user && current_user.layout == "fluid") end def blank_container(enabled = false) -- cgit v1.2.3