serv/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-29 15:13:53 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

some fixes

Browse source
This commit is contained in:
Lunny Xiao 2017-10-25 13:26:14 +08:00
parent 796be03e9b
commit 219ca5cadb
No known key found for this signature in database
GPG key ID: C3B7C91B632F738A
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
routers/api/v1/user/user.go
View file

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

3
templates/repo/editor/commit_form.tmpl
View file

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

2
templates/repo/issue/view_title.tmpl
View file

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