-
-
Notifications
You must be signed in to change notification settings - Fork 5.6k
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
Support "merge upstream branch" (Sync fork) #32741
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GiteaBot
added
the
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
label
Dec 6, 2024
pull-request-size
bot
added
the
size/L
Denotes a PR that changes 100-499 lines, ignoring generated files.
label
Dec 6, 2024
github-actions
bot
added
modifies/translation
modifies/go
Pull requests that update Go code
modifies/templates
This PR modifies the template files
labels
Dec 6, 2024
This was referenced Dec 6, 2024
Great! My favorite feature! 😆 |
2 approvals are enough. |
wxiaoguang
added
the
type/feature
Completely new functionality. Can only be merged if feature freeze is not active.
label
Dec 6, 2024
silverwind
reviewed
Dec 6, 2024
silverwind
reviewed
Dec 6, 2024
silverwind
reviewed
Dec 6, 2024
wxiaoguang
force-pushed
the
support-merge-upstream-branch
branch
from
December 6, 2024 17:23
bb95701
to
21d8318
Compare
sorry that I was making some fine tunes and adding some comments but made a force-push (will be more careful), hopefully it won't affect review, the reviews above should all have been addressed.
|
silverwind
approved these changes
Dec 6, 2024
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 6, 2024
lunny
approved these changes
Dec 6, 2024
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 6, 2024
lunny
added
the
reviewed/wait-merge
This pull request is part of the merge queue. It will be merged soon.
label
Dec 6, 2024
GiteaBot
removed
the
reviewed/wait-merge
This pull request is part of the merge queue. It will be merged soon.
label
Dec 6, 2024
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Dec 9, 2024
* giteaofficial/main: [skip ci] Updated licenses and gitignores Fix repo home row-right grow (go-gitea#32763) Refactor issue list (go-gitea#32755) Fix compare page bug view as anonymous (go-gitea#32754) Split issue/pull view router function as multiple smaller functions (go-gitea#32749) fix: render job title as commit message (go-gitea#32748) Fix typescript errors in Vue files, fix regression in "Recent Commits" chart (go-gitea#32649) Refactor LabelEdit (go-gitea#32752) [skip ci] Updated translations via Crowdin fix(project): add title to project view page (go-gitea#32747) [skip ci] Updated translations via Crowdin Fix case of .tsbuildinfo in .gitignore (go-gitea#32737) Support "merge upstream branch" (Sync fork) (go-gitea#32741) Update changelog to add missed changelog (go-gitea#32734) GitHub like repo home page (go-gitea#32213) Refactor markdown render (go-gitea#32736) Make wiki pages visit fast (go-gitea#32732) Refactor markdown render (go-gitea#32728) Refactor RepoActionView.vue, add `::group::` support (go-gitea#32713)
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
modifies/templates
This PR modifies the template files
modifies/translation
size/L
Denotes a PR that changes 100-499 lines, ignoring generated files.
type/feature
Completely new functionality. Can only be merged if feature freeze is not active.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add basic "sync fork" support (GitHub-like)