Merge remote-tracking branch 'upstream/release/v1.15' into release/dc…

…s/v1.15
unfoldingWord · Nov 5, 2021 · 375d109 · 375d109
2 parents 7a8d432 + 15b4449
commit 375d109
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/modules/convert/git_commit.go b/modules/convert/git_commit.go
@@ -147,8 +147,9 @@ func ToCommit(repo *models.Repository, commit *git.Commit, userCache map[string]
 
 	return &api.Commit{
 		CommitMeta: &api.CommitMeta{
-			URL: repo.APIURL() + "/git/commits/" + commit.ID.String(),
-			SHA: commit.ID.String(),
+			URL:     repo.APIURL() + "/git/commits/" + commit.ID.String(),
+			SHA:     commit.ID.String(),
+			Created: commit.Committer.When,
 		},
 		HTMLURL: repo.HTMLURL() + "/commit/" + commit.ID.String(),
 		RepoCommit: &api.RepoCommit{
@@ -169,8 +170,9 @@ func ToCommit(repo *models.Repository, commit *git.Commit, userCache map[string]
 			},
 			Message: commit.Message(),
 			Tree: &api.CommitMeta{
-				URL: repo.APIURL() + "/git/trees/" + commit.ID.String(),
-				SHA: commit.ID.String(),
+				URL:     repo.APIURL() + "/git/trees/" + commit.ID.String(),
+				SHA:     commit.ID.String(),
+				Created: commit.Committer.When,
 			},
 		},
 		Author:    apiAuthor,

diff --git a/modules/setting/log.go b/modules/setting/log.go
@@ -121,7 +121,7 @@ func getLogLevel(section *ini.Section, key string, defaultValue log.Level) log.L
 }
 
 func getStacktraceLogLevel(section *ini.Section, key string, defaultValue string) string {
-	value := section.Key(key).MustString("none")
+	value := section.Key(key).MustString(defaultValue)
 	return log.FromString(value).String()
 }
 

diff --git a/templates/base/delete_modal_actions.tmpl b/templates/base/delete_modal_actions.tmpl
@@ -1,6 +1,6 @@
 <div class="actions">
 	<div class="ui red basic inverted cancel button">
-		{{svg "octicon-trash"}}
+		{{svg "octicon-x"}}
 		{{.i18n.Tr "modal.no"}}
 	</div>
 	<div class="ui green basic inverted ok button">

diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
@@ -158,7 +158,7 @@
 			{{if eq .RefAction 3}}</del>{{end}}
 
 			<div class="detail">
-				<span class="text grey"><a href="{{.RefIssueHTMLURL}}"><b>{{.RefIssueTitle | Str2html}}</b> {{.RefIssueIdent | Str2html}}</a></span>
+				<span class="text grey"><a href="{{.RefIssueHTMLURL}}"><b>{{.RefIssueTitle}}</b> {{.RefIssueIdent}}</a></span>
 			</div>
 		</div>
 	{{else if eq .Type 4}}