Skip to content

Refactor some file edit related code #34744

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

Merged
merged 5 commits into from
Jun 18, 2025

Conversation

wxiaoguang
Copy link
Contributor

Follow up Allow renaming/moving binary/LFS files in the UI #34350

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 17, 2025
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Jun 17, 2025
@wxiaoguang wxiaoguang added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Jun 17, 2025
@wxiaoguang wxiaoguang force-pushed the refactor-lfs-rename branch 11 times, most recently from 4680c91 to 37ba735 Compare June 17, 2025 07:54
@wxiaoguang wxiaoguang force-pushed the refactor-lfs-rename branch from 37ba735 to 34f4c9a Compare June 17, 2025 08:27
@wxiaoguang wxiaoguang force-pushed the refactor-lfs-rename branch from 34f4c9a to cbb6ad0 Compare June 17, 2025 08:34
@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 Jun 17, 2025
@silverwind
Copy link
Member

silverwind commented Jun 17, 2025

TestChangeRepoFilesForUpdateWithFileRename is flaky on main branch:

https://github.com/go-gitea/gitea/actions/runs/15713464470/job/44277277806?pr=34721

Can we fix it here?

@wxiaoguang
Copy link
Contributor Author

TestChangeRepoFilesForUpdateWithFileRename is flaky on main branch:

https://github.com/go-gitea/gitea/actions/runs/15713464470/job/44277277806?pr=34721

Can we fix it here?

It's already fixed here #34744 (comment)

image

@wxiaoguang
Copy link
Contributor Author

FIXMEs are resolved

@wxiaoguang wxiaoguang force-pushed the refactor-lfs-rename branch from 33b3e26 to 8dda04b Compare June 18, 2025 00:39
@wxiaoguang wxiaoguang added this to the 1.25.0 milestone Jun 18, 2025
@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 Jun 18, 2025
@wxiaoguang wxiaoguang enabled auto-merge (squash) June 18, 2025 01:12
@wxiaoguang wxiaoguang disabled auto-merge June 18, 2025 01:12
@wxiaoguang wxiaoguang enabled auto-merge (squash) June 18, 2025 01:12
@wxiaoguang wxiaoguang merged commit 71e4740 into go-gitea:main Jun 18, 2025
26 checks passed
@wxiaoguang wxiaoguang deleted the refactor-lfs-rename branch June 18, 2025 01:18
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jun 18, 2025
* giteaofficial/main:
  Remove unused param `doer` (go-gitea#34545)
  Improve alignment of commit status icon on commit page (go-gitea#34750)
  Run `gopls modernize` on codebase (go-gitea#34751)
  Refactor some file edit related code (go-gitea#34744)
  [skip ci] Updated translations via Crowdin
  Fix ghost user in feeds when pushing in an actions, it should be gitea-actions (go-gitea#34703)
  upgrade orgmode to v1.8.0 (go-gitea#34721)
  Support title and body query parameters for new PRs (go-gitea#34537)
  Improve nuget/rubygems package registries (go-gitea#34741)
  Replace update repository function in some places (go-gitea#34566)
  remove unnecessary duplicate code (go-gitea#34733)
  fix: prevent double markdown link brackets when pasting URL (go-gitea#34745)
  Fix JS error for "select" dropdown (go-gitea#34743)
  [skip ci] Updated translations via Crowdin
  Allow renaming/moving binary/LFS files in the UI (go-gitea#34350)
  Clean bindata (go-gitea#34728)
  Refactor container and UI (go-gitea#34736)
  Prevent duplicate form submissions when creating forks (go-gitea#34714)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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 skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants