Skip to content

Commit a4d9825

Browse files
a1012112796a1012112796
committed
Merge branch 'master' into fix_comment_tag
2 parents 4470bdf + 03fa2ec commit a4d9825

File tree

15 files changed

+359
-484
lines changed

15 files changed

+359
-484
lines changed

‎modules/context/repo.go

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"code.gitea.io/gitea/modules/markup/markdown"
2020
"code.gitea.io/gitea/modules/setting"
2121
api "code.gitea.io/gitea/modules/structs"
22+
"code.gitea.io/gitea/modules/util"
2223

2324
"gitea.com/macaron/macaron"
2425
"github.com/editorconfig/editorconfig-core-go/v2"
@@ -672,8 +673,11 @@ func getRefName(ctx *Context, pathType RepoRefType) string {
672673
if refName := getRefName(ctx, RepoRefTag); len(refName) > 0 {
673674
return refName
674675
}
675-
if refName := getRefName(ctx, RepoRefCommit); len(refName) > 0 {
676-
return refName
676+
// For legacy and API support only full commit sha
677+
parts := strings.Split(path, "/")
678+
if len(parts) > 0 && len(parts[0]) == 40 {
679+
ctx.Repo.TreePath = strings.Join(parts[1:], "/")
680+
return parts[0]
677681
}
678682
if refName := getRefName(ctx, RepoRefBlob); len(refName) > 0 {
679683
return refName
@@ -686,7 +690,7 @@ func getRefName(ctx *Context, pathType RepoRefType) string {
686690
return getRefNameFromPath(ctx, path, ctx.Repo.GitRepo.IsTagExist)
687691
case RepoRefCommit:
688692
parts := strings.Split(path, "/")
689-
if len(parts) > 0 && len(parts[0]) == 40 {
693+
if len(parts) > 0 && len(parts[0]) >= 7 && len(parts[0]) <= 40 {
690694
ctx.Repo.TreePath = strings.Join(parts[1:], "/")
691695
return parts[0]
692696
}
@@ -778,7 +782,7 @@ func RepoRefByType(refType RepoRefType) macaron.Handler {
778782
return
779783
}
780784
ctx.Repo.CommitID = ctx.Repo.Commit.ID.String()
781-
} else if len(refName) == 40 {
785+
} else if len(refName) >= 7 && len(refName) <= 40 {
782786
ctx.Repo.IsViewCommit = true
783787
ctx.Repo.CommitID = refName
784788

@@ -787,6 +791,11 @@ func RepoRefByType(refType RepoRefType) macaron.Handler {
787791
ctx.NotFound("GetCommit", err)
788792
return
789793
}
794+
// If short commit ID add canonical link header
795+
if len(refName) < 40 {
796+
ctx.Header().Set("Link", fmt.Sprintf("<%s>; rel=\"canonical\"",
797+
util.URLJoin(setting.AppURL, strings.Replace(ctx.Req.URL.RequestURI(), refName, ctx.Repo.Commit.ID.String(), 1))))
798+
}
790799
} else {
791800
ctx.NotFound("RepoRef invalid repo", fmt.Errorf("branch or tag not exist: %s", refName))
792801
return

‎modules/templates/helper.go

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -256,31 +256,27 @@ func NewFuncMap() []template.FuncMap {
256256
"DefaultTheme": func() string {
257257
return setting.UI.DefaultTheme
258258
},
259+
// pass key-value pairs to a partial template which receives them as a dict
259260
"dict": func(values ...interface{}) (map[string]interface{}, error) {
260261
if len(values) == 0 {
261262
return nil, errors.New("invalid dict call")
262263
}
263264

264265
dict := make(map[string]interface{})
266+
return util.MergeInto(dict, values...)
267+
},
268+
/* like dict but merge key-value pairs into the first dict and return it */
269+
"mergeinto": func(root map[string]interface{}, values ...interface{}) (map[string]interface{}, error) {
270+
if len(values) == 0 {
271+
return nil, errors.New("invalid mergeinto call")
272+
}
265273

266-
for i := 0; i < len(values); i++ {
267-
switch key := values[i].(type) {
268-
case string:
269-
i++
270-
if i == len(values) {
271-
return nil, errors.New("specify the key for non array values")
272-
}
273-
dict[key] = values[i]
274-
case map[string]interface{}:
275-
m := values[i].(map[string]interface{})
276-
for i, v := range m {
277-
dict[i] = v
278-
}
279-
default:
280-
return nil, errors.New("dict values must be maps")
281-
}
274+
dict := make(map[string]interface{})
275+
for key, value := range root {
276+
dict[key] = value
282277
}
283-
return dict, nil
278+
279+
return util.MergeInto(dict, values...)
284280
},
285281
"percentage": func(n int, values ...int) float32 {
286282
var sum = 0

‎modules/util/util.go

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package util
66

77
import (
88
"bytes"
9+
"errors"
910
"strings"
1011
)
1112

@@ -100,3 +101,26 @@ func NormalizeEOL(input []byte) []byte {
100101
}
101102
return tmp[:pos]
102103
}
104+
105+
// MergeInto merges pairs of values into a "dict"
106+
func MergeInto(dict map[string]interface{}, values ...interface{}) (map[string]interface{}, error) {
107+
for i := 0; i < len(values); i++ {
108+
switch key := values[i].(type) {
109+
case string:
110+
i++
111+
if i == len(values) {
112+
return nil, errors.New("specify the key for non array values")
113+
}
114+
dict[key] = values[i]
115+
case map[string]interface{}:
116+
m := values[i].(map[string]interface{})
117+
for i, v := range m {
118+
dict[i] = v
119+
}
120+
default:
121+
return nil, errors.New("dict values must be maps")
122+
}
123+
}
124+
125+
return dict, nil
126+
}

‎options/locale/locale_ja-JP.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@ register_helper_msg=既にアカウントをお持ちですか？ 今すぐサ
245245
social_register_helper_msg=既にアカウントをお持ちですか？ 今すぐ連携しましょう！
246246
disable_register_prompt=登録は無効になっています。 サイト管理者にお問い合わせください。
247247
disable_register_mail=登録でのメール確認は無効になっています。
248+
remember_me=このデバイスで自動サインイン
248249
forgot_password_title=パスワードを忘れた
249250
forgot_password=パスワードをお忘れですか？
250251
sign_up_now=アカウントが必要ですか？ 今すぐ登録しましょう。
@@ -277,6 +278,7 @@ twofa_scratch_token_incorrect=スクラッチコードが正しくありませ
277278
login_userpass=サインイン
278279
login_openid=OpenID
279280
oauth_signup_tab=新規アカウント登録
281+
oauth_signup_title=新規アカウントの仕上げ
280282
oauth_signup_submit=アカウント登録完了
281283
oauth_signin_tab=既存アカウントにリンク
282284
oauth_signin_title=リンク先アカウント認可のためサインイン

‎services/pull/pull.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,8 @@ func GetCommitMessages(pr *models.PullRequest) string {
556556
authorsMap := map[string]bool{}
557557
authors := make([]string, 0, list.Len())
558558
stringBuilder := strings.Builder{}
559-
element := list.Front()
559+
// commits list is in reverse chronological order
560+
element := list.Back()
560561
for element != nil {
561562
commit := element.Value.(*git.Commit)
562563

@@ -581,7 +582,7 @@ func GetCommitMessages(pr *models.PullRequest) string {
581582
authors = append(authors, authorString)
582583
authorsMap[authorString] = true
583584
}
584-
element = element.Next()
585+
element = element.Prev()
585586
}
586587

587588
// Consider collecting the remaining authors

‎templates/repo/issue/list.tmpl

Lines changed: 1 addition & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -200,106 +200,7 @@
200200
</div>
201201
</div>
202202
</div>
203-
204-
<div class="issue list">
205-
{{ $approvalCounts := .ApprovalCounts}}
206-
{{range .Issues}}
207-
<li class="item">
208-
{{if $.CanWriteIssuesOrPulls}}
209-
<div class="ui checkbox issue-checkbox">
210-
<input type="checkbox" data-issue-id={{.ID}}></input>
211-
</div>
212-
{{end}}
213-
<div class="ui {{if .IsClosed}}{{if .IsPull}}{{if .PullRequest.HasMerged}}purple{{else}}red{{end}}{{else}}red{{end}}{{else}}{{if .IsRead}}white{{else}}green{{end}}{{end}} label">#{{.Index}}</div>
214-
<a class="title" href="{{$.Link}}/{{.Index}}">{{RenderEmoji .Title}}</a>
215-
216-
{{if .IsPull }}
217-
{{if (index $.CommitStatus .PullRequest.ID)}}
218-
{{template "repo/commit_status" (index $.CommitStatus .PullRequest.ID)}}
219-
{{end}}
220-
{{end}}
221-
222-
{{range .Labels}}
223-
<a class="ui label" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}" title="{{.Description | RenderEmojiPlain}}">{{.Name | RenderEmoji}}</a>
224-
{{end}}
225-
226-
{{if .NumComments}}
227-
<span class="comment ui right">{{svg "octicon-comment"}} {{.NumComments}}</span>
228-
{{end}}
229-
230-
{{if .TotalTrackedTime}}
231-
<span class="comment ui right">{{svg "octicon-clock"}} {{.TotalTrackedTime | Sec2Time}}</span>
232-
{{end}}
233-
234-
<p class="desc">
235-
{{ $timeStr := TimeSinceUnix .GetLastEventTimestamp $.Lang }}
236-
{{if .OriginalAuthor }}
237-
{{$.i18n.Tr .GetLastEventLabelFake $timeStr .OriginalAuthor | Safe}}
238-
{{else if gt .Poster.ID 0}}
239-
{{$.i18n.Tr .GetLastEventLabel $timeStr .Poster.HomeLink (.Poster.GetDisplayName | Escape) | Safe}}
240-
{{else}}
241-
{{$.i18n.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}}
242-
{{end}}
243-
244-
{{if .Milestone}}
245-
<a class="milestone" href="{{$.RepoLink}}/milestone/{{.Milestone.ID}}">
246-
{{svg "octicon-milestone"}} {{.Milestone.Name}}
247-
</a>
248-
{{end}}
249-
{{if .Ref}}
250-
<a class="ref" href="{{index $.IssueRefURLs .ID}}">
251-
{{svg "octicon-git-branch"}} {{index $.IssueRefEndNames .ID}}
252-
</a>
253-
{{end}}
254-
{{$tasks := .GetTasks}}
255-
{{if gt $tasks 0}}
256-
{{$tasksDone := .GetTasksDone}}
257-
<span class="checklist">
258-
{{svg "octicon-checklist"}} {{$tasksDone}} / {{$tasks}} <span class="progress-bar"><span class="progress" style="width:calc(100% * {{$tasksDone}} / {{$tasks}});"></span></span>
259-
</span>
260-
{{end}}
261-
{{if ne .DeadlineUnix 0}}
262-
<span class="due-date poping up" data-content="{{$.i18n.Tr "repo.issues.due_date"}}" data-variation="tiny inverted" data-position="right center">
263-
{{svg "octicon-calendar"}}<span{{if .IsOverdue}} class="overdue"{{end}}>{{.DeadlineUnix.FormatShort}}</span>
264-
</span>
265-
{{end}}
266-
{{range .Assignees}}
267-
<a class="ui right assignee poping up" href="{{.HomeLink}}" data-content="{{.GetDisplayName}}" data-variation="inverted" data-position="left center">
268-
<img class="ui avatar image" src="{{.RelAvatarLink}}">
269-
</a>
270-
{{end}}
271-
{{if .IsPull}}
272-
{{$approveOfficial := call $approvalCounts .ID "approve"}}
273-
{{$rejectOfficial := call $approvalCounts .ID "reject"}}
274-
{{$waitingOfficial := call $approvalCounts .ID "waiting"}}
275-
{{if gt $approveOfficial 0}}
276-
<span class="approvals">{{svg "octicon-check"}}
277-
{{$.i18n.Tr (TrN $.i18n.Lang $approveOfficial "repo.pulls.approve_count_1" "repo.pulls.approve_count_n") $approveOfficial}}
278-
</span>
279-
{{end}}
280-
281-
{{if gt $rejectOfficial 0}}
282-
<span class="rejects">{{svg "octicon-diff"}}
283-
{{$.i18n.Tr (TrN $.i18n.Lang $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n") $rejectOfficial}}
284-
</span>
285-
{{end}}
286-
287-
{{if gt $waitingOfficial 0}}
288-
<span class="waiting">{{svg "octicon-eye"}}
289-
{{$.i18n.Tr (TrN $.i18n.Lang $waitingOfficial "repo.pulls.waiting_count_1" "repo.pulls.waiting_count_n") $waitingOfficial}}
290-
</span>
291-
{{end}}
292-
293-
{{if and (not .PullRequest.HasMerged) (gt (len .PullRequest.ConflictedFiles) 0)}}
294-
<span class="conflicting">{{svg "octicon-x"}} {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span>
295-
{{end}}
296-
{{end}}
297-
</p>
298-
</li>
299-
{{end}}
300-
301-
{{template "base/paginate" .}}
302-
</div>
203+
{{template "shared/issuelist" mergeinto . "listType" "repo"}}
303204
</div>
304205
</div>
305206
{{template "base/footer" .}}

0 commit comments

Comments
 (0)