Commit c99670e5 authored by Dmytro Zaporozhets (DZ)'s avatar Dmytro Zaporozhets (DZ)

Merge branch 'fix-autoload-problem-in-relative-positioning' into 'master'

Fix autoload issue with RelativePositioning.range

See merge request gitlab-org/gitlab!53945
parents a64f507e 67542b8b
...@@ -13,5 +13,18 @@ module Gitlab ...@@ -13,5 +13,18 @@ module Gitlab
MIN_GAP = 2 MIN_GAP = 2
NoSpaceLeft = Class.new(StandardError) NoSpaceLeft = Class.new(StandardError)
IllegalRange = Class.new(ArgumentError)
def self.range(lhs, rhs)
if lhs && rhs
ClosedRange.new(lhs, rhs)
elsif lhs
StartingFrom.new(lhs)
elsif rhs
EndingAt.new(rhs)
else
raise IllegalRange, 'One of rhs or lhs must be provided' unless lhs && rhs
end
end
end end
end end
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
module Gitlab module Gitlab
module RelativePositioning module RelativePositioning
IllegalRange = Class.new(ArgumentError)
class Range class Range
attr_reader :lhs, :rhs attr_reader :lhs, :rhs
...@@ -34,18 +32,6 @@ module Gitlab ...@@ -34,18 +32,6 @@ module Gitlab
end end
end end
def self.range(lhs, rhs)
if lhs && rhs
ClosedRange.new(lhs, rhs)
elsif lhs
StartingFrom.new(lhs)
elsif rhs
EndingAt.new(rhs)
else
raise IllegalRange, 'One of rhs or lhs must be provided' unless lhs && rhs
end
end
class ClosedRange < RelativePositioning::Range class ClosedRange < RelativePositioning::Range
def initialize(lhs, rhs) def initialize(lhs, rhs)
@lhs, @rhs = lhs, rhs @lhs, @rhs = lhs, rhs
......
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