diff options
Diffstat (limited to 'app/models/milestone.rb')
| -rw-r--r-- | app/models/milestone.rb | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/app/models/milestone.rb b/app/models/milestone.rb index 0e2842c3c11..868bee9961b 100644 --- a/app/models/milestone.rb +++ b/app/models/milestone.rb @@ -61,18 +61,10 @@ class Milestone < ApplicationRecord end def self.reference_pattern - if Feature.enabled?(:milestone_reference_pattern, default_enabled: :yaml) - new_reference_pattern - else - old_reference_pattern - end - end - - def self.new_reference_pattern # NOTE: The iid pattern only matches when all characters on the expression # are digits, so it will match %2 but not %2.1 because that's probably a # milestone name and we want it to be matched as such. - @new_reference_pattern ||= %r{ + @reference_pattern ||= %r{ (#{Project.reference_pattern})? #{Regexp.escape(reference_prefix)} (?: @@ -87,26 +79,6 @@ class Milestone < ApplicationRecord }x end - # Deprecated: https://gitlab.com/gitlab-org/gitlab/-/issues/336268 - def self.old_reference_pattern - # NOTE: The iid pattern only matches when all characters on the expression - # are digits, so it will match %2 but not %2.1 because that's probably a - # milestone name and we want it to be matched as such. - @old_reference_pattern ||= %r{ - (#{Project.reference_pattern})? - #{Regexp.escape(reference_prefix)} - (?: - (?<milestone_iid> - \d+(?!\S\w)\b # Integer-based milestone iid, or - ) | - (?<milestone_name> - [^"\s]+\b | # String-based single-word milestone title, or - "[^"]+" # String-based multi-word milestone surrounded in quotes - ) - ) - }x - end - def self.link_reference_pattern @link_reference_pattern ||= super("milestones", /(?<milestone>\d+)/) end |