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

Modernize merge button (#28140) #28786

Merged
merged 2 commits into from Jan 15, 2024
Merged

Modernize merge button (#28140) #28786

merged 2 commits into from Jan 15, 2024

Commits on Jan 14, 2024

  1. Modernize merge button (go-gitea#28140) 

    - Make use of the `form-fetch-action` for the merge button, which will
automatically prevent the action from happening multiple times and show
a nice loading indicator as user feedback while the merge request is
being processed by the server.
- Adjust the merge PR code to JSON response as this is required for the
`form-fetch-action` functionality.
- Resolves https://codeberg.org/forgejo/forgejo/issues/774
- Likely resolves the cause of
https://codeberg.org/forgejo/forgejo/issues/1688#issuecomment-1313044

(cherry picked from commit 4ec64c19507caefff7ddaad722b1b5792b97cc5a)

Co-authored-by: Gusted <postmaster@gusted.xyz>
    @earl-warren @Gusted @GiteaBot
    2 people authored and GiteaBot committed Jan 14, 2024
    Configuration menu
    Copy the full SHA
    ca4a3d7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release/v1.21' into backport-28140-v1.21

    @GiteaBot
    GiteaBot committed Jan 14, 2024
    Configuration menu
    Copy the full SHA
    0a5b7f5 View commit details
    Browse the repository at this point in the history