diff options
| author | Frank Sauerburger <frank@sauerburger.com> | 2019-02-12 12:44:14 +0100 |
|---|---|---|
| committer | Frank Sauerburger <frank@sauerburger.com> | 2019-02-12 12:44:14 +0100 |
| commit | 752887b9a7a8158d0c9e140d93877017e2fc2a69 (patch) | |
| tree | d69090a5b410d0b233ec255376ca6c8076777fa9 | |
| parent | 44d0d0e6f96dba384bbff5da8faa05db4e881dd2 (diff) | |
| download | gitlab-ce-752887b9a7a8158d0c9e140d93877017e2fc2a69.tar.gz | |
Update RE used to prefix links with /help/
Update the regular expression in the help controller used to prefix relative
links on the help page with /help/. As suggested by @rymai, the look-ahead
pattern to detect external links is simplified from `[a-zA-Z0-9.+-]` to `\w`.
| -rw-r--r-- | app/controllers/help_controller.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb index 53e023714b3..a9d6addd4a4 100644 --- a/app/controllers/help_controller.rb +++ b/app/controllers/help_controller.rb @@ -14,10 +14,9 @@ class HelpController < ApplicationController @help_index = File.read(Rails.root.join('doc', 'README.md')).sub(YAML_FRONT_MATTER_REGEXP, '') # Prefix Markdown links with `help/` unless they are external links. - # RFC3986 allows alphanumeric, '+', '-' and '.' for URL schema; # '//' not necessarily part of URL, e.g., mailto:mail@example.com - # See https://rubular.com/r/C5wTz0gE5r6x0f - @help_index.gsub!(%r{(?<delim>\]\()(?![a-zA-Z0-9.+-]+:)(?!/)(?<link>[^\)\(]+\))}) do + # See https://rubular.com/r/DFHZl5w8d3bpzV + @help_index.gsub!(%r{(?<delim>\]\()(?!\w+:)(?!/)(?<link>[^\)\(]+\))}) do "#{$~[:delim]}#{Gitlab.config.gitlab.relative_url_root}/help/#{$~[:link]}" end end |