kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix overlap of right-sidebar and wiki create page form 

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39509
This commit is contained in:
Eric Eastwood 2017-10-30 04:21:38 -04:00
parent a1aa4f00c2
commit 9edb222825
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/helpers/nav_helper.rb
View File

@ -19,11 +19,7 @@ module NavHelper
end
elsif current_path?('jobs#show')
%w[page-gutter build-sidebar right-sidebar-expanded]
elsif current_path?('wikis#show') ||
current_path?('wikis#edit') ||
current_path?('wikis#update') ||
current_path?('wikis#history') ||
current_path?('wikis#git_access')
elsif current_controller?('wikis') && current_action?('show', 'create', 'edit', 'update', 'history', 'git_access')
%w[page-gutter wiki-sidebar right-sidebar-expanded]
else
[]

5
changelogs/unreleased/39509-fix-wiki-create-sidebar-overlap.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix overlap of right-sidebar and main content when creating a Wiki page
merge_request:
author:
type: fixed