summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2014-03-14 12:33:03 +0100
committerMarin Jankovski <marin@gitlab.com>2014-03-14 12:33:03 +0100
commitf3ceebad42f56619aad1aa793735e47cd7da7aec (patch)
tree6c0fad1c2f87cbb57420cbdccbf08d34e35de7b7 /app/helpers
parentb5d81174fb12296ade36ec1f52546b8527bbdcf1 (diff)
downloadgitlab-ce-f3ceebad42f56619aad1aa793735e47cd7da7aec.tar.gz
Ignore newlines per md standard.
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/gitlab_markdown_helper.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index 6cad5e4658e..7f72ab54838 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -35,7 +35,6 @@ module GitlabMarkdownHelper
# see https://github.com/vmg/redcarpet#darling-i-packed-you-a-couple-renderers-for-lunch-
filter_html: true,
with_toc_data: true,
- hard_wrap: true,
safe_links_only: true
}.merge(options))
@markdown = Redcarpet::Markdown.new(gitlab_renderer,
@@ -45,7 +44,7 @@ module GitlabMarkdownHelper
fenced_code_blocks: true,
autolink: true,
strikethrough: true,
- lax_html_blocks: true,
+ lax_spacing: true,
space_after_headers: true,
superscript: true)
end