diff options
-rw-r--r-- | lib/filters/badges.rb | 4 | ||||
-rw-r--r-- | lib/filters/introduced_in.rb | 4 | ||||
-rw-r--r-- | lib/gitlab/navigation.rb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/filters/badges.rb b/lib/filters/badges.rb index e14b24e6..28d1fe11 100644 --- a/lib/filters/badges.rb +++ b/lib/filters/badges.rb @@ -25,13 +25,13 @@ class BadgesFilter < Nanoc::Filter </strong> }x.freeze - BADGES_MARKDOWN_PATTERN = %r{ + BADGES_MARKDOWN_PATTERN = / (?:^|[^`]) # must be start of the line or anything except backtick \*\*(\[|\() (?<tier>CORE|STARTER|PREMIUM|ULTIMATE|FREE|BRONZE|SILVER|GOLD)(?:\s+(?<type>ONLY|SAAS|SELF)) ?(\]|\))\*\* (?:$|[^`]) # must end of line or anything except backtick - }x.freeze + /x.freeze def run(content, params = {}) content.gsub(BADGES_HTML_PATTERN) { generate(Regexp.last_match[:tier].downcase, Regexp.last_match[:type]) } diff --git a/lib/filters/introduced_in.rb b/lib/filters/introduced_in.rb index 3aec9b1e..ca329649 100644 --- a/lib/filters/introduced_in.rb +++ b/lib/filters/introduced_in.rb @@ -21,7 +21,7 @@ class IntroducedInFilter < Nanoc::Filter # - "changed <optional text> in" # - "enabled <optional text> in" # ...followed by "GitLab" - next if content !~ /(<a href="[^"]+">)?( + next if content !~ %r{(<a href="[^"]+">)?( introduced| enabled| (re)?moved| @@ -29,7 +29,7 @@ class IntroducedInFilter < Nanoc::Filter deprecated| renamed| recommended - )(<\/a>)?(.*)? (in|to).*GitLab/xmi + )(<\/a>)?(.*)? (in|to).*GitLab}xmi new_content = generate(content) blockquote.replace(new_content) diff --git a/lib/gitlab/navigation.rb b/lib/gitlab/navigation.rb index 014f567f..e08c40d0 100644 --- a/lib/gitlab/navigation.rb +++ b/lib/gitlab/navigation.rb @@ -29,7 +29,7 @@ module Gitlab end def id_for(element) - element.title.gsub(/[\s\/()]/, '') + element.title.gsub(%r{[\s\/()]}, '') end def children |