Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-01-14 18:16:52 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-01-14 18:16:52 +0300
commit7b6a6bfc589deae23c8c0cefcc1f9dc4003f2093 (patch)
tree8a3d3fbdef641ed07978f4a82cd780b6396e02eb /app/helpers/page_layout_helper.rb
parent8a70817cd9327a4cdfbd71a11f9aa22e838fabf6 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/page_layout_helper.rb')
-rw-r--r--app/helpers/page_layout_helper.rb2
1 files changed, 1 insertions, 1 deletions
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)