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

Client-server: Fix upload keys example request #2157

Merged

Conversation

@a-andreyev
Copy link
Contributor

a-andreyev commented Jul 8, 2019

Contributes to #1733

@turt2live

This comment has been minimized.

Copy link
Member

turt2live commented Jul 8, 2019

Thanks for finding and fixing this @a-andreyev! We do need signoff and a changelog before it can be merged though, as per our contributing guidelines. When you get a chance, please sign off on the changes and include a .clarification changelog entry.

@a-andreyev a-andreyev force-pushed the a-andreyev:aa13q/api-client-server-device-keys branch from b2242d9 to b77678e Jul 8, 2019
@a-andreyev

This comment has been minimized.

Copy link
Contributor Author

a-andreyev commented Jul 8, 2019

Got it! Updated the PR. 🙂

@uhoreg

This comment has been minimized.

Copy link
Member

uhoreg commented Jul 8, 2019

Thanks for the fix. Since you're fixing this spot, could you also fix the same issue in api/client-server/keys.yaml and api/server-server/user_keys.yaml (which will also require a server_server changelog file).

@a-andreyev a-andreyev force-pushed the a-andreyev:aa13q/api-client-server-device-keys branch from b77678e to 8ea2c71 Jul 8, 2019
@a-andreyev

This comment has been minimized.

Copy link
Contributor Author

a-andreyev commented Jul 8, 2019

Thank you! Missed that previously, fixed.

Copy link
Member

turt2live left a comment

lgtm from a syntax perspective. I'll leave figuring out the algorithms to the professionals.

@turt2live turt2live requested a review from uhoreg Jul 8, 2019
Contributes to #1733

Signed-off-by: Alexey Andreyev <aa13q@ya.ru>
@a-andreyev a-andreyev force-pushed the a-andreyev:aa13q/api-client-server-device-keys branch from 8ea2c71 to 9ed19a3 Jul 8, 2019
@uhoreg uhoreg merged commit ee04b77 into matrix-org:master Jul 8, 2019
7 checks passed
7 checks passed
ci/circleci: build-dev-scripts Your tests passed on CircleCI!
Details
ci/circleci: build-docs Your tests passed on CircleCI!
Details
ci/circleci: build-swagger Your tests passed on CircleCI!
Details
ci/circleci: check-docs Your tests passed on CircleCI!
Details
ci/circleci: validate-docs Your tests passed on CircleCI!
Details
docs Click details to preview the HTML documentation.
Details
swagger Click to preview the swagger build.
Details
@uhoreg

This comment has been minimized.

Copy link
Member

uhoreg commented Jul 8, 2019

Thank you very much!

@jplatte jplatte referenced this pull request Nov 9, 2019
1 of 21 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.