@@ -8,6 +8,7 @@ import ( | |||
"strings" | |||
"github.com/Unknwon/com" | |||
"github.com/gogits/gogs/pkg/markup" | |||
api "code.gitea.io/sdk/gitea" | |||
@@ -50,7 +51,7 @@ func Search(ctx *context.APIContext) { | |||
ID: users[i].ID, | |||
UserName: users[i].Name, | |||
AvatarURL: users[i].AvatarLink(), | |||
FullName: users[i].FullName, | |||
FullName: markup.Sanitize(users[i].FullName), | |||
} | |||
if ctx.IsSigned { | |||
results[i].Email = users[i].Email |
@@ -14,7 +14,8 @@ | |||
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="direct" {{if eq .commit_choice "direct"}}checked{{end}}> | |||
<label> | |||
<i class="octicon octicon-git-commit" height="16" width="14"></i> | |||
{{.i18n.Tr "repo.editor.commit_directly_to_this_branch" .BranchName | Safe}} | |||
{{$branchName := .BranchName | Str2html}} | |||
{{.i18n.Tr "repo.editor.commit_directly_to_this_branch" $branchName | Safe}} | |||
</label> | |||
</div> | |||
</div> |
@@ -28,7 +28,7 @@ | |||
{{if .Issue.PullRequest.HasMerged}} | |||
{{ $mergedStr:= TimeSince .Issue.PullRequest.Merged $.Lang }} | |||
<a {{if gt .Issue.PullRequest.Merger.ID 0}}href="{{.Issue.PullRequest.Merger.HomeLink}}"{{end}}>{{.Issue.PullRequest.Merger.Name}}</a> | |||
<span class="pull-desc">{{$.i18n.Tr "repo.pulls.merged_title_desc" .NumCommits .HeadTarget .BaseTarget $mergedStr | Safe}}</span> | |||
<span class="pull-desc">{{$.i18n.Tr "repo.pulls.merged_title_desc" .NumCommits .HeadTarget .BaseTarget $mergedStr | Str2html}}</span> | |||
{{else}} | |||
<a {{if gt .Issue.Poster.ID 0}}href="{{.Issue.Poster.HomeLink}}"{{end}}>{{.Issue.Poster.Name}}</a> | |||
<span class="pull-desc">{{$.i18n.Tr "repo.pulls.title_desc" .NumCommits .HeadTarget .BaseTarget | Str2html}}</span> |