From 7f856d5d742dcb6febdb8a3f22cd9a8fecc69a4d Mon Sep 17 00:00:00 2001
From: pengqiseven <134899215+pengqiseven@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:24:23 +0800
Subject: [PATCH] remove repetitive words (#29695)
Signed-off-by: pengqiseven <912170095@qq.com>
---
docs/content/administration/mail-templates.en-us.md | 2 +-
models/issues/issue_search.go | 2 +-
models/user/user.go | 2 +-
modules/git/commit.go | 2 +-
routers/api/v1/repo/issue.go | 2 +-
routers/api/v1/repo/pull_review.go | 2 +-
templates/swagger/v1_json.tmpl | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/docs/content/administration/mail-templates.en-us.md b/docs/content/administration/mail-templates.en-us.md
index 4026b89975..8e4e416e8d 100644
--- a/docs/content/administration/mail-templates.en-us.md
+++ b/docs/content/administration/mail-templates.en-us.md
@@ -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.
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.
diff --git a/models/issues/issue_search.go b/models/issues/issue_search.go
index c5c9cecdb9..4e1bd9e87e 100644
--- a/models/issues/issue_search.go
+++ b/models/issues/issue_search.go
@@ -393,7 +393,7 @@ func applyReviewRequestedCondition(sess *xorm.Session, reviewRequestedID int64)
func applyReviewedCondition(sess *xorm.Session, reviewedID int64) *xorm.Session {
// 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}
reviewed := builder.In("issue.id", builder.
Select("issue_id").
diff --git a/models/user/user.go b/models/user/user.go
index 0bdda8655f..22a3099643 100644
--- a/models/user/user.go
+++ b/models/user/user.go
@@ -425,7 +425,7 @@ func (u *User) GetDisplayName() string {
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
// "username".
func (u *User) GetCompleteName() string {
diff --git a/modules/git/commit.go b/modules/git/commit.go
index 5d960e92f3..facb632bd9 100644
--- a/modules/git/commit.go
+++ b/modules/git/commit.go
@@ -311,7 +311,7 @@ func (c *Commit) GetFilesChangedSinceCommit(pastCommit string) ([]string, error)
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.
func (c *Commit) FileChangedSinceCommit(filename, pastCommit string) (bool, error) {
return c.repo.FileChangedBetweenCommits(filename, pastCommit, c.ID.String())
diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go
index b63e7ab662..09175fe0ac 100644
--- a/routers/api/v1/repo/issue.go
+++ b/routers/api/v1/repo/issue.go
@@ -368,7 +368,7 @@ func ListIssues(ctx *context.APIContext) {
// required: false
// - name: created_by
// 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
// - name: assigned_by
// in: query
diff --git a/routers/api/v1/repo/pull_review.go b/routers/api/v1/repo/pull_review.go
index 5128102e61..d314c4e7f7 100644
--- a/routers/api/v1/repo/pull_review.go
+++ b/routers/api/v1/repo/pull_review.go
@@ -545,7 +545,7 @@ func prepareSingleReview(ctx *context.APIContext) (*issues_model.Review, *issues
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 {
ctx.NotFound("ReviewNotInPR")
return nil, nil, true
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 98198696bc..221b34b7f8 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -6428,7 +6428,7 @@
},
{
"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",
"in": "query"
},