Skip to content

Commit fdc398a

Browse files
authored
Merge branch 'main' into kd/add_compare_arrow
2 parents 92a6e0c + 3d98d99 commit fdc398a

File tree

6 files changed

+37
-10
lines changed

6 files changed

+37
-10
lines changed

docs/content/usage/actions/comparison.en-us.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ Like `uses: https://github.com/actions/checkout@v3` or `uses: http://your_gitea.
2929
Gitea Actions supports writing actions in Go.
3030
See [Creating Go Actions](https://blog.gitea.com/creating-go-actions/).
3131

32+
### Support the non-standard syntax @yearly, @monthly, @weekly, @daily, @hourly on schedule
33+
34+
Github Actions doesn't support that. https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
35+
3236
## Unsupported workflows syntax
3337

3438
### `concurrency`
@@ -110,6 +114,10 @@ It's ignored by Gitea Actions now.
110114

111115
Pre and Post steps don't have their own section in the job log user interface.
112116

117+
### Services steps
118+
119+
Services steps don't have their own section in the job log user interface.
120+
113121
## Different behavior
114122

115123
### Downloading actions

docs/content/usage/actions/comparison.zh-cn.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ Gitea Actions支持通过URL绝对路径定义actions,这意味着您可以使
2929
Gitea Actions支持使用Go编写Actions。
3030
请参阅[创建Go Actions](https://blog.gitea.com/creating-go-actions/)
3131

32+
### 支持非标准的调度语法 @yearly, @monthly, @weekly, @daily, @hourly
33+
34+
Github Actions 不支持这些语法,详见: https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
35+
3236
## 不支持的工作流语法
3337

3438
### `concurrency`
@@ -116,6 +120,10 @@ Gitea Actions目前不支持此功能。
116120

117121
预处理和后处理步骤在Job日志用户界面中没有自己的用户界面。
118122

123+
### 服务步骤
124+
125+
服务步骤在Job日志用户界面中没有自己的用户界面。
126+
119127
## 不一样的行为
120128

121129
### 下载Actions

models/issues/review.go

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -460,8 +460,10 @@ func SubmitReview(ctx context.Context, doer *user_model.User, issue *Issue, revi
460460
func GetReviewByIssueIDAndUserID(ctx context.Context, issueID, userID int64) (*Review, error) {
461461
review := new(Review)
462462

463-
has, err := db.GetEngine(ctx).SQL("SELECT * FROM review WHERE id IN (SELECT max(id) as id FROM review WHERE issue_id = ? AND reviewer_id = ? AND original_author_id = 0 AND type in (?, ?, ?))",
464-
issueID, userID, ReviewTypeApprove, ReviewTypeReject, ReviewTypeRequest).
463+
has, err := db.GetEngine(ctx).Where(
464+
builder.In("type", ReviewTypeApprove, ReviewTypeReject, ReviewTypeRequest).
465+
And(builder.Eq{"issue_id": issueID, "reviewer_id": userID, "original_author_id": 0})).
466+
Desc("id").
465467
Get(review)
466468
if err != nil {
467469
return nil, err
@@ -475,13 +477,13 @@ func GetReviewByIssueIDAndUserID(ctx context.Context, issueID, userID int64) (*R
475477
}
476478

477479
// GetTeamReviewerByIssueIDAndTeamID get the latest review request of reviewer team for a pull request
478-
func GetTeamReviewerByIssueIDAndTeamID(ctx context.Context, issueID, teamID int64) (review *Review, err error) {
479-
review = new(Review)
480+
func GetTeamReviewerByIssueIDAndTeamID(ctx context.Context, issueID, teamID int64) (*Review, error) {
481+
review := new(Review)
480482

481-
var has bool
482-
if has, err = db.GetEngine(ctx).SQL("SELECT * FROM review WHERE id IN (SELECT max(id) as id FROM review WHERE issue_id = ? AND reviewer_team_id = ?)",
483-
issueID, teamID).
484-
Get(review); err != nil {
483+
has, err := db.GetEngine(ctx).Where(builder.Eq{"issue_id": issueID, "reviewer_team_id": teamID}).
484+
Desc("id").
485+
Get(review)
486+
if err != nil {
485487
return nil, err
486488
}
487489

modules/lfs/http_client.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,10 @@ func (c *HTTPClient) batch(ctx context.Context, operation string, objects []Poin
7979
return nil, err
8080
}
8181

82-
req, err := createRequest(ctx, http.MethodPost, url, map[string]string{"Content-Type": MediaType}, payload)
82+
req, err := createRequest(ctx, http.MethodPost, url, map[string]string{
83+
"Content-Type": MediaType,
84+
"Accept": MediaType,
85+
}, payload)
8386
if err != nil {
8487
return nil, err
8588
}

modules/markup/html.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -852,7 +852,9 @@ func fullIssuePatternProcessor(ctx *RenderContext, node *html.Node) {
852852
}
853853

854854
func issueIndexPatternProcessor(ctx *RenderContext, node *html.Node) {
855-
if ctx.Metas == nil || ctx.Metas["mode"] == "document" {
855+
// FIXME: the use of "mode" is quite dirty and hacky, for example: what is a "document"? how should it be rendered?
856+
// The "mode" approach should be refactored to some other more clear&reliable way.
857+
if ctx.Metas == nil || (ctx.Metas["mode"] == "document" && !ctx.IsWiki) {
856858
return
857859
}
858860
var (

options/locale/locale_ja-JP.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ remove=除去
9191
remove_all=すべて除去
9292
remove_label_str=アイテム「%s」を削除
9393
edit=編集
94+
view=表示
9495

9596
enabled=有効
9697
disabled=無効
@@ -3531,6 +3532,9 @@ runs.status=ステータス
35313532
runs.actors_no_select=すべてのアクター
35323533
runs.status_no_select=すべてのステータス
35333534
runs.no_results=一致する結果はありません。
3535+
runs.no_workflows=ワークフローはまだありません。
3536+
runs.no_workflows.quick_start=Gitea Action の始め方がわからない? <a target="_blank" rel="noopener noreferrer" href="%s">クイックスタートガイド</a>をご覧ください。
3537+
runs.no_workflows.documentation=Gitea Action の詳細については、<a target="_blank" rel="noopener noreferrer" href="%s">ドキュメント</a>を参照してください。
35343538
runs.no_runs=ワークフローはまだ実行されていません。
35353539
runs.empty_commit_message=(空のコミットメッセージ)
35363540

0 commit comments

Comments
 (0)