Commit 09cc5b3a authored by Robert Speicher's avatar Robert Speicher

Merge branch 'sh-fix-circular-dependency-errors' into 'master'

Remove circular dependency between HTTPHelper and GitlabNet

Closes #169

See merge request gitlab-org/gitlab-shell!258
parents e77f89e1 b4f6fbd8
......@@ -10,9 +10,6 @@ require_relative 'http_helper'
class GitlabNet # rubocop:disable Metrics/ClassLength
include HTTPHelper
class ApiUnreachableError < StandardError; end
class NotFound < StandardError; end
CHECK_TIMEOUT = 5
API_INACCESSIBLE_MESSAGE = 'API is not accessible'.freeze
......
class GitlabNet
class ApiUnreachableError < StandardError; end
class NotFound < StandardError; end
end
require_relative 'httpunix'
require_relative 'gitlab_logger'
require_relative 'gitlab_net/errors'
module HTTPHelper
READ_TIMEOUT = 300
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment