Fix base linter loading warnings

7a846352 · Doug Stull · f589d1a8 · 7a846352 · 7a846352
Commit 7a846352 authored Dec 21, 2020 by Doug Stull
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 4 deletions

lib/gitlab/danger/commit_linter.rb lib/gitlab/danger/commit_linter.rb +9 -3

lib/gitlab/danger/merge_request_linter.rb lib/gitlab/danger/merge_request_linter.rb +7 -1

No files found.
--- a/lib/gitlab/danger/commit_linter.rb
+++ b/lib/gitlab/danger/commit_linter.rb
 # frozen_string_literal: true

-require_relative 'base_linter'
-
 emoji_checker_path = File.expand_path('emoji_checker', __dir__)
-defined?(Rails) ? require_dependency(emoji_checker_path) : require_relative(emoji_checker_path)
+base_linter_path = File.expand_path('base_linter', __dir__)
+
+if defined?(Rails)
+  require_dependency(base_linter_path)
+  require_dependency(emoji_checker_path)
+else
+  require_relative(base_linter_path)
+  require_relative(emoji_checker_path)
+end

 module Gitlab
  module Danger

--- a/lib/gitlab/danger/merge_request_linter.rb
+++ b/lib/gitlab/danger/merge_request_linter.rb
 # frozen_string_literal: true

-require_relative 'base_linter'
+base_linter_path = File.expand_path('base_linter', __dir__)
+
+if defined?(Rails)
+  require_dependency(base_linter_path)
+else
+  require_relative(base_linter_path)
+end

 module Gitlab
  module Danger