diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-10-31 15:49:54 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-10-31 15:49:54 +0000 |
| commit | 46ff7e28791e65ca85ce5989f05fb2f5d1133b07 (patch) | |
| tree | 069741a4cbeb3713faf84d333daab6213c642d3e | |
| parent | a479362d51e3668188ec84217fa31821a1a192ae (diff) | |
| parent | 9edb22282582d3303306f298f9336db3c59b5e02 (diff) | |
| download | gitlab-ce-46ff7e28791e65ca85ce5989f05fb2f5d1133b07.tar.gz | |
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
| -rw-r--r-- | app/helpers/nav_helper.rb | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/39509-fix-wiki-create-sidebar-overlap.yml | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb index 5a74511afa7..8ada746b244 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -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 [] diff --git a/changelogs/unreleased/39509-fix-wiki-create-sidebar-overlap.yml b/changelogs/unreleased/39509-fix-wiki-create-sidebar-overlap.yml new file mode 100644 index 00000000000..aebf6363d97 --- /dev/null +++ b/changelogs/unreleased/39509-fix-wiki-create-sidebar-overlap.yml @@ -0,0 +1,5 @@ +--- +title: Fix overlap of right-sidebar and main content when creating a Wiki page +merge_request: +author: +type: fixed |