luckyimnotanigger/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-05-16 06:52:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix a couple of issues with a feeds (#14897)

Browse source 
@CirnoT spotted a couple of issues with feeds on discord.

This PR fixes both of these.
This commit is contained in:
zeripath 2021-03-06 04:09:49 +00:00 • committed by GitHub
parent fd4b309c6f
commit 20f13bfdfc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/templates/helper.go
View file

@ -817,6 +817,10 @@ func ActionIcon(opType models.ActionType) string {
func ActionContent2Commits(act Actioner) *repository.PushCommits {
push := repository.NewPushCommits()
if act == nil || act.GetContent() == "" {
return push
}
json := jsoniter.ConfigCompatibleWithStandardLibrary
if err := json.Unmarshal([]byte(act.GetContent()), push); err != nil {
log.Error("json.Unmarshal:\n%s\nERROR: %v", act.GetContent(), err)