Skip to content

Make sure git version&feature are always prepared#30877

Merged
KN4CK3R merged 1 commit into
go-gitea:mainfrom
wxiaoguang:fix-git-feature
May 6, 2024
Merged

Make sure git version&feature are always prepared#30877
KN4CK3R merged 1 commit into
go-gitea:mainfrom
wxiaoguang:fix-git-feature

Conversation

@wxiaoguang
Copy link
Copy Markdown
Contributor

@wxiaoguang wxiaoguang commented May 6, 2024 •
edited
Loading

Otherwise there would be more similar issues like #29287

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 6, 2024
@wxiaoguang wxiaoguang changed the title Make sure git version&feature are already prepared Make sure git version&feature are always prepared May 6, 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 May 6, 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 May 6, 2024
@KN4CK3R KN4CK3R merged commit 7c613f1 into go-gitea:main May 6, 2024
@GiteaBot GiteaBot added this to the 1.23.0 milestone May 6, 2024
@GiteaBot
Copy link
Copy Markdown
Collaborator

GiteaBot commented May 6, 2024

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

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

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label May 6, 2024
@wxiaoguang wxiaoguang deleted the fix-git-feature branch May 6, 2024 16:52
wxiaoguang added a commit to wxiaoguang/gitea that referenced this pull request May 6, 2024
@wxiaoguang
Make sure git version&feature are always prepared (go-gitea#30877)
e07170b 
Otherwise there would be more similar issues like go-gitea#29287
# Conflicts:
#	routers/private/hook_pre_receive.go
@wxiaoguang wxiaoguang mentioned this pull request May 6, 2024
Merged
@wxiaoguang wxiaoguang added the backport/done All backports for this PR have been created label May 6, 2024
@wxiaoguang wxiaoguang mentioned this pull request May 6, 2024
Merged
wxiaoguang added a commit that referenced this pull request May 7, 2024
@wxiaoguang
Make sure git version&feature are always prepared (#30877) (#30879)
d5563be 
Backport #30877
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 7, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
36f7bf4 
* giteaofficial/main:
  Make "sync branch" also sync object format and add tests (go-gitea#30878)
  Make sure git version&feature are always prepared (go-gitea#30877)
  Get repo list with OrderBy alpha should respect owner too (go-gitea#30784)
  Fix some UI problems (dropdown/container) (go-gitea#30849)
  Fix some UI problems (install/checkbox) (go-gitea#30854)
@wxiaoguang wxiaoguang mentioned this pull request May 14, 2024
Closed
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 5, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@lunny lunny lunny approved these changes

@KN4CK3R KN4CK3R KN4CK3R 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! lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug

Projects

None yet

Milestone

1.23.0

Development

Successfully merging this pull request may close these issues.

4 participants

@wxiaoguang @GiteaBot @lunny @KN4CK3R