summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-10-30 04:21:38 -0400
committerEric Eastwood <contact@ericeastwood.com>2017-10-31 03:23:47 -0500
commit9edb22282582d3303306f298f9336db3c59b5e02 (patch)
tree20ed694173c255ffa3f50ba066305dea4ad2a97a
parenta1aa4f00c27afdd3faf5a551b24bfe1555533a4d (diff)
downloadgitlab-ce-9edb22282582d3303306f298f9336db3c59b5e02.tar.gz
Fix overlap of right-sidebar and wiki create page form39509-fix-wiki-create-sidebar-overlap
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39509
-rw-r--r--app/helpers/nav_helper.rb6
-rw-r--r--changelogs/unreleased/39509-fix-wiki-create-sidebar-overlap.yml5
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