diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-07-12 16:12:26 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-07-12 16:12:26 +0000 |
commit | eac0433f864b89a19bd3ca82afaf7957a9a3148f (patch) | |
tree | c82c40ec65209a254f93c1a9911ddc8ef361b9e0 /CHANGELOG | |
parent | 7ed103b47efa9bbbf051450fb792511d8d691290 (diff) | |
parent | 78a5de99e9686bce11ba386e5d59c3e8085e40be (diff) | |
download | gitlab-ce-eac0433f864b89a19bd3ca82afaf7957a9a3148f.tar.gz |
Merge branch 'fix-gh-rate-limit' into 'master'
Fix GitHub client requests when rate limit is disabled
## What does this MR do?
GitHub Rate Limit API returns 404 when the rate limit is disabled. In this case we just want to return gracefully instead of spitting out an error.
## Are there points in the code the reviewer needs to double check?
No.
## Why was this MR needed?
GitHub importer fails when rate limit is disabled in GitHub Enterprise.
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ee/issues/697
## 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
- [x] All builds are passing
- [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)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5191
Diffstat (limited to 'CHANGELOG')
-rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 8bbd8ccd465..a1d44d02bc5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -80,6 +80,7 @@ v 8.10.0 (unreleased) - Add reminder to not paste private SSH keys !4399 (Ingo Blechschmidt) - Remove duplicate `description` field in `MergeRequest` entities (Ben Boeckel) - Style of import project buttons were fixed in the new project page. !5183 (rdemirbay) + - Fix GitHub client requests when rate limit is disabled v 8.9.6 (unreleased) - Fix importing of events under notes for GitLab projects |