Skip to content

Commit 09cc5b3

Browse files
rspeicherrspeicher
committed
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
2 parents e77f89e + b4f6fbd commit 09cc5b3

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

‎lib/gitlab_net.rb‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
class GitlabNet # rubocop:disable Metrics/ClassLength
1111
include HTTPHelper
1212

13-
class ApiUnreachableError < StandardError; end
14-
class NotFound < StandardError; end
15-
1613
CHECK_TIMEOUT = 5
1714
API_INACCESSIBLE_MESSAGE = 'API is not accessible'.freeze
1815

‎lib/gitlab_net/errors.rb‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
class GitlabNet
2+
class ApiUnreachableError < StandardError; end
3+
class NotFound < StandardError; end
4+
end

‎lib/http_helper.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
require_relative 'httpunix'
22
require_relative 'gitlab_logger'
3+
require_relative 'gitlab_net/errors'
34

45
module HTTPHelper
56
READ_TIMEOUT = 300

0 commit comments

Comments
 (0)