diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-21 09:12:21 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-21 09:12:21 +0000 |
| commit | 85a539e8ff460559e61bb7b9409864c8e6e3978a (patch) | |
| tree | 6cf46c0f8c9f2064c04f3452c96cb5224f564780 /doc/api | |
| parent | 231ba872876590ba6a58111012d8d26d77a07faa (diff) | |
| parent | f8afe47a87ca880c95163aa7e731638a730ed14b (diff) | |
| download | gitlab-ce-85a539e8ff460559e61bb7b9409864c8e6e3978a.tar.gz | |
Merge branch '20067-wiki-not-visible-from-web' into 'master'
Make Service.external_wikis return only active external wikis
Fixes #20067.
## Does this MR meet the acceptance criteria?
- [x] No CHANGELOG since it fixes a RC12 regression
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5387
Diffstat (limited to 'doc/api')
0 files changed, 0 insertions, 0 deletions