Reenable creating default webhooks. #24626
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GiteaBot
added
the
lgtm/need 2
Fixes go-gitea#24624 This seems to have been broken in go-gitea#21563 Previously, the code read ``` // Are we looking at default webhooks? if ctx.Params(":configType") == "default-hooks" { return &orgRepoCtx{ IsAdmin: true, Link: path.Join(setting.AppSubURL, "/admin/hooks"), LinkNew: path.Join(setting.AppSubURL, "/admin/default-hooks"), NewTemplate: tplAdminHookNew, }, nil } // Must be system webhooks instead return &orgRepoCtx{ IsAdmin: true, IsSystemWebhook: true, Link: path.Join(setting.AppSubURL, "/admin/hooks"), LinkNew: path.Join(setting.AppSubURL, "/admin/system-hooks"), NewTemplate: tplAdminHookNew, }, nil ``` but was simplified to ``` return &ownerRepoCtx{ IsAdmin: true, IsSystemWebhook: ctx.Params(":configType") == "system-hooks", Link: path.Join(setting.AppSubURL, "/admin/hooks"), LinkNew: path.Join(setting.AppSubURL, "/admin/system-hooks"), NewTemplate: tplAdminHookNew, }, nil ``` combining the IsSystemWebhook check into a one-liner, but forgtting the same for LinkNew.
kousu
force-pushed
the
default-webhooks-new-render
branch
from
333f661 to
3f044b0
Compare
lunny
reviewed
May 10, 2023
delvh
approved these changes
May 10, 2023
GiteaBot
added
lgtm/need 1
lunny
approved these changes
May 11, 2023
GiteaBot
added
lgtm/done
lunny
added
the
reviewed/wait-merge
GiteaBot
removed
the
reviewed/wait-merge
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
May 12, 2023
* upstream/main: GitHub Actions cleanups (go-gitea#24620) Fix issues list page multiple selection update milestones (go-gitea#24660) Make repo migration cancelable and fix various bugs (go-gitea#24605) Improve queue & process & stacktrace (go-gitea#24636) Fix missing badges in org settings page (go-gitea#24654) Only show one tippy at a time (go-gitea#24648) Reenable creating default webhooks. (go-gitea#24626) Kd/fix redis unit test (go-gitea#24650)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #24624
This seems to have been broken in #21563
Previously, this code read
but was simplified to
In other words, combining the
IsSystemWebhookcheck into a one-liner and forgetting thatLinkNewalso depended on it. This meant the rendered<form>always POSTed to/admin/system-hooks, even when you had GETed/admin/default-hooks/gitea/new.