Merge branch 'new_lines_markdown' into 'master'

New Lines Behaviour in Markdown Per markdown specification, only render line-breaks when you end a line with two or more spaces.

Merge branch 'new_lines_markdown' into 'master'
New Lines Behaviour in Markdown Per markdown specification, only render line-breaks when you end a line with two or more spaces.
Dmitriy Zaporozhets
2 parents b5d81174 ccc14fa2
Showing 2 changed files with 3 additions and 2 deletions Show diff stats
CHANGELOG
app/helpers/gitlab_markdown_helper.rb
@@ -19,6 +19,8 @@ v 6.7.0
   - Add button for toggling inline comments in diff view
   - Add retry feature for repository import
   - Reuse the GitLab LDAP connection within each request
+  - Changed markdown new line behaviour to conform to markdown standards
+
  
 v 6.6.2
   - Fix 500 error on branch/tag create or remove via UI
@@ -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
...	...	@@ -19,6 +19,8 @@ v 6.7.0
19	19	- Add button for toggling inline comments in diff view
20	20	- Add retry feature for repository import
21	21	- Reuse the GitLab LDAP connection within each request
	22	+ - Changed markdown new line behaviour to conform to markdown standards
	23	+
22	24
23	25	v 6.6.2
24	26	- Fix 500 error on branch/tag create or remove via UI
...	...
...	...	@@ -35,7 +35,6 @@ module GitlabMarkdownHelper
35	35	# see https://github.com/vmg/redcarpet#darling-i-packed-you-a-couple-renderers-for-lunch-
36	36	filter_html: true,
37	37	with_toc_data: true,
38		- hard_wrap: true,
39	38	safe_links_only: true
40	39	}.merge(options))
41	40	@markdown = Redcarpet::Markdown.new(gitlab_renderer,
...	...	@@ -45,7 +44,7 @@ module GitlabMarkdownHelper
45	44	fenced_code_blocks: true,
46	45	autolink: true,
47	46	strikethrough: true,
48		- lax_html_blocks: true,
	47	+ lax_spacing: true,
49	48	space_after_headers: true,
50	49	superscript: true)
51	50	end
...	...