Skip to content

Missed a conversion from UserNoEmailType to User #1927

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

Merged
merged 2 commits into from
Nov 26, 2019

Conversation

carols10cents
Copy link
Member

@carols10cents carols10cents commented Nov 25, 2019

When reviewing #1911, I missed a spot. I reverted the PR merge on master, so this PR reverts the revert and adds the fix.

I tried to write a test that would have caught this, but I utterly failed at making a real-enough app/request that would have .user() but would let me set the session() :(

Also a lot of this code is temporary and will be undone once I've rebased #1891, but this needs to be deployed separately from #1891 to ensure there aren't any uses of the email column.

r? @jtgeibel

@jtgeibel
Copy link
Member

LGTM!

@bors r+

@bors
Copy link
Contributor

bors commented Nov 26, 2019

📌 Commit fcf5e96 has been approved by jtgeibel

@bors
Copy link
Contributor

bors commented Nov 26, 2019

⌛ Testing commit fcf5e96 with merge 50b75b3...

bors added a commit that referenced this pull request Nov 26, 2019
Missed a conversion from UserNoEmailType to User

When reviewing #1911, I missed a spot. I reverted the PR merge on master, so this PR reverts the revert and adds the fix.

I tried to write a test that would have caught this, but I utterly failed at making a real-enough app/request that would have `.user()` but would let me set the `session()` :(

Also a lot of this code is temporary and will be undone once I've rebased #1891, but this needs to be deployed separately from #1891 to ensure there aren't any uses of the email column.

r? @jtgeibel
@bors
Copy link
Contributor

bors commented Nov 26, 2019

☀️ Test successful - checks-travis
Approved by: jtgeibel
Pushing 50b75b3 to master...

@bors bors merged commit fcf5e96 into rust-lang:master Nov 26, 2019
@carols10cents carols10cents deleted the fix_cookie_user_requests branch December 2, 2019 14:54
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.

4 participants