kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/spec
History
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
..
config
…
controllers Merge branch 'restrict-failed-2fa-attempts' into 'master' 2016-10-04 15:04:57 +00:00
factories Merge branch '21983-member-add_user-doesn-t-detect-existing-members-that-have-requested-access' into 'master' 2016-10-02 11:42:57 +00:00
features Adds v-pre to code blocks in comments 2016-10-04 14:06:44 +01:00
finders Enable Lint/StringConversionInInterpolation cop and autocorrect offenses 2016-10-03 16:09:57 +02:00
fixtures Returns the total number of issues in the JSON response 2016-08-31 09:30:37 +01:00
helpers Merge branch 'rc-new-members-request-access-service' into 'master' 2016-10-02 11:33:06 +00:00
initializers
…
javascripts Send ajax request for label update only if they are changed (#19472 !5071) 2016-09-27 10:23:15 -05:00
lib Merge branch 'fix/22225' into 'master' 2016-10-04 17:00:21 +00:00
mailers override subject method in devise mailer 2016-10-03 18:07:28 +08:00
models Merge branch 'zj-save-environment-deployment-refs' into 'master' 2016-10-04 13:55:07 +00:00
policies Test if issue authors can access private projects 2016-09-20 14:57:23 -03:00
requests Invert method's naming 2016-10-03 16:57:48 +02:00
routing Fix markdown help references 2016-08-26 09:38:21 -05:00
services Merge branch 'issue_22446' into 'master' 2016-10-04 11:27:47 +00:00
support Simplify Mentionable concern instance methods 2016-10-04 10:45:48 +02:00
tasks/gitlab
…
uploaders
…
views Merge branch '21744-fix-missing-values-in-linter' into 'master' 2016-09-30 16:51:47 +00:00
workers Added cron to prune events older than 12 months. 2016-09-07 19:41:25 +02:00
factories_spec.rb
…
rails_helper.rb
…
simplecov_env.rb Bump SimpleCov merge timeout to 365 days 2016-08-22 13:44:14 +02:00
spec_helper.rb Upgrade Devise from 4.1.1 to 4.2.0. 2016-09-27 20:08:49 -06:00
teaspoon_env.rb
…