Integrate Merge PR API #8232
Merged
Integrate Merge PR API #8232
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
itaigilo
added
exclude-changelog
E2E Test Results - DynamoDB Local - Local Block Adapter |
E2E Test Results - Quickstart |
# Conflicts: # webui/src/pages/repositories/repository/pulls/createPull.jsx
N-o-Z
approved these changes
Sep 27, 2024
| @@ -32,18 +31,12 @@ const PullDetailsContent = ({repo, pull}) => { | |||
| setError(null); | |||
| setLoading(true); | |||
| try { | |||
| await refsAPI.merge(repo.id, pull.source_branch, pull.destination_branch); | |||
| await pullsAPI.merge(repo.id, pull.id); | |||
| } catch (error) { | |||
| setError(`Failed to merge pull request: ${error.message}`); | |||
There was a problem hiding this comment.
I think the error here may be confusing. The merge might have been successful and the failure was on the update.
Since we are returning a verbose error message from the server, lets just use it as is.
There was a problem hiding this comment.
Right! It's there since we had two different errors (merge + status change), and now it isn't relevant anymore.
Changed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Closes #8210.