forks/forgejo
1
0
Fork 0
Code Releases Activity

remove repetitive words (#29695)

Browse source 
Signed-off-by: pengqiseven <912170095@qq.com>
(cherry picked from commit 7f856d5d742dcb6febdb8a3f22cd9a8fecc69a4d)
This commit is contained in:
pengqiseven 2024-03-11 17:24:23 +08:00 committed by Earl Warren
parent 2559c80bec
commit e825d007b1
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
7 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/content/administration/mail-templates.en-us.md
View file

@ -163,7 +163,7 @@ clients don't even support HTML, so they show the text version included in the g
If the template fails to render, it will be noticed only at the moment the mail is sent. If the template fails to render, it will be noticed only at the moment the mail is sent.
A default subject is used if the subject template fails, and whatever was rendered successfully A default subject is used if the subject template fails, and whatever was rendered successfully
from the the _mail body_ is used, disregarding the rest. from the _mail body_ is used, disregarding the rest.
Please check [Gitea's logs](administration/logging-config.md) for error messages in case of trouble. Please check [Gitea's logs](administration/logging-config.md) for error messages in case of trouble.

2
models/issues/issue_search.go
View file

@ -393,7 +393,7 @@ func applyReviewRequestedCondition(sess *xorm.Session, reviewRequestedID int64)
func applyReviewedCondition(sess *xorm.Session, reviewedID int64) *xorm.Session { func applyReviewedCondition(sess *xorm.Session, reviewedID int64) *xorm.Session {
// Query for pull requests where you are a reviewer or commenter, excluding // Query for pull requests where you are a reviewer or commenter, excluding
// any pull requests already returned by the the review requested filter. // any pull requests already returned by the review requested filter.
notPoster := builder.Neq{"issue.poster_id": reviewedID} notPoster := builder.Neq{"issue.poster_id": reviewedID}
reviewed := builder.In("issue.id", builder. reviewed := builder.In("issue.id", builder.
Select("issue_id"). Select("issue_id").

2
models/user/user.go
View file

@ -436,7 +436,7 @@ func (u *User) GetDisplayName() string {
return u.Name return u.Name
} }
// GetCompleteName returns the the full name and username in the form of // GetCompleteName returns the full name and username in the form of
// "Full Name (username)" if full name is not empty, otherwise it returns // "Full Name (username)" if full name is not empty, otherwise it returns
// "username". // "username".
func (u *User) GetCompleteName() string { func (u *User) GetCompleteName() string {

2
modules/git/commit.go
View file

@ -311,7 +311,7 @@ func (c *Commit) GetFilesChangedSinceCommit(pastCommit string) ([]string, error)
return c.repo.GetFilesChangedBetween(pastCommit, c.ID.String()) return c.repo.GetFilesChangedBetween(pastCommit, c.ID.String())
} }
// FileChangedSinceCommit Returns true if the file given has changed since the the past commit // FileChangedSinceCommit Returns true if the file given has changed since the past commit
// YOU MUST ENSURE THAT pastCommit is a valid commit ID. // YOU MUST ENSURE THAT pastCommit is a valid commit ID.
func (c *Commit) FileChangedSinceCommit(filename, pastCommit string) (bool, error) { func (c *Commit) FileChangedSinceCommit(filename, pastCommit string) (bool, error) {
return c.repo.FileChangedBetweenCommits(filename, pastCommit, c.ID.String()) return c.repo.FileChangedBetweenCommits(filename, pastCommit, c.ID.String())

2
routers/api/v1/repo/issue.go
View file

@ -368,7 +368,7 @@ func ListIssues(ctx *context.APIContext) {
// required: false // required: false
// - name: created_by // - name: created_by
// in: query // in: query
// description: Only show items which were created by the the given user // description: Only show items which were created by the given user
// type: string // type: string
// - name: assigned_by // - name: assigned_by
// in: query // in: query

2
routers/api/v1/repo/pull_review.go
View file

@ -692,7 +692,7 @@ func prepareSingleReview(ctx *context.APIContext) (*issues_model.Review, *issues
return nil, nil, true return nil, nil, true
} }
// validate the the review is for the given PR // validate the review is for the given PR
if review.IssueID != pr.IssueID { if review.IssueID != pr.IssueID {
ctx.NotFound("ReviewNotInPR") ctx.NotFound("ReviewNotInPR")
return nil, nil, true return nil, nil, true

2
templates/swagger/v1_json.tmpl generated
View file

@ -6552,7 +6552,7 @@
}, },
{ {
"type": "string", "type": "string",
"description": "Only show items which were created by the the given user", "description": "Only show items which were created by the given user",
"name": "created_by", "name": "created_by",
"in": "query" "in": "query"
}, },