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

Fix "Updating branch by merge" bug in "update_branch_by_merge.tmpl" (#23790) #23825

Merged
merged 1 commit into from
Mar 31, 2023
Merged

Fix "Updating branch by merge" bug in "update_branch_by_merge.tmpl" (#23790) #23825

merged 1 commit into from
Mar 31, 2023

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Mar 30, 2023 •
edited
Loading

Backport #23790

Fix regression of #22683

Pass all variables into sub-template.

Close #23787

@wxiaoguang
Fix "Updating branch by merge" bug in "update_branch_by_merge.tmpl" (g…
0e2c1ad 
…o-gitea#23790)

Fix regression of go-gitea#22683 , it didn't pass all variables into
sub-template.

Close go-gitea#23787

After the fix, all links and the form are correct.

![image](https://user-images.githubusercontent.com/2114189/228511037-580b5f5d-43e7-494f-9b66-89f9f908e208.png)

![image](https://user-images.githubusercontent.com/2114189/228510958-f960284a-101d-4b0e-b887-80033127898d.png)
# Conflicts:
#	templates/repo/issue/view_content/update_branch_by_merge.tmpl
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Mar 30, 2023
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Mar 30, 2023
@silverwind silverwind added outdated/backport/v1.19 This PR should be backported to Gitea 1.19 and removed lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. labels Mar 30, 2023
@silverwind silverwind added this to the 1.20.0 milestone Mar 30, 2023
@silverwind silverwind added type/bug and removed outdated/backport/v1.19 This PR should be backported to Gitea 1.19 labels Mar 30, 2023
@silverwind silverwind modified the milestones: 1.20.0, 1.19.1 Mar 30, 2023
@lunny lunny merged commit a146033 into go-gitea:release/v1.19 Mar 31, 2023
@wxiaoguang wxiaoguang deleted the fix-pull-merge-template-backport branch March 31, 2023 04:19
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@silverwind silverwind silverwind approved these changes

@jolheiser jolheiser jolheiser approved these changes

Assignees
No one assigned
Labels
type/bug
Projects
None yet
Milestone
1.19.1
Development

Successfully merging this pull request may close these issues.
5 participants
@wxiaoguang @silverwind @jolheiser @lunny @GiteaBot