mirror of
https://github.com/go-gitea/gitea
synced 2024-12-23 06:17:54 +01:00
Some improvements
This commit is contained in:
parent
2361ec5a44
commit
b4eac75dba
@ -1625,6 +1625,9 @@ issues.label.filter_sort.reverse_by_size = Largest size
|
||||
issues.development = Development
|
||||
issues.maybefixed = May be fixed by %s
|
||||
issues.create_branch_from_issue_success = Create branch %s from issue successfully
|
||||
issues.pr.completed = Completed
|
||||
issues.pr.conflicted = Merge conflicts
|
||||
issues.link.created = Created %s
|
||||
issues.num_participants = %d Participants
|
||||
issues.attachment.open_tab = `Click to see "%s" in a new tab`
|
||||
issues.attachment.download = `Click to download "%s"`
|
||||
|
@ -221,7 +221,6 @@ func handleCreateBranchError(ctx *context.Context, err error, form *forms.NewBra
|
||||
}
|
||||
|
||||
ctx.ServerError("CreateNewBranch", err)
|
||||
return
|
||||
}
|
||||
|
||||
// CreateBranch creates new branch in repository
|
||||
|
@ -11,13 +11,17 @@
|
||||
</a>
|
||||
</span>
|
||||
<div>
|
||||
Created {{DateTime "short" .PullRequest.Issue.CreatedUnix}}
|
||||
{{ctx.Locale.Tr "repo.issues.link.created" (DateTime "short" .PullRequest.Issue.CreatedUnix)}}
|
||||
{{if .PullRequest.HasMerged}}
|
||||
Completed
|
||||
{{.PullRequest.MergedCommitID}}
|
||||
Created {{.PullRequest.MergedUnix}}
|
||||
{{ctx.Locale.Tr "repo.issues.pr.completed"}}
|
||||
</div>
|
||||
<div>
|
||||
{{svg "octicon-git-commit" 14}} <a href="{{.PullRequest.BaseRepo.Link}}/src/commit/{{.PullRequest.MergedCommitID}}">{{.PullRequest.MergedCommitID | ShortSha}}</a>
|
||||
</div>
|
||||
<div>
|
||||
{{ctx.Locale.Tr "repo.issues.link.created" (DateTime "short" .PullRequest.MergedUnix)}}
|
||||
{{else if .PullRequest.ChangedProtectedFiles}}
|
||||
Merge conflicts
|
||||
{{ctx.Locale.Tr "repo.issues.pr.conflicted"}}
|
||||
{{end}}
|
||||
</div>
|
||||
{{else if and .Branch .DisplayBranch}}
|
||||
|
Loading…
Reference in New Issue
Block a user