diff options
| author | manojmj <mmj@gitlab.com> | 2019-06-27 12:14:01 +0300 |
|---|---|---|
| committer | manojmj <mmj@gitlab.com> | 2019-07-05 12:39:04 +0300 |
| commit | c93ce836930a875452432ccc0c92733fb8adda29 (patch) | |
| tree | a29f7f6461bfd79983cb305d9a7d89ff5ecec3b3 /lib/gitlab/github_import | |
| parent | d1154dcd2b3b126cc4d6c3bba87c47b6669e697c (diff) | |
Do not allow localhost url redirection in GitHub Integration
Diffstat (limited to 'lib/gitlab/github_import')
| -rw-r--r-- | lib/gitlab/github_import/client.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/github_import/client.rb b/lib/gitlab/github_import/client.rb index a61beafae0d..826b35d685c 100644 --- a/lib/gitlab/github_import/client.rb +++ b/lib/gitlab/github_import/client.rb @@ -40,7 +40,7 @@ module Gitlab # otherwise hitting the rate limit will result in a thread # being blocked in a `sleep()` call for up to an hour. def initialize(token, per_page: 100, parallel: true) - @octokit = Octokit::Client.new( + @octokit = ::Octokit::Client.new( access_token: token, per_page: per_page, api_endpoint: api_endpoint @@ -139,7 +139,7 @@ module Gitlab begin yield - rescue Octokit::TooManyRequests + rescue ::Octokit::TooManyRequests raise_or_wait_for_rate_limit # This retry will only happen when running in sequential mode as we'll |