Skip to content

Commit 860e6a1

Browse files
GiteaBotGiteaBot
authored
Merge branch 'main' into lunny/fix_bug_webhook_milestone
2 parents ec3bf65 + 780e92e commit 860e6a1

File tree

29 files changed

+148
-207
lines changed

29 files changed

+148
-207
lines changed

‎models/actions/run.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ func (run *ActionRun) IsSchedule() bool {
171171

172172
func updateRepoRunsNumbers(ctx context.Context, repo *repo_model.Repository) error {
173173
_, err := db.GetEngine(ctx).ID(repo.ID).
174+
NoAutoTime().
174175
SetExpr("num_action_runs",
175176
builder.Select("count(*)").From("action_run").
176177
Where(builder.Eq{"repo_id": repo.ID}),

‎models/repo/transfer.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ func CreatePendingRepositoryTransfer(ctx context.Context, doer, newOwner *user_m
249249
}
250250

251251
repo.Status = RepositoryPendingTransfer
252-
if err := UpdateRepositoryCols(ctx, repo, "status"); err != nil {
252+
if err := UpdateRepositoryColsNoAutoTime(ctx, repo, "status"); err != nil {
253253
return err
254254
}
255255

‎models/repo/update.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func UpdateRepositoryOwnerNames(ctx context.Context, ownerID int64, ownerName st
2525
}
2626
defer committer.Close()
2727

28-
if _, err := db.GetEngine(ctx).Where("owner_id = ?", ownerID).Cols("owner_name").Update(&Repository{
28+
if _, err := db.GetEngine(ctx).Where("owner_id = ?", ownerID).Cols("owner_name").NoAutoTime().Update(&Repository{
2929
OwnerName: ownerName,
3030
}); err != nil {
3131
return err
@@ -40,8 +40,8 @@ func UpdateRepositoryUpdatedTime(ctx context.Context, repoID int64, updateTime t
4040
return err
4141
}
4242

43-
// UpdateRepositoryCols updates repository's columns
44-
func UpdateRepositoryCols(ctx context.Context, repo *Repository, cols ...string) error {
43+
// UpdateRepositoryColsWithAutoTime updates repository's columns
44+
func UpdateRepositoryColsWithAutoTime(ctx context.Context, repo *Repository, cols ...string) error {
4545
_, err := db.GetEngine(ctx).ID(repo.ID).Cols(cols...).Update(repo)
4646
return err
4747
}

‎models/user/user.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1203,7 +1203,8 @@ func GetUsersByEmails(ctx context.Context, emails []string) (map[string]*User, e
12031203
for _, email := range emailAddresses {
12041204
user := users[email.UID]
12051205
if user != nil {
1206-
results[user.GetEmail()] = user
1206+
results[user.Email] = user
1207+
results[user.GetPlaceholderEmail()] = user
12071208
}
12081209
}
12091210
}
@@ -1213,6 +1214,7 @@ func GetUsersByEmails(ctx context.Context, emails []string) (map[string]*User, e
12131214
return nil, err
12141215
}
12151216
for _, user := range users {
1217+
results[user.Email] = user
12161218
results[user.GetPlaceholderEmail()] = user
12171219
}
12181220
return results, nil

‎models/user/user_test.go‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"code.gitea.io/gitea/modules/timeutil"
2424

2525
"github.com/stretchr/testify/assert"
26+
"github.com/stretchr/testify/require"
2627
)
2728

2829
func TestIsUsableUsername(t *testing.T) {
@@ -48,14 +49,23 @@ func TestOAuth2Application_LoadUser(t *testing.T) {
4849
assert.NotNil(t, user)
4950
}
5051

51-
func TestGetUserEmailsByNames(t *testing.T) {
52+
func TestUserEmails(t *testing.T) {
5253
assert.NoError(t, unittest.PrepareTestDatabase())
53-
54-
// ignore none active user email
55-
assert.ElementsMatch(t, []string{"[email protected]"}, user_model.GetUserEmailsByNames(db.DefaultContext, []string{"user8", "user9"}))
56-
assert.ElementsMatch(t, []string{"[email protected]", "[email protected]"}, user_model.GetUserEmailsByNames(db.DefaultContext, []string{"user8", "user5"}))
57-
58-
assert.ElementsMatch(t, []string{"[email protected]"}, user_model.GetUserEmailsByNames(db.DefaultContext, []string{"user8", "org7"}))
54+
t.Run("GetUserEmailsByNames", func(t *testing.T) {
55+
// ignore none active user email
56+
assert.ElementsMatch(t, []string{"[email protected]"}, user_model.GetUserEmailsByNames(db.DefaultContext, []string{"user8", "user9"}))
57+
assert.ElementsMatch(t, []string{"[email protected]", "[email protected]"}, user_model.GetUserEmailsByNames(db.DefaultContext, []string{"user8", "user5"}))
58+
assert.ElementsMatch(t, []string{"[email protected]"}, user_model.GetUserEmailsByNames(db.DefaultContext, []string{"user8", "org7"}))
59+
})
60+
t.Run("GetUsersByEmails", func(t *testing.T) {
61+
m, err := user_model.GetUsersByEmails(db.DefaultContext, []string{"[email protected]", "user2@" + setting.Service.NoReplyAddress})
62+
require.NoError(t, err)
63+
require.Len(t, m, 4)
64+
assert.EqualValues(t, 1, m["[email protected]"].ID)
65+
assert.EqualValues(t, 1, m["user1@"+setting.Service.NoReplyAddress].ID)
66+
assert.EqualValues(t, 2, m["[email protected]"].ID)
67+
assert.EqualValues(t, 2, m["user2@"+setting.Service.NoReplyAddress].ID)
68+
})
5969
}
6070

6171
func TestCanCreateOrganization(t *testing.T) {

‎modules/templates/helper.go‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -162,22 +162,6 @@ func NewFuncMap() template.FuncMap {
162162

163163
"FilenameIsImage": filenameIsImage,
164164
"TabSizeClass": tabSizeClass,
165-
166-
// for backward compatibility only, do not use them anymore
167-
"TimeSince": timeSinceLegacy,
168-
"TimeSinceUnix": timeSinceLegacy,
169-
"DateTime": dateTimeLegacy,
170-
171-
"RenderEmoji": renderEmojiLegacy,
172-
"RenderLabel": renderLabelLegacy,
173-
"RenderLabels": renderLabelsLegacy,
174-
"RenderIssueTitle": renderIssueTitleLegacy,
175-
176-
"RenderMarkdownToHtml": renderMarkdownToHtmlLegacy,
177-
178-
"RenderCommitMessage": renderCommitMessageLegacy,
179-
"RenderCommitMessageLinkSubject": renderCommitMessageLinkSubjectLegacy,
180-
"RenderCommitBody": renderCommitBodyLegacy,
181165
}
182166
}
183167

@@ -367,7 +351,3 @@ func QueryBuild(a ...any) template.URL {
367351
}
368352
return template.URL(s)
369353
}
370-
371-
func panicIfDevOrTesting() {
372-
setting.PanicInDevOrTesting("legacy template functions are for backward compatibility only, do not use them in new code")
373-
}

‎modules/templates/util_date_legacy.go‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎modules/templates/util_date_test.go‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ func TestDateTime(t *testing.T) {
2323
du := NewDateUtils()
2424

2525
refTimeStr := "2018-01-01T00:00:00Z"
26-
refDateStr := "2018-01-01"
2726
refTime, _ := time.Parse(time.RFC3339, refTimeStr)
2827
refTimeStamp := timeutil.TimeStamp(refTime.Unix())
2928

@@ -32,18 +31,9 @@ func TestDateTime(t *testing.T) {
3231
assert.EqualValues(t, "-", du.AbsoluteShort(time.Time{}))
3332
assert.EqualValues(t, "-", du.AbsoluteShort(timeutil.TimeStamp(0)))
3433

35-
actual := dateTimeLegacy("short", "invalid")
36-
assert.EqualValues(t, `-`, actual)
37-
38-
actual = dateTimeLegacy("short", refTimeStr)
39-
assert.EqualValues(t, `<absolute-date weekday="" year="numeric" month="short" day="numeric" date="2018-01-01T00:00:00Z">2018-01-01</absolute-date>`, actual)
40-
41-
actual = du.AbsoluteShort(refTime)
34+
actual := du.AbsoluteShort(refTime)
4235
assert.EqualValues(t, `<absolute-date weekday="" year="numeric" month="short" day="numeric" date="2018-01-01T00:00:00Z">2018-01-01</absolute-date>`, actual)
4336

44-
actual = dateTimeLegacy("short", refDateStr)
45-
assert.EqualValues(t, `<absolute-date weekday="" year="numeric" month="short" day="numeric" date="2018-01-01T00:00:00-05:00">2018-01-01</absolute-date>`, actual)
46-
4737
actual = du.AbsoluteShort(refTimeStamp)
4838
assert.EqualValues(t, `<absolute-date weekday="" year="numeric" month="short" day="numeric" date="2017-12-31T19:00:00-05:00">2017-12-31</absolute-date>`, actual)
4939

@@ -69,6 +59,6 @@ func TestTimeSince(t *testing.T) {
6959
actual = timeSinceTo(&refTime, time.Time{})
7060
assert.EqualValues(t, `<relative-time prefix="" tense="future" datetime="2018-01-01T00:00:00Z" data-tooltip-content data-tooltip-interactive="true">2018-01-01 00:00:00 +00:00</relative-time>`, actual)
7161

72-
actual = timeSinceLegacy(timeutil.TimeStampNano(refTime.UnixNano()), nil)
62+
actual = du.TimeSince(timeutil.TimeStampNano(refTime.UnixNano()))
7363
assert.EqualValues(t, `<relative-time prefix="" tense="past" datetime="2017-12-31T19:00:00-05:00" data-tooltip-content data-tooltip-interactive="true">2017-12-31 19:00:00 -05:00</relative-time>`, actual)
7464
}

‎modules/templates/util_render_legacy.go‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎routers/api/v1/repo/issue_comment.go‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -609,15 +609,17 @@ func editIssueComment(ctx *context.APIContext, form api.EditIssueCommentOption)
609609
return
610610
}
611611

612-
oldContent := comment.Content
613-
comment.Content = form.Body
614-
if err := issue_service.UpdateComment(ctx, comment, comment.ContentVersion, ctx.Doer, oldContent); err != nil {
615-
if errors.Is(err, user_model.ErrBlockedUser) {
616-
ctx.APIError(http.StatusForbidden, err)
617-
} else {
618-
ctx.APIErrorInternal(err)
612+
if form.Body != comment.Content {
613+
oldContent := comment.Content
614+
comment.Content = form.Body
615+
if err := issue_service.UpdateComment(ctx, comment, comment.ContentVersion, ctx.Doer, oldContent); err != nil {
616+
if errors.Is(err, user_model.ErrBlockedUser) {
617+
ctx.APIError(http.StatusForbidden, err)
618+
} else {
619+
ctx.APIErrorInternal(err)
620+
}
621+
return
619622
}
620-
return
621623
}
622624

623625
ctx.JSON(http.StatusOK, convert.ToAPIComment(ctx, ctx.Repo.Repository, comment))

0 commit comments

Comments
 (0)