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.

Sign up for GitHub

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

Jump to bottom

Make sure git version&feature are always prepared #30877

Merged
merged 1 commit into from
May 6, 2024
Merged

Make sure git version&feature are always prepared #30877

merged 1 commit into from
May 6, 2024

Conversation

wxiaoguang
Copy link
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
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 6, 2024
@github-actions github-actions bot added modifies/go Pull requests that update Go code modifies/cli PR changes something on the CLI, i.e. gitea doctor or gitea admin labels 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
@wxiaoguang wxiaoguang added type/bug backport/v1.22 This PR should be backported to Gitea 1.22 labels 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
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone May 6, 2024
@GiteaBot
Copy link
Contributor

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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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! backport/v1.22 This PR should be backported to Gitea 1.22 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/cli PR changes something on the CLI, i.e. gitea doctor or gitea admin modifies/go Pull requests that update Go code size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.23.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@wxiaoguang @GiteaBot @lunny @KN4CK3R