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

CHANGELOG

@@ -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

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