diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-04 20:00:21 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-04 20:00:21 +0300 |
| commit | 3fd5ea3d4362e6946f8502bb30825cc14013b374 (patch) | |
| tree | 86e13e1b5ac49a89c20c4374d1ab20abed6968c7 /config/routes.rb | |
| parent | 7887a3dafb6902cc39c831e307c48faf49f80b51 (diff) | |
| parent | 0bb7bfd0828bd8d0bcdb62b1fe0576efc36ebb78 (diff) | |
Merge branch 'fix/22225' into 'master'
Skip wiki creation when GitHub project has wiki enabled
## What does this MR do?
When importing a repository from if the repository has wiki, we should not create the default wiki. Otherwise the GitHub importer will fail because the wiki repository already exist. This bug was introduced here https://gitlab.com/gitlab-org/gitlab-ce/commit/892dea67717c0efbd6a28f7639f34535ec0a8747
## Are there points in the code the reviewer needs to double check?
No.
## Why was this MR needed?
GitLab fails to import GitHub Wiki.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [X] Added for this feature/bug
- [ ] All builds are passing
- [X] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] 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)
## What are the relevant issue numbers?
Fixes #22225
See merge request !6665
Diffstat (limited to 'config/routes.rb')
0 files changed, 0 insertions, 0 deletions