Download as
Browse Code »

Commit 02b310dffbd4f65883e8b388edbd04afb87d2dd0

Authored by Dmitriy Zaporozhets
2 parents fa3c087a 00815dd4
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

Showing 2 changed files with 3 additions and 2 deletions   Show diff stats
@@ -19,6 +19,8 @@ v 6.7.0 @@ -19,6 +19,8 @@ v 6.7.0
19 - Add button for toggling inline comments in diff view 19 - Add button for toggling inline comments in diff view
20 - Add retry feature for repository import 20 - Add retry feature for repository import
21 - Reuse the GitLab LDAP connection within each request 21 - Reuse the GitLab LDAP connection within each request
  22 + - Changed markdown new line behaviour to conform to markdown standards
  23 +
22 24
23 v 6.6.2 25 v 6.6.2
24 - Fix 500 error on branch/tag create or remove via UI 26 - Fix 500 error on branch/tag create or remove via UI
app/helpers/gitlab_markdown_helper.rb
  Diff comments   View file @02b310d
@@ -35,7 +35,6 @@ module GitlabMarkdownHelper @@ -35,7 +35,6 @@ module GitlabMarkdownHelper
35 # see https://github.com/vmg/redcarpet#darling-i-packed-you-a-couple-renderers-for-lunch- 35 # see https://github.com/vmg/redcarpet#darling-i-packed-you-a-couple-renderers-for-lunch-
36 filter_html: true, 36 filter_html: true,
37 with_toc_data: true, 37 with_toc_data: true,
38 - hard_wrap: true,  
39 safe_links_only: true 38 safe_links_only: true
40 }.merge(options)) 39 }.merge(options))
41 @markdown = Redcarpet::Markdown.new(gitlab_renderer, 40 @markdown = Redcarpet::Markdown.new(gitlab_renderer,
@@ -45,7 +44,7 @@ module GitlabMarkdownHelper @@ -45,7 +44,7 @@ module GitlabMarkdownHelper
45 fenced_code_blocks: true, 44 fenced_code_blocks: true,
46 autolink: true, 45 autolink: true,
47 strikethrough: true, 46 strikethrough: true,
48 - lax_html_blocks: true, 47 + lax_spacing: true,
49 space_after_headers: true, 48 space_after_headers: true,
50 superscript: true) 49 superscript: true)
51 end 50 end