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:
authorMike Greiling <mike@pixelcog.com>2016-09-20 02:02:52 +0300
committerMike Greiling <mike@pixelcog.com>2016-09-20 08:51:00 +0300
commit76ae5af8ce9d88cb1da4f8b9836fe78b7c2ad30e (patch)
treea2806e88efa0a00a1b912b1f8ba61581ee613449 /app/helpers/page_layout_helper.rb
parent791079e2abeef1d3ebeecc8157bfb02cfdf9b36d (diff)
ensure the 'fixed layout' preference is honored whenever possible
see #22343 for issue description
Diffstat (limited to 'app/helpers/page_layout_helper.rb')
-rw-r--r--app/helpers/page_layout_helper.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb
index 22387d66451..7d4d049101a 100644
--- a/app/helpers/page_layout_helper.rb
+++ b/app/helpers/page_layout_helper.rb
@@ -92,12 +92,8 @@ module PageLayoutHelper
end
end
- def fluid_layout(enabled = false)
- if @fluid_layout.nil?
- @fluid_layout = (current_user && current_user.layout == "fluid") || enabled
- else
- @fluid_layout
- end
+ def fluid_layout
+ current_user && current_user.layout == "fluid"
end
def blank_container(enabled = false)