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 gitea-action user avatar broken on edited menu #29190

Merged
merged 2 commits into from
Feb 16, 2024
Merged

Fix gitea-action user avatar broken on edited menu #29190

merged 2 commits into from
Feb 16, 2024

Conversation

yp05327
Copy link
Contributor

@yp05327 yp05327 commented Feb 16, 2024

Fix #29178

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 16, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 16, 2024
@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 Feb 16, 2024
@wxiaoguang wxiaoguang added backport/v1.21 This PR should be backported to Gitea 1.21 type/bug labels Feb 16, 2024
@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 Feb 16, 2024
@techknowlogick techknowlogick enabled auto-merge (squash) February 16, 2024 07:38
@techknowlogick techknowlogick added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Feb 16, 2024
@techknowlogick techknowlogick merged commit 8e28316 into go-gitea:main Feb 16, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.22.0 milestone Feb 16, 2024
@GiteaBot
Copy link
Collaborator

I was unable to create a backport for 1.21. @yp05327, please send one manually. 🍵

go run ./contrib/backport 29190
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added backport/manual No power to the bots! Create your backport yourself! and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Feb 16, 2024
zjjhot added a commit to zjjhot/gitea that referenced this pull request Feb 16, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
1688a0c 
* giteaofficial/main: (23 commits)
  Remove jQuery from SSH key form parser (go-gitea#29193)
  Refactor request function (go-gitea#29187)
  Docker Tag Information in Docs (go-gitea#29047)
  Fix gitea-action user avatar broken on edited menu (go-gitea#29190)
  Disable parallel Make execution (go-gitea#29186)
  Auto-update the system status in admin dashboard (go-gitea#29163)
  Avoid vue warning in dev mode (go-gitea#29188)
  Update JS and PY dependencies (go-gitea#29184)
  [skip ci] Updated translations via Crowdin
  Implement contributors graph (go-gitea#27882)
  Add support for action artifact serve direct (go-gitea#29120)
  Advertise WebAuthn support (go-gitea#29176)
  Tweak repo header (go-gitea#29134)
  Change webhook-type in create-view (go-gitea#29114)
  Remove jQuery from the comment task list (go-gitea#29170)
  Fix can not select team reviewers when reviewers is empty (go-gitea#29174)
  move # labels to be above inputs (go-gitea#28753)
  Refactor locale&string&template related code (go-gitea#29165)
  Extract linguist code to method (go-gitea#29168)
  bump to use go 1.22 (go-gitea#29119)
  ...
@yp05327 yp05327 deleted the fix-29178 branch February 18, 2024 23:41
yp05327 added a commit to yp05327/gitea that referenced this pull request Feb 18, 2024
@yp05327
Fix gitea-action user avatar broken on edited menu (go-gitea#29190)
84ce288 
Backport go-gitea#29190

Fix go-gitea#29178
yp05327 added a commit to yp05327/gitea that referenced this pull request Feb 18, 2024
@yp05327
Fix gitea-action user avatar broken on edited menu (go-gitea#29190)
4ac5462 
Backport go-gitea#29190

Fix go-gitea#29178
@yp05327
Copy link
Contributor Author

yp05327 commented Feb 18, 2024 •
edited
Loading

image
No conflicts but giteabot can not create the backport?

https://github.com/yp05327/gitea/tree/backport-29190-v1.21

This was referenced Feb 19, 2024
Merged
Closed
silverwind pushed a commit to silverwind/gitea that referenced this pull request Feb 20, 2024
@yp05327 @silverwind
Fix gitea-action user avatar broken on edited menu (go-gitea#29190)
f113ef0 
Fix go-gitea#29178
@yp05327 yp05327 mentioned this pull request Feb 22, 2024
Merged
silverwind pushed a commit that referenced this pull request Feb 22, 2024
@yp05327
Fix gitea-action user avatar broken on edited menu (#29190) (#29307)
f80ea95 
Backport #29190

Fix #29178
@lunny lunny added the backport/done All backports for this PR have been created label Feb 22, 2024
6543 pushed a commit to 6543-forks/gitea that referenced this pull request Feb 26, 2024
@yp05327 @earl-warren
Fix gitea-action user avatar broken on edited menu (go-gitea#29190)
78f6b29 
Fix go-gitea#29178

(cherry picked from commit 8e28316)
@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 1, 2024

Automatically locked because of our CONTRIBUTING guidelines

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 1, 2024
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Reviewers

@techknowlogick techknowlogick techknowlogick approved these changes

@wxiaoguang wxiaoguang wxiaoguang approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

Gitea action user avatar broken on edit
5 participants
@yp05327 @GiteaBot @techknowlogick @wxiaoguang @lunny