Sean McGivern 3fd5ea3d43 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 892dea6771 ## 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		2016-10-04 17:00:21 +00:00
..
api	Merge branch 'rc-improve-members-destroy-service' into 'master'	2016-10-04 10:50:21 +00:00
assets	…
backup	lib/backup: fix broken permissions when creating repo dir	2016-08-30 13:35:50 +02:00
banzai	Removed puts code 🙈	2016-10-04 14:28:57 +01:00
ci	Expose jobs to view	2016-09-30 12:22:55 +02:00
container_registry	…
gitlab	Skip wiki creation when GitHub project has wiki enabled	2016-10-04 13:06:45 -03:00
json_web_token	…
omni_auth	…
rouge/formatters	…
support	…
tasks	Remove Flog as we use a Rubocop that does its job.	2016-09-28 19:38:43 -06:00
banzai.rb	…
disable_email_interceptor.rb	…
event_filter.rb	…
expand_variables.rb	Update support for dynamic environments	2016-09-19 10:07:13 +02:00
extracts_path.rb	…
file_size_validator.rb	…
file_streamer.rb	…
gitlab.rb	…
gt_one_coercion.rb	…
repository_cache.rb	…
static_model.rb	…
unfold_form.rb	…
uploaded_file.rb	…
version_check.rb	…