Merge branch 'main' into lunny/move_git_command

GiteaBot · web-flow · commit 0b5a81e2a742 · 2025-09-16T12:32:15.000+08:00
diff --git a/modules/structs/issue.go b/modules/structs/issue.go
@@ -76,6 +76,8 @@ type Issue struct {
 	// swagger:strfmt date-time
 	Deadline *time.Time `json:"due_date"`
 
+	TimeEstimate int64 `json:"time_estimate"`
+
 	PullRequest *PullRequestMeta `json:"pull_request"`
 	Repo        *RepositoryMeta  `json:"repository"`
 
diff --git a/services/convert/issue.go b/services/convert/issue.go
@@ -59,6 +59,8 @@ func toIssue(ctx context.Context, doer *user_model.User, issue *issues_model.Iss
 		Created:     issue.CreatedUnix.AsTime(),
 		Updated:     issue.UpdatedUnix.AsTime(),
 		PinOrder:    util.Iif(issue.PinOrder == -1, 0, issue.PinOrder), // -1 means loaded with no pin order
+
+		TimeEstimate: issue.TimeEstimate,
 	}
 
 	if issue.Repo != nil {
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,8 @@ func toIssue(ctx context.Context, doer user_model.User, issue issues_model.Iss`
`59`	`59`	`Created: issue.CreatedUnix.AsTime(),`
`60`	`60`	`Updated: issue.UpdatedUnix.AsTime(),`
`61`	`61`	`PinOrder: util.Iif(issue.PinOrder == -1, 0, issue.PinOrder), // -1 means loaded with no pin order`
	`62`	`+`
	`63`	`+ TimeEstimate: issue.TimeEstimate,`
`62`	`64`	`}`
`63`	`65`
`64`	`66`	`if issue.Repo != nil {`