From 1f9e21ebd5a24ee0512f1c84ead295e6df3b468c Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Mon, 26 Nov 2018 07:02:21 -0500
Subject: [PATCH] templates/wiki: fix emoji rendering (#4869)
---
gogs.go | 2 +-
templates/.VERSION | 2 +-
templates/repo/wiki/view.tmpl | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gogs.go b/gogs.go
index 14de15ff4..3dbf576ec 100644
--- a/gogs.go
+++ b/gogs.go
@@ -16,7 +16,7 @@ import (
"github.com/gogs/gogs/pkg/setting"
)
-const APP_VER = "0.11.69.1024"
+const APP_VER = "0.11.70.1126"
func init() {
setting.AppVer = APP_VER
diff --git a/templates/.VERSION b/templates/.VERSION
index 444de06fd..461a5f97b 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.11.69.1024
+0.11.70.1126
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index 543c2acdb..3016748db 100644
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -48,7 +48,7 @@
</div>
</div>
<div class="ui dividing header">
- {{$title}}
+ <span class="has-emoji">{{$title}}</span>
{{if and .IsRepositoryWriter (not .Repository.IsMirror)}}
<div class="ui right">
<a class="ui small button" href="{{.RepoLink}}/wiki/{{EscapePound .PageURL}}/_edit">{{.i18n.Tr "repo.wiki.edit_page_button"}}</a>
@@ -61,7 +61,7 @@
{{.i18n.Tr "repo.wiki.last_commit_info" .Author.Name $timeSince | Safe}}
</div>
</div>
- <div class="markdown">
+ <div class="markdown has-emoji">
{{.content | Str2html}}
</div>
</div>