diff options
author | 无闻 <u@gogs.io> | 2015-08-15 17:27:20 +0800 |
---|---|---|
committer | 无闻 <u@gogs.io> | 2015-08-15 17:27:20 +0800 |
commit | ce8864c69a8dd6466ad5a39faf5402cd3280d0a2 (patch) | |
tree | 13353384ee96f96ea94dace0276d9424019ad92d /modules/base | |
parent | c7d5e1f182c35bdf8e57c5c605cf8c0970255f40 (diff) | |
parent | 1d52793faf91b93e52b27c56e7be3fd9ca373d54 (diff) | |
download | gitea-ce8864c69a8dd6466ad5a39faf5402cd3280d0a2.tar.gz gitea-ce8864c69a8dd6466ad5a39faf5402cd3280d0a2.zip |
Merge pull request #1475 from donbowman/master
Fix race condition on ssh key delete, and revert re-revert of hard line break
Diffstat (limited to 'modules/base')
-rw-r--r-- | modules/base/markdown.go | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/modules/base/markdown.go b/modules/base/markdown.go index d06e1338e7..03f1287c1d 100644 --- a/modules/base/markdown.go +++ b/modules/base/markdown.go @@ -198,7 +198,6 @@ func RenderRawMarkdown(body []byte, urlPrefix string) []byte { extensions |= blackfriday.EXTENSION_FENCED_CODE extensions |= blackfriday.EXTENSION_AUTOLINK extensions |= blackfriday.EXTENSION_STRIKETHROUGH - extensions |= blackfriday.EXTENSION_HARD_LINE_BREAK extensions |= blackfriday.EXTENSION_SPACE_HEADERS extensions |= blackfriday.EXTENSION_NO_EMPTY_LINE_BEFORE_BLOCK |