Commit 46ff7e28 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch '39509-fix-wiki-create-sidebar-overlap' into 'master'

Fix overlap of right-sidebar and wiki create page form

Closes #39509

See merge request gitlab-org/gitlab-ce!15075
parents a479362d 9edb2228
...@@ -19,11 +19,7 @@ module NavHelper ...@@ -19,11 +19,7 @@ module NavHelper
end end
elsif current_path?('jobs#show') elsif current_path?('jobs#show')
%w[page-gutter build-sidebar right-sidebar-expanded] %w[page-gutter build-sidebar right-sidebar-expanded]
elsif current_path?('wikis#show') || elsif current_controller?('wikis') && current_action?('show', 'create', 'edit', 'update', 'history', 'git_access')
current_path?('wikis#edit') ||
current_path?('wikis#update') ||
current_path?('wikis#history') ||
current_path?('wikis#git_access')
%w[page-gutter wiki-sidebar right-sidebar-expanded] %w[page-gutter wiki-sidebar right-sidebar-expanded]
else else
[] []
......
---
title: Fix overlap of right-sidebar and main content when creating a Wiki page
merge_request:
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment