diff options
| author | 6543 <6543@obermui.de> | 2020-12-18 03:33:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-18 11:33:32 +0800 |
| commit | e483220ea3c54137cec543842261f99c4696129a (patch) | |
| tree | 2f81f173315b8ebe92403290977c09bfc32bf754 /routers/repo | |
| parent | 27edc1aa19afb043a497a7dc628afa420cb1de55 (diff) | |
| download | gitea-e483220ea3c54137cec543842261f99c4696129a.tar.gz gitea-e483220ea3c54137cec543842261f99c4696129a.zip | |
[Refactor] CombinedStatus and CommitStatus related functions & structs (#14026)
* RM unused struct
* rename (*CommitStatus) loadRepo() -> loadAttributes()
* move ToCommitStatus into its own file
* use CommitStatusState instead of StatusState
* move CombinedStatus convertion into convert package
* let models.GetLatestCommitStatus use repoID direct and accept ListOptions
* update swagger docs
* fix tests
* Fix swagger docs
* rm page
* fix swagger docs!!!
* return json null
* always return json
* rename api.Status to api.CommitStatus
* fix swagger docs
* sec swagger fix
Diffstat (limited to 'routers/repo')
| -rw-r--r-- | routers/repo/blame.go | 2 | ||||
| -rw-r--r-- | routers/repo/commit.go | 2 | ||||
| -rw-r--r-- | routers/repo/pull.go | 4 | ||||
| -rw-r--r-- | routers/repo/view.go | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/routers/repo/blame.go b/routers/repo/blame.go index bd11310988..514adc3bc1 100644 --- a/routers/repo/blame.go +++ b/routers/repo/blame.go @@ -87,7 +87,7 @@ func RefBlame(ctx *context.Context) { ctx.Data["LatestCommitVerification"] = models.ParseCommitWithSignature(latestCommit) ctx.Data["LatestCommitUser"] = models.ValidateCommitWithEmail(latestCommit) - statuses, err := models.GetLatestCommitStatus(ctx.Repo.Repository, ctx.Repo.Commit.ID.String(), 0) + statuses, err := models.GetLatestCommitStatus(ctx.Repo.Repository.ID, ctx.Repo.Commit.ID.String(), models.ListOptions{}) if err != nil { log.Error("GetLatestCommitStatus: %v", err) } diff --git a/routers/repo/commit.go b/routers/repo/commit.go index 5bb26ffe41..43a95c2adb 100644 --- a/routers/repo/commit.go +++ b/routers/repo/commit.go @@ -296,7 +296,7 @@ func Diff(ctx *context.Context) { commitID = commit.ID.String() } - statuses, err := models.GetLatestCommitStatus(ctx.Repo.Repository, commitID, 0) + statuses, err := models.GetLatestCommitStatus(ctx.Repo.Repository.ID, commitID, models.ListOptions{}) if err != nil { log.Error("GetLatestCommitStatus: %v", err) } diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 0ea6ec33de..bee3bbc1df 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -368,7 +368,7 @@ func PrepareViewPullInfo(ctx *context.Context, issue *models.Issue) *git.Compare ctx.ServerError(fmt.Sprintf("GetRefCommitID(%s)", pull.GetGitRefName()), err) return nil } - commitStatuses, err := models.GetLatestCommitStatus(repo, sha, 0) + commitStatuses, err := models.GetLatestCommitStatus(repo.ID, sha, models.ListOptions{}) if err != nil { ctx.ServerError("GetLatestCommitStatus", err) return nil @@ -449,7 +449,7 @@ func PrepareViewPullInfo(ctx *context.Context, issue *models.Issue) *git.Compare return nil } - commitStatuses, err := models.GetLatestCommitStatus(repo, sha, 0) + commitStatuses, err := models.GetLatestCommitStatus(repo.ID, sha, models.ListOptions{}) if err != nil { ctx.ServerError("GetLatestCommitStatus", err) return nil diff --git a/routers/repo/view.go b/routers/repo/view.go index 7d69ee4cf8..66ad8e3ad7 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -353,7 +353,7 @@ func renderDirectory(ctx *context.Context, treeLink string) { ctx.Data["LatestCommitUser"] = models.ValidateCommitWithEmail(latestCommit) - statuses, err := models.GetLatestCommitStatus(ctx.Repo.Repository, ctx.Repo.Commit.ID.String(), 0) + statuses, err := models.GetLatestCommitStatus(ctx.Repo.Repository.ID, ctx.Repo.Commit.ID.String(), models.ListOptions{}) if err != nil { log.Error("GetLatestCommitStatus: %v", err) } |