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.

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

Add continue option to backport.go #22930

Merged
merged 2 commits into from
Feb 16, 2023

Conversation

zeripath
Copy link
Contributor

Sometimes it can be helpful to continue from a broken cherry-pick. This PR adds another option which can be used to determine the version and pr number from the current branch name instead of reading the config.yaml file.

Sometimes it can be helpful to continue from a broken cherry-pick. This PR adds another
option which can be used to determine the version and pr number from the current branch
name instead of reading the config.yaml file.

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath added the topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile label Feb 15, 2023
Signed-off-by: Andrew Thornton <art27@cantab.net>
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Feb 15, 2023
@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 Feb 16, 2023
@6543 6543 merged commit 6c90f5e into go-gitea:main Feb 16, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Feb 17, 2023
* upstream/main:
  Always go full width in PR view (go-gitea#22844)
  Increase Content field size of gpg_key_import to MEDIUMTEXT (go-gitea#22897)
  Fix context bug (go-gitea#22940)
  Allow custom "created" timestamps in user creation API (go-gitea#22549)
  Use "Title Case" for text "Reference in new issue" (go-gitea#22936)
  First step to refactor the `.hide` to `.gt-hidden` (go-gitea#22916)
  Add continue option to backport.go (go-gitea#22930)
  Add `title` to PR file tree items (go-gitea#22918)

# Conflicts:
#	templates/repo/issue/view_content/comments.tmpl
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
@zeripath zeripath deleted the add-continue-to-backport branch May 10, 2023 17:11
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants