From 99d06289a0c98ed547158744e1c3024fabbf3b69 Mon Sep 17 00:00:00 2001 From: Umputun Date: Sat, 12 May 2018 14:10:30 -0500 Subject: [PATCH] md autolink enabled --- README.md | 2 +- app/rest/api/rest.go | 2 +- app/rest/api/rest_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 934f5bf6..0f1caec8 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ _instructions for google oauth2 setup borrowed from [oauth2_proxy](https://githu 1. Disqus provides an export of all comments on your site in a g-zipped file. This is found in your Moderation panel at Disqus Admin > Setup > Export. The export will be sent into a queue and then emailed to the address associated with your account once it's ready. Direct link to export will be something like `https://.disqus.com/admin/discussions/export/`. See [importing-exporting](https://help.disqus.com/customer/portal/articles/1104797-importing-exporting) for more details. 2. Move this file to your remark42 host within `.var` and unzip, i.e. `gunzip .xml.gz`. -3. Run import command - `docker-compose run remark /srv/import-disqus.sh .xml ` +3. Run import command - `docker-compose exec remark /srv/import-disqus.sh .xml ` ### Frontend diff --git a/app/rest/api/rest.go b/app/rest/api/rest.go index 1460c450..9142bbc3 100644 --- a/app/rest/api/rest.go +++ b/app/rest/api/rest.go @@ -44,7 +44,7 @@ const hardBodyLimit = 1024 * 64 // limit size of body var mdExt = blackfriday.NoIntraEmphasis | blackfriday.Tables | blackfriday.FencedCode | blackfriday.Strikethrough | blackfriday.SpaceHeadings | blackfriday.HardLineBreak | - blackfriday.BackslashLineBreak + blackfriday.BackslashLineBreak | blackfriday.Autolink // Run the lister and request's router, activate rest server func (s *Rest) Run(port int) { diff --git a/app/rest/api/rest_test.go b/app/rest/api/rest_test.go index c6cd145c..38d2d939 100644 --- a/app/rest/api/rest_test.go +++ b/app/rest/api/rest_test.go @@ -143,7 +143,7 @@ func TestServer_CreateAndGet(t *testing.T) { comment := store.Comment{} err = json.Unmarshal([]byte(res), &comment) assert.Nil(t, err) - assert.Equal(t, "

test 123 http://radio-t.com

\n", comment.Text) + assert.Equal(t, `

test 123 http://radio-t.com

`+"\n", comment.Text) assert.Equal(t, store.User{Name: "developer one", ID: "dev", Picture: "/api/v1/avatar/remark.image", Admin: true, Blocked: false, IP: "ea64bfc178468d943ca5b836e2e700c335404973"}, comment.User)