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.

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

Fix repo avatar conflict #32958

Merged
merged 3 commits into from
Dec 23, 2024
Merged

Fix repo avatar conflict #32958

merged 3 commits into from
Dec 23, 2024

Conversation

wxiaoguang
Copy link
Contributor

Continue even if the avatar deleting fails

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 22, 2024
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Dec 22, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Dec 22, 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 Dec 22, 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 Dec 23, 2024
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Dec 23, 2024
@wxiaoguang wxiaoguang enabled auto-merge (squash) December 23, 2024 02:26
@wxiaoguang wxiaoguang merged commit 462ce31 into go-gitea:main Dec 23, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.24.0 milestone Dec 23, 2024
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Dec 23, 2024
Continue even if the avatar deleting fails
@GiteaBot GiteaBot added backport/done All backports for this PR have been created and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Dec 23, 2024
@wxiaoguang wxiaoguang deleted the fix-repo-avatar branch December 23, 2024 03:06
zjjhot added a commit to zjjhot/gitea that referenced this pull request Dec 23, 2024
* giteaofficial/main: (62 commits)
  Fix repo avatar conflict (go-gitea#32958)
  [skip ci] Updated licenses and gitignores
  fix trailing comma not matched in the case of alphanumeric issue (go-gitea#32945)
  Add auto-expanding running actions step (go-gitea#30058)
  Fix go-gitea#32954 (go-gitea#32955)
  Use Alpine 3.21 for the docker images (go-gitea#32924)
  Refactor template & test related code (go-gitea#32938)
  Use primary as button color (go-gitea#32949)
  [skip ci] Updated translations via Crowdin
  Add action auto-scroll (go-gitea#30057)
  Fix locale (go-gitea#32937)
  Enable Typescript `strictFunctionTypes` (go-gitea#32911)
  Fix areYouSure confirm (go-gitea#32941)
  Update i18n.go - Language Picker (go-gitea#32933)
  Move some errors to their own sub packages (go-gitea#32880)
  Improve navbar: add "admin" tip, add "active" style (go-gitea#32927)
  Refactor db package and remove unnecessary `DumpTables` (go-gitea#32930)
  show warning on navigation if currently editing comment or title (go-gitea#32920)
  Refactor pprof labels and process desc (go-gitea#32909)
  [skip ci] Updated translations via Crowdin
  ...
wxiaoguang added a commit that referenced this pull request Dec 23, 2024
Backport #32958 by wxiaoguang

Continue even if the avatar deleting fails

Co-authored-by: wxiaoguang <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/done All backports for this PR have been created backport/v1.23 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants