Douwe Maan 291fd85880 Merge branch 'github-importer' into 'master' ... Does not halt the GitHub import process when an error occurs ## What are the relevant issue numbers? Fixes #20385 https://gitlab.com/gitlab-org/gitlab-ce/issues/20149 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] 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 !5763		2016-08-24 20:39:29 +00:00
..
banzai	Merge branch 'relative-link-filter-ref' into 'master'	2016-08-09 21:45:59 +00:00
ci	Fix test failures, that did occur because of missing previously used `reload_status!` call	2016-08-11 22:54:25 +02:00
container_registry	Explicitly remove authorization token and make sure that invalid addresses are properly handled	2016-07-15 17:35:23 +02:00
gitlab	Add readable error message when remote data could not be fully imported	2016-08-24 12:17:13 -03:00
json_web_token	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
disable_email_interceptor_spec.rb	adds second batch of tests changed to active tense	2016-08-09 15:11:39 +01:00
extracts_path_spec.rb	Add failing test for #21334	2016-08-24 02:18:38 +02:00
file_size_validator_spec.rb	…
git_ref_validator_spec.rb	…
gitlab_spec.rb	Update `Gitlab.com?` to support staging	2016-06-27 15:10:36 -04:00
repository_cache_spec.rb	Use project ID in repository cache to prevent stale data from persisting across projects	2016-07-25 05:09:28 -07:00