Ensure that rebase conflicts are handled in updates (#16952) #16960
Conversation
This file contains hidden or 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
Backport go-gitea#16952 PR go-gitea#16125 did not update the error handlers to handle conflict errors relating to rebases. This PR adds them. Fix go-gitea#16922 Signed-off-by: Andrew Thornton <art27@cantab.net>
6543
approved these changes
Sep 5, 2021
axifive
approved these changes
Sep 5, 2021
|
@axifive this is a good code refactor - but nothing for a backport 😆 |
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Sep 19, 2021
## [1.15.3](https://github.com/go-gitea/gitea/releases/tag/v1.15.3) - 2021-09-19 * ENHANCEMENTS * Add fluid to ui container class to remove margin (go-gitea#16396) (go-gitea#16976) * Add caller to cat-file batch calls (go-gitea#17082) (go-gitea#17089) * BUGFIXES * Render full plain readme. (go-gitea#17083) (go-gitea#17090) * Upgrade xorm to v1.2.4 (go-gitea#17059) * Fix bug of migrate comments which only fetch one page (go-gitea#17055) (go-gitea#17058) * Do not show issue context popup on external issues (go-gitea#17050) (go-gitea#17054) * Decrement Fork Num when converting from Fork (go-gitea#17035) (go-gitea#17046) * Correctly rollback in ForkRepository (go-gitea#17034) (go-gitea#17045) * Fix missing close in WalkGitLog (go-gitea#17008) (go-gitea#17009) * Add prefix to SVG id/class attributes (go-gitea#16997) (go-gitea#17000) * Fix bug of migrated repository not index (go-gitea#16991) (go-gitea#16996) * Skip AllowedUserVisibilityModes validation on update user if it is an organisation (go-gitea#16988) (go-gitea#16990) * Fix storage Iterate bug and Add storage doctor to delete garbage attachments (go-gitea#16971) (go-gitea#16977) * Fix issue with issue default mail template (go-gitea#16956) (go-gitea#16975) * Ensure that rebase conflicts are handled in updates (go-gitea#16952) (go-gitea#16960) * Prevent panic on diff generation (go-gitea#16950) (go-gitea#16951) Signed-off-by: Andrew Thornton <art27@cantab.net>
Merged
lunny
pushed a commit
that referenced
this pull request
Sep 20, 2021
## [1.15.3](https://github.com/go-gitea/gitea/releases/tag/v1.15.3) - 2021-09-19 * ENHANCEMENTS * Add fluid to ui container class to remove margin (#16396) (#16976) * Add caller to cat-file batch calls (#17082) (#17089) * BUGFIXES * Render full plain readme. (#17083) (#17090) * Upgrade xorm to v1.2.4 (#17059) * Fix bug of migrate comments which only fetch one page (#17055) (#17058) * Do not show issue context popup on external issues (#17050) (#17054) * Decrement Fork Num when converting from Fork (#17035) (#17046) * Correctly rollback in ForkRepository (#17034) (#17045) * Fix missing close in WalkGitLog (#17008) (#17009) * Add prefix to SVG id/class attributes (#16997) (#17000) * Fix bug of migrated repository not index (#16991) (#16996) * Skip AllowedUserVisibilityModes validation on update user if it is an organisation (#16988) (#16990) * Fix storage Iterate bug and Add storage doctor to delete garbage attachments (#16971) (#16977) * Fix issue with issue default mail template (#16956) (#16975) * Ensure that rebase conflicts are handled in updates (#16952) (#16960) * Prevent panic on diff generation (#16950) (#16951) Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
6543
pushed a commit
to 6543-forks/gitea
that referenced
this pull request
Sep 21, 2021
## [1.15.3](https://github.com/go-gitea/gitea/releases/tag/v1.15.3) - 2021-09-19 * ENHANCEMENTS * Add fluid to ui container class to remove margin (go-gitea#16396) (go-gitea#16976) * Add caller to cat-file batch calls (go-gitea#17082) (go-gitea#17089) * BUGFIXES * Render full plain readme. (go-gitea#17083) (go-gitea#17090) * Upgrade xorm to v1.2.4 (go-gitea#17059) * Fix bug of migrate comments which only fetch one page (go-gitea#17055) (go-gitea#17058) * Do not show issue context popup on external issues (go-gitea#17050) (go-gitea#17054) * Decrement Fork Num when converting from Fork (go-gitea#17035) (go-gitea#17046) * Correctly rollback in ForkRepository (go-gitea#17034) (go-gitea#17045) * Fix missing close in WalkGitLog (go-gitea#17008) (go-gitea#17009) * Add prefix to SVG id/class attributes (go-gitea#16997) (go-gitea#17000) * Fix bug of migrated repository not index (go-gitea#16991) (go-gitea#16996) * Skip AllowedUserVisibilityModes validation on update user if it is an organisation (go-gitea#16988) (go-gitea#16990) * Fix storage Iterate bug and Add storage doctor to delete garbage attachments (go-gitea#16971) (go-gitea#16977) * Fix issue with issue default mail template (go-gitea#16956) (go-gitea#16975) * Ensure that rebase conflicts are handled in updates (go-gitea#16952) (go-gitea#16960) * Prevent panic on diff generation (go-gitea#16950) (go-gitea#16951) Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
lunny
pushed a commit
that referenced
this pull request
Sep 22, 2021
## [1.15.3](https://github.com/go-gitea/gitea/releases/tag/v1.15.3) - 2021-09-19 * ENHANCEMENTS * Add fluid to ui container class to remove margin (#16396) (#16976) * Add caller to cat-file batch calls (#17082) (#17089) * BUGFIXES * Render full plain readme. (#17083) (#17090) * Upgrade xorm to v1.2.4 (#17059) * Fix bug of migrate comments which only fetch one page (#17055) (#17058) * Do not show issue context popup on external issues (#17050) (#17054) * Decrement Fork Num when converting from Fork (#17035) (#17046) * Correctly rollback in ForkRepository (#17034) (#17045) * Fix missing close in WalkGitLog (#17008) (#17009) * Add prefix to SVG id/class attributes (#16997) (#17000) * Fix bug of migrated repository not index (#16991) (#16996) * Skip AllowedUserVisibilityModes validation on update user if it is an organisation (#16988) (#16990) * Fix storage Iterate bug and Add storage doctor to delete garbage attachments (#16971) (#16977) * Fix issue with issue default mail template (#16956) (#16975) * Ensure that rebase conflicts are handled in updates (#16952) (#16960) * Prevent panic on diff generation (#16950) (#16951) Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Backport #16952
PR #16125 did not update the error handlers to handle conflict errors relating
to rebases. This PR adds them.
Fix #16922
Signed-off-by: Andrew Thornton art27@cantab.net