Skip to content

Rebase onto f33fbcf701c824aaf43fd0f439cab30865897364 from upstream#9

Merged
nataliejameson merged 0 commit intodiscordfrom
nmj/rebase-octocrab
Mar 19, 2026
Merged

Rebase onto f33fbcf701c824aaf43fd0f439cab30865897364 from upstream#9
nataliejameson merged 0 commit intodiscordfrom
nmj/rebase-octocrab

Conversation

@nataliejameson
Copy link

Bi-annual rebase is in effect! This pulls in all of the changes from upstream and puts us at 0.49.5

This includes the commits from:

With some various changes to make them work (or to remove the changes if they're now irrelevant) with upstream.

Main things to call out:

  • The retry code changed a bit. Before we returned a future of the retryconfig, and now we mutate the ints in place, and then return future<()>
  • Some logic to handle "sometimes null, sometimes an empty dict, sometimes who knows what" was implemented upstream. It's no longer needed
  • There was some work upstream around something similar to the CommitAuthor changes that we had, however, I'm not sure I trust even the reduced set of fields from "SimpleUser" to be simple enough, so I left what works, over having to go do real prod testing against some random commits that we've run into.

Copy link
Member

@denbeigh2000 denbeigh2000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i have thoroughly reviewed the entire ~14k line changeset, and it lgtm 👍

@nataliejameson nataliejameson merged commit a27e4b2 into discord Mar 19, 2026
1 of 10 checks passed
@nataliejameson
Copy link
Author

git push origin -f nmj/rebase-octocrab:discord
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)
To https://github.com/discord/octocrab.git
 + 05b4071...a27e4b2 nmj/rebase-octocrab -> discord (forced update)

discord branch is up to date

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants