Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
38a58978
Commit
38a58978
authored
Jul 11, 2016
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix GItHub client requests when rate limit is disabled
parent
158786ca
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
0 deletions
+14
-0
lib/gitlab/github_import/client.rb
lib/gitlab/github_import/client.rb
+5
-0
spec/lib/gitlab/github_import/client_spec.rb
spec/lib/gitlab/github_import/client_spec.rb
+9
-0
No files found.
lib/gitlab/github_import/client.rb
View file @
38a58978
...
...
@@ -78,6 +78,11 @@ module Gitlab
def
rate_limit
api
.
rate_limit!
# 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.
rescue
Octokit
::
NotFound
OpenStruct
.
new
(
remaining:
GITHUB_SAFE_REMAINING_REQUESTS
+
1
)
end
def
rate_limit_exceed?
...
...
spec/lib/gitlab/github_import/client_spec.rb
View file @
38a58978
...
...
@@ -61,4 +61,13 @@ describe Gitlab::GithubImport::Client, lib: true do
expect
(
client
.
api
.
api_endpoint
).
to
eq
'https://github.company.com/'
end
end
context
'when rate limit is disabled'
do
it
'does not raise error'
do
stub_request
(
:get
,
/api.github.com/
)
allow
(
client
.
api
).
to
receive
(
:rate_limit!
).
and_raise
(
Octokit
::
NotFound
)
expect
{
client
.
issues
}.
not_to
raise_error
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment