summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-09-23 00:24:17 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-09-23 00:24:17 -0400
commit95f73a68fa3ff235c35217b1c72666c5bad6ce03 (patch)
treed5a666a50a8387513368c2cab130979d16641f54
parent64e0dfa5306aebdedeb65f2a6db95f4d2314f143 (diff)
downloadgitlab-ce-rs-fix-help-links.tar.gz
Simplify help path prefixingrs-fix-help-links
-rw-r--r--app/controllers/help_controller.rb21
1 files changed, 4 insertions, 17 deletions
diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb
index 7283c4f4a4c..55050615473 100644
--- a/app/controllers/help_controller.rb
+++ b/app/controllers/help_controller.rb
@@ -5,7 +5,10 @@ class HelpController < ApplicationController
def index
@help_index = File.read(Rails.root.join('doc', 'README.md'))
- prefix_help_links!(@help_index)
+
+ # Prefix Markdown links with `help/` unless they already have been
+ # See http://rubular.com/r/nwwhzH6Z8X
+ @help_index.gsub!(/(\]\()(?!help\/)([^\)\(]+)(\))/, '\1help/\2\3')
end
def show
@@ -59,22 +62,6 @@ class HelpController < ApplicationController
params
end
- # Prefix links in a Markdown document with `help/` unless they already have
- # been
- #
- # TODO (rspeicher): This should be a pipeline filter that only gets included
- # for help pages, and it should operate on the Nokogiri doc to be more robust.
- #
- # text - Markdown String
- #
- # Modifies `text` in-place
- def prefix_help_links!(text)
- # Match text inside a Markdown link unless it already starts with `help/`
- #
- # See http://rubular.com/r/nwwhzH6Z8X
- text.gsub!(%r{(\]\()(?!help\/)([^\)\(]+)(\))}x, '\1help/\2\3')
- end
-
PATH_SEPS = Regexp.union(*[::File::SEPARATOR, ::File::ALT_SEPARATOR].compact)
# Taken from ActionDispatch::FileHandler