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

Fix agit checkout command line hint & fix ShowMergeInstructions checking #31219

Merged
merged 4 commits into from
Jun 2, 2024
Merged

Fix agit checkout command line hint & fix ShowMergeInstructions checking #31219

merged 4 commits into from
Jun 2, 2024

Conversation

lunny
Copy link
Member

@lunny lunny commented Jun 2, 2024 •
edited
Loading

Fix #31135

Before
图片

After
图片

@lunny lunny added type/bug backport/v1.22 This PR should be backported to Gitea 1.22 labels Jun 2, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 2, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 2, 2024
@github-actions github-actions bot added the modifies/templates This PR modifies the template files label Jun 2, 2024
@lunny lunny mentioned this pull request Jun 2, 2024
Closed
yp05327
yp05327 approved these changes Jun 2, 2024
View reviewed changes
Copy link
Contributor

@yp05327 yp05327 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems that this issue comes from #27778

@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 2, 2024
@pull-request-size pull-request-size bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 2, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Jun 2, 2024
@lunny lunny changed the title Fix agit checkout command line hint Fix agit checkout command line hint & fix ShowMergeInstructions checking Jun 2, 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 Jun 2, 2024
@lunny lunny merged commit 2788a7c into go-gitea:main Jun 2, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Jun 2, 2024
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Jun 2, 2024
@lunny @GiteaBot
Fix agit checkout command line hint & fix ShowMergeInstructions check…
5df72f3 
…ing (go-gitea#31219)
@GiteaBot GiteaBot mentioned this pull request Jun 2, 2024
Merged
@lunny lunny deleted the lunny/fix_agit_cmd_hint branch June 2, 2024 22:45
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Jun 2, 2024
lunny added a commit that referenced this pull request Jun 3, 2024
@GiteaBot @lunny
Fix agit checkout command line hint & fix ShowMergeInstructions check…
33fa93a 
…ing (#31219) (#31222)

Backport #31219 by @lunny

Fix #31135 

Before
<img width="527" alt="图片"
src="https://github.com/go-gitea/gitea/assets/81045/60c07b55-3db2-4a9a-98f1-0eb72d149df2">

After
<img width="664" alt="图片"
src="https://github.com/go-gitea/gitea/assets/81045/0670ff5d-9e0b-47ac-aba4-9db9131de3b3">

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jun 3, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
d0022eb 
* giteaofficial/main:
  [skip ci] Updated licenses and gitignores
  Fix overflow in issue card (go-gitea#31203)
  Fix agit checkout command line hint & fix ShowMergeInstructions checking (go-gitea#31219)
  Fix the possible migration failure on 286 with postgres 16 (go-gitea#31209)
  Only update poster in issue/comment list if it has been loaded (go-gitea#31216)
  Return an empty string when a repo has no avatar in the repo API (go-gitea#31187)
  Split sanitizer functions and fine-tune some tests (go-gitea#31192)
  Performance improvements for pull request list API (go-gitea#30490)
  Fix URL In Gitea Actions Badge Docs (go-gitea#31191)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Sep 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@delvh delvh delvh approved these changes

@yp05327 yp05327 yp05327 approved these changes

@silverwind silverwind silverwind approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created 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/go Pull requests that update Go code modifies/templates This PR modifies the template files size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.23.0
Development

Successfully merging this pull request may close these issues.

"command line instructions" for agit PR is incorrect
5 participants
@lunny @silverwind @yp05327 @delvh @GiteaBot