diff --git a/lib/redmine_git_hosting/hooks.rb b/lib/redmine_git_hosting/hooks.rb index cfba1a470..a6eb0fad1 100644 --- a/lib/redmine_git_hosting/hooks.rb +++ b/lib/redmine_git_hosting/hooks.rb @@ -28,7 +28,7 @@ def view_repositories_show_bottom(context) return '' if readme_file.nil? - content = get_formated_text repository, readme_file, rev + content = get_formatted_text repository, readme_file, rev context[:controller].send :render_to_string, partial: 'repositories/readme', locals: { html: content } end @@ -48,7 +48,7 @@ def find_readme_file(repository, path, rev) (repository.entries(path, rev) || []).find { |f| f.name =~ /README((\.).*)?/i } end - def get_formated_text(repository, file, rev) + def get_formatted_text(repository, file, rev) raw_readme_text = Redmine::CodesetUtil.to_utf8_by_setting repository.cat(file.path, rev) if redmine_file? file @@ -57,7 +57,7 @@ def get_formated_text(repository, file, rev) elsif github_file? file RedmineGitHosting::MarkdownRenderer.to_html raw_readme_text else - GitHub::Markup.render file.path, raw_readme_text + GitHub::Markup.render(file.path, raw_readme_text).gsub("\n", '
') end end