diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-06-27 19:15:22 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-06-27 19:15:22 +0000 |
| commit | e4dacb353edf6129897d1bbfa3977da9487fa78c (patch) | |
| tree | e61ca55893c1919cfe59d02381a26c7257457ca9 /.gitattributes | |
| parent | 298e4ece30bf0f5d7fefd0314c923ae18715338c (diff) | |
| parent | 16a0303801319e722bfcdadbcdeae8550e3e5dcf (diff) | |
| download | gitlab-ce-e4dacb353edf6129897d1bbfa3977da9487fa78c.tar.gz | |
Merge branch 'issue_18398' into 'master'
Check for conflict with wiki projects when creating a new project.
## What does this MR do?
Check for conflict with wiki projects when creating a new project
## Are there points in the code the reviewer needs to double check?
No
## Why was this MR needed?
To avoid exposing the information from the wiki repository of other project
## What are the relevant issue numbers?
#18398
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [ ] 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)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !4918
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions