Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Display friendly error message (#29105) #29363

Merged
merged 4 commits into from Feb 24, 2024
Merged

Display friendly error message (#29105) #29363

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
865f8bb
Display friendly error message (#29105)
KN4CK3R Feb 8, 2024
30973d9
Merge branch 'release/v1.21' into lunny/fix-wrong-error-method
lunny Feb 24, 2024
d1d44be
Merge branch 'release/v1.21' into lunny/fix-wrong-error-method
GiteaBot Feb 24, 2024
12161bd
Merge branch 'release/v1.21' into lunny/fix-wrong-error-method
GiteaBot Feb 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions routers/web/repo/actions/actions.go
View file
Open in desktop
Expand Up @@ -61,17 +61,17 @@ func List(ctx *context.Context) {

var workflows []Workflow
if empty, err := ctx.Repo.GitRepo.IsEmpty(); err != nil {
ctx.Error(http.StatusInternalServerError, err.Error())
ctx.ServerError("IsEmpty", err)
return
} else if !empty {
commit, err := ctx.Repo.GitRepo.GetBranchCommit(ctx.Repo.Repository.DefaultBranch)
if err != nil {
ctx.Error(http.StatusInternalServerError, err.Error())
ctx.ServerError("GetBranchCommit", err)
return
}
entries, err := actions.ListWorkflows(commit)
if err != nil {
ctx.Error(http.StatusInternalServerError, err.Error())
ctx.ServerError("ListWorkflows", err)
return
}

Expand All @@ -96,7 +96,7 @@ func List(ctx *context.Context) {
workflow := Workflow{Entry: *entry}
content, err := actions.GetContentFromEntry(entry)
if err != nil {
ctx.Error(http.StatusInternalServerError, err.Error())
ctx.ServerError("GetContentFromEntry", err)
return
}
wf, err := model.ReadWorkflow(bytes.NewReader(content))
Expand Down Expand Up @@ -173,7 +173,7 @@ func List(ctx *context.Context) {

runs, total, err := actions_model.FindRuns(ctx, opts)
if err != nil {
ctx.Error(http.StatusInternalServerError, err.Error())
ctx.ServerError("FindAndCount", err)
return
}

Expand All @@ -182,15 +182,15 @@ func List(ctx *context.Context) {
}

if err := runs.LoadTriggerUser(ctx); err != nil {
ctx.Error(http.StatusInternalServerError, err.Error())
ctx.ServerError("LoadTriggerUser", err)
return
}

ctx.Data["Runs"] = runs

actors, err := actions_model.GetActors(ctx, ctx.Repo.Repository.ID)
if err != nil {
ctx.Error(http.StatusInternalServerError, err.Error())
ctx.ServerError("GetActors", err)
return
}
ctx.Data["Actors"] = repo.MakeSelfOnTop(ctx.Doer, actors)
Expand Down