diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-08-24 20:39:29 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-08-24 20:39:29 +0000 |
| commit | 291fd85880c7a881beed5afdf89c9ca91c4c4e70 (patch) | |
| tree | c9696c2421c53f0869fa9d2c010543d2c7e5cfa8 /lib/api/internal.rb | |
| parent | 910da23119095e1972ea21fddfee3d7082c113b8 (diff) | |
| parent | 8e52705776dce7021ac1a150253037f085638a46 (diff) | |
| download | gitlab-ce-291fd85880c7a881beed5afdf89c9ca91c4c4e70.tar.gz | |
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
Diffstat (limited to 'lib/api/internal.rb')
0 files changed, 0 insertions, 0 deletions