diff options
author | Robert Speicher <rspeicher@gmail.com> | 2015-04-15 12:24:44 -0400 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2015-04-15 12:24:44 -0400 |
commit | ef47ea3d39d9235c2842d1f374d0f03e56da7eeb (patch) | |
tree | b8d38727275e556bc79a76e899b40406e707d621 /app/controllers/help_controller.rb | |
parent | 5f78601c8a67028f246134d325cca99952ba78b6 (diff) | |
download | gitlab-ce-ef47ea3d39d9235c2842d1f374d0f03e56da7eeb.tar.gz |
Revert "Fix and improve help rendering"
This reverts commit d365004e684e98459061fcd5fbaf9bea880934a8.
Diffstat (limited to 'app/controllers/help_controller.rb')
-rw-r--r-- | app/controllers/help_controller.rb | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb index 0e5567c7734..964f624d6d7 100644 --- a/app/controllers/help_controller.rb +++ b/app/controllers/help_controller.rb @@ -3,40 +3,24 @@ class HelpController < ApplicationController end def show - @filepath = clean_path_info(params[:filepath]) - @format = params[:format] + @category = clean_path_info(params[:category]) + @file = clean_path_info(params[:file]) - respond_to do |format| - format.md { render_doc } - format.all { send_file_data } - end - end - - def shortcuts - end - - private - - def render_doc - if File.exists?(Rails.root.join('doc', @filepath + '.md')) - render 'show.html.haml' + if File.exists?(Rails.root.join('doc', @category, @file + '.md')) + render 'show' else not_found! end end - def send_file_data - path = Rails.root.join('doc', "#{@filepath}.#{@format}") - if File.exists?(path) - send_file(path, disposition: 'inline') - else - head :not_found - end + def shortcuts end def ui end + private + PATH_SEPS = Regexp.union(*[::File::SEPARATOR, ::File::ALT_SEPARATOR].compact) # Taken from ActionDispatch::FileHandler |