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

Update Delegated OAuth to 1.0.2 #25

Merged
merged 1 commit into from
Jan 29, 2020
Merged

Update Delegated OAuth to 1.0.2 #25

merged 1 commit into from
Jan 29, 2020

Conversation

rmccue
Copy link
Member

@rmccue rmccue commented Jan 29, 2020

Seeing as we control this, we could use a ~ here?

@rmccue rmccue requested a review from roborourke January 29, 2020 12:43
@roborourke
Copy link
Contributor

That does the same as ^ right? I'm good with that, think we stopped as JH had feelings about it but for our own deps I think it'll save us some work in general.

@rmccue
Copy link
Member Author

rmccue commented Jan 29, 2020

Yeah, functionally equivalent here. I'll follow up with another PR for it.

@rmccue rmccue merged commit 999f0e5 into master Jan 29, 2020
@rmccue rmccue deleted the delgated-102 branch January 29, 2020 13:27
@hm-backport
Copy link

hm-backport bot commented Jan 29, 2020

The backport to v2-branch failed:

Commits ["a5844bf2abcb543566217a46f8dd5d193f44274e"] could not be cherry-picked on top of v2-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v2-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick a5844bf2abcb543566217a46f8dd5d193f44274e
# Create a new branch with these backported commits.
git checkout -b backport-25-to-v2-branch
# Push it to GitHub.
git push --set-upstream origin backport-25-to-v2-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is v2-branch and the compare/head branch is backport-25-to-v2-branch.

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