-
Notifications
You must be signed in to change notification settings - Fork 350
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
Integrate Merge PR API #8232
Merged
Merged
Integrate Merge PR API #8232
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
d41ffad
Update src-dest UI in Pulls list
itaigilo 499f6aa
Show closed/merged timestamp in the Pulls list
itaigilo 11dd9c8
Show merged commit link in merged PR details
itaigilo db1a1e3
Cleanup
itaigilo dcda563
Handle empty diffs
itaigilo 7dd22d9
Handle deleted branch errors
itaigilo 62e0477
Disable button when branch not found
itaigilo f6bb51c
Merge branch 'master' into task/prfd-ux-ui-improvements
itaigilo d3d85eb
Update field name
itaigilo b55484e
Fix PR comments
itaigilo b39de22
Integrate Merge PR API
itaigilo 3be755f
Remove log
itaigilo 01f76ad
Merge branch 'master' into task/prfd-integrate-pr-merge-api
itaigilo e66757b
Merge branch 'master' into task/prfd-integrate-pr-merge-api
itaigilo 94cee56
Update error message
itaigilo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right! It's there since we had two different errors (merge + status change), and now it isn't relevant anymore.
Changed.