Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

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

Merged
merged 3 commits into from
Mar 30, 2023
Merged

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

merged 3 commits into from
Mar 30, 2023

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Mar 29, 2023 •
edited
Loading

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

Close #23787

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

image

image

@wxiaoguang wxiaoguang changed the title fix Fix Updating branch by merge bug in "update_branch_by_merge.tmpl" Mar 29, 2023
@wxiaoguang wxiaoguang changed the title Fix Updating branch by merge bug in "update_branch_by_merge.tmpl" Fix "Updating branch by merge bug" in "update_branch_by_merge.tmpl" Mar 29, 2023
This was referenced Mar 29, 2023
Closed
Merged
@wxiaoguang wxiaoguang changed the title Fix "Updating branch by merge bug" in "update_branch_by_merge.tmpl" Fix "Updating branch by merge" bug in "update_branch_by_merge.tmpl" Mar 29, 2023
@lunny lunny added type/bug outdated/backport/v1.19 This PR should be backported to Gitea 1.19 labels Mar 29, 2023
@silverwind
Copy link
Member

What do these data-do attributes do? Searching doesn't yield anything.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 29, 2023
@wxiaoguang
Copy link
Contributor Author

What do these data-do attributes do? Searching doesn't yield anything.

Search data('do').

This is a bug fix and need to backport, so I didn't change them.

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Mar 30, 2023
@lunny lunny added this to the 1.20.0 milestone 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
@jolheiser jolheiser added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 30, 2023
@jolheiser jolheiser enabled auto-merge (squash) March 30, 2023 16:30
@jolheiser
Copy link
Member

🎺 🤖

@jolheiser jolheiser merged commit ffd2269 into go-gitea:main Mar 30, 2023
@jolheiser jolheiser removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 30, 2023
@wxiaoguang wxiaoguang deleted the fix-pull-merge-template branch March 30, 2023 17:30
wxiaoguang added a commit to wxiaoguang/gitea that referenced this pull request Mar 30, 2023
@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
@jolheiser jolheiser added the backport/done All backports for this PR have been created label Mar 30, 2023
@wxiaoguang wxiaoguang mentioned this pull request Mar 31, 2023
Merged
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 31, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
c9ca0a0 
* upstream/main:
  [skip ci] Updated translations via Crowdin
  Fix dropdown direction behavior (go-gitea#23806)
  Fix incorrect/Improve error handle in edit user page (go-gitea#23805)
  Fix "Updating branch by merge" bug in "update_branch_by_merge.tmpl" (go-gitea#23790)
  Fix incorrect visibility dropdown list in add/edit user page (go-gitea#23804)
  Convert issue list checkboxes to native (go-gitea#23596)
  Fix checks for `needs` in Actions (go-gitea#23789)
  Diff improvements (go-gitea#23553)
  [Patch] Fix closed PR also triggers Webhooks and actions (go-gitea#23782)
  Improve backport-locales.go (go-gitea#23807)
  [skip ci] Updated translations via Crowdin
  Refactor commit status for Actions jobs (go-gitea#23786)
  Add ONLY_SHOW_RELEVANT_REPOS back, fix explore page bug, make code more strict (go-gitea#23766)
  Don't apply the group filter when listing LDAP group membership if it is empty (go-gitea#23745)
lunny pushed a commit that referenced this pull request Mar 31, 2023
@wxiaoguang
Fix "Updating branch by merge" bug in "update_branch_by_merge.tmpl" (#…
a146033 
…23790) (#23825)

Backport #23790

Fix regression of #22683

Pass all variables into sub-template.

Close #23787
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Reviewers

@lunny lunny lunny approved these changes

@silverwind silverwind silverwind approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. outdated/backport/v1.19 This PR should be backported to Gitea 1.19 type/bug
Projects
None yet
Milestone
1.20.0
Development

Successfully merging this pull request may close these issues.

"Bad Request: invalid CSRF token" when Updating branch by merge
5 participants
@wxiaoguang @silverwind @jolheiser @lunny @GiteaBot