Skip to content

Revert #2201 to fix broken new token button #2211

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 1 commit into from
Feb 22, 2020

Conversation

jtgeibel
Copy link
Member

@jtgeibel jtgeibel commented Feb 22, 2020

I've bisected the issue with the broken "New Token" button to the merge of #2201. That PR bumps ember-source from 3.16.1 to 3.16.2.

What is very strange is that the original commit 28a03bf that implemented the change does not appear to have this issue. Therefore it seems the issue is some sort of conflict between multiple pull requests somewhere in c970817...663259c.

I'm deploying to staging now and will deploy to production as soon as I test the change there.

cc @locks
r? @ghost

…arn/ember-source-3.16.2, r=locks"

This reverts commit 663259c, reversing
changes made to bbf2978.
@jtgeibel
Copy link
Member Author

Works fine on staging. Deploy to production in process.

@bors r+

@bors
Copy link
Contributor

bors commented Feb 22, 2020

📌 Commit 0371441 has been approved by jtgeibel

@bors
Copy link
Contributor

bors commented Feb 22, 2020

⌛ Testing commit 0371441 with merge 090f6cd...

@bors
Copy link
Contributor

bors commented Feb 22, 2020

☀️ Test successful - checks-travis
Approved by: jtgeibel
Pushing 090f6cd to master...

@bors bors merged commit 090f6cd into rust-lang:master Feb 22, 2020
@jtgeibel jtgeibel deleted the revert-2201 branch February 22, 2020 01:30
bors added a commit that referenced this pull request Mar 6, 2020
Add tests for the API token list

This adds a few basic application test for the API token list on the `/me` route. This should help in preventing regressions like mentioned in #2211.

r? @jtgeibel
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