Skip to content
Commit b10f55b9 authored by Yorick Peterse's avatar Yorick Peterse
Browse files

Merge branch 'security-fix-wiki-access-rights-with-external-wiki-enabled-11-5' into 'security-11-5'

[11.5] Fix access to internal wiki when external wiki is enabled

See merge request gitlab/gitlabhq!2802

(cherry picked from commit a3d3820ace7cef843b3a71b1962a92fc228145e2)

b718e14f Fixed bug when external wiki is enabled
a906ba0f Fixed some related spec problems
parent 6cdd4c15
Loading
Loading
Loading