Merge branch 'master' into fix-5583-samesite-setting-for-cookies

Author: 6543

modules/templates/helper.go

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

templates/admin/dashboard.tmpl

@@ -36,17 +36,17 @@
 							<td><button type="submit" class="ui green button" name="op" value="git_gc_repos">{{svg "octicon-play"}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td>
 						</tr>
 						{{if and (not .SSH.Disabled) (not .SSH.StartBuiltinServer)}}
-						<tr>
-							<td>{{.i18n.Tr "admin.dashboard.resync_all_sshkeys"}}<br/>
-							{{.i18n.Tr "admin.dashboard.resync_all_sshkeys.desc"}}</td>
-							<td><button type="submit" class="ui green button" name="op" value="resync_all_sshkeys">{{svg "octicon-play"}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td>
-						</tr>
+							<tr>
+								<td>{{.i18n.Tr "admin.dashboard.resync_all_sshkeys"}}<br/>
+								{{.i18n.Tr "admin.dashboard.resync_all_sshkeys.desc"}}</td>
+								<td><button type="submit" class="ui green button" name="op" value="resync_all_sshkeys">{{svg "octicon-play"}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td>
+							</tr>
+							<tr>
+								<td>{{.i18n.Tr "admin.dashboard.resync_all_sshprincipals"}}<br/>
+								{{.i18n.Tr "admin.dashboard.resync_all_sshprincipals.desc"}}</td>
+								<td><button type="submit" class="ui green button" name="op" value="resync_all_sshprincipals">{{svg "octicon-play" 16}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td>
+							</tr>
 						{{end}}
-						<tr>
-							<td>{{.i18n.Tr "admin.dashboard.resync_all_sshprincipals"}}<br/>
-							{{.i18n.Tr "admin.dashboard.resync_all_sshprincipals.desc"}}</td>
-							<td><button type="submit" class="ui green button" name="op" value="resync_all_sshprincipals">{{svg "octicon-play" 16}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td>
-						</tr>
 						<tr>
 							<td>{{.i18n.Tr "admin.dashboard.resync_all_hooks"}}</td>
 							<td><button type="submit" class="ui green button" name="op" value="resync_all_hooks">{{svg "octicon-play"}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td>

templates/user/dashboard/feeds.tmpl

@@ -110,7 +110,8 @@
 						<span class="text truncate issue title">{{index .GetIssueInfos 1 | RenderEmoji}}</span>
 					{{else if or (eq .GetOpType 10) (eq .GetOpType 21) (eq .GetOpType 22) (eq .GetOpType 23)}}
 						<a href="{{.GetCommentLink}}" class="text truncate issue title">{{.GetIssueTitle | RenderEmoji}}</a>
-						<p class="text light grey">{{index .GetIssueInfos 1 | RenderEmoji}}</p>
+						{{$comment := index .GetIssueInfos 1}}
+						{{if gt (len $comment) 0}}<p class="text light grey">{{$comment | RenderEmoji}}</p>{{end}}
 					{{else if eq .GetOpType 11}}
 						<p class="text light grey">{{index .GetIssueInfos 1}}</p>
 					{{else if or (eq .GetOpType 12) (eq .GetOpType 13) (eq .GetOpType 14) (eq .GetOpType 15)}}