diff options
| author | Francisco Javier López <fjlopez@gitlab.com> | 2019-01-09 16:05:52 +0100 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-31 16:51:53 +0100 |
| commit | 740f07b1ec16e225a29e4b910e64775dd3985e88 (patch) | |
| tree | 16a76320a74fd3e7dfb4ea9b8ee228a90e0ce637 /app/policies | |
| parent | f27cba0feef5d664c97082a0fe1b2e4b3d62f839 (diff) | |
| download | gitlab-ce-740f07b1ec16e225a29e4b910e64775dd3985e88.tar.gz | |
Fixed bug when external wiki is enabled
When the external wiki is enabled, the internal wiki link is replaced
by the external wiki url. But the internal wiki is still accessible.
In this change the external wiki will have its own tab in the sidebar
and only if the services are disabled the tab (and access rights)
will not be displayed.
Diffstat (limited to 'app/policies')
| -rw-r--r-- | app/policies/project_policy.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb index d90bb647018..95ae85ed60c 100644 --- a/app/policies/project_policy.rb +++ b/app/policies/project_policy.rb @@ -314,7 +314,7 @@ class ProjectPolicy < BasePolicy prevent(*create_read_update_admin_destroy(:project_snippet)) end - rule { wiki_disabled & ~has_external_wiki }.policy do + rule { wiki_disabled }.policy do prevent(*create_read_update_admin_destroy(:wiki)) prevent(:download_wiki_code) end |