Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Added basic keycloak openid instructions #7659

Merged
merged 5 commits into from
Jun 16, 2020
Merged

Added basic keycloak openid instructions #7659

merged 5 commits into from
Jun 16, 2020

Conversation

hungrymonkey
Copy link
Contributor

@hungrymonkey hungrymonkey commented Jun 9, 2020

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a changelog file. The entry should:
    • Be a short description of your change which makes sense to users. "Fixed a bug that prevented receiving messages from other servers." instead of "Moved X method from EventStore to EventWorkerStore.".
    • Use markdown where necessary, mostly for code blocks.
    • End with either a period (.) or an exclamation mark (!).
    • Start with a capital letter.
  • Pull request includes a sign off
  • [?] Code style is correct (run the linters)

@hungrymonkey
Copy link
Contributor Author

Am I suppose to create an issue page and change log?

@hungrymonkey hungrymonkey changed the title Basic instructions for keycloak openid Added basic keycloak openid instructions Jun 9, 2020
@erikjohnston erikjohnston requested a review from a team June 9, 2020 12:32
Copy link
Member

@clokep clokep left a comment

Choose a reason for hiding this comment

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

I requested a few changes, but they're all rather minor. Thanks for adding this example!

@clokep
Copy link
Member

clokep commented Jun 9, 2020

Am I suppose to create an issue page and change log?

Looks like you've got everything you need!

Added clokep's suggested changes

Signed-off-by: Ted Chang <[email protected]>
@hungrymonkey
Copy link
Contributor Author

@clokep done

@clokep clokep self-requested a review June 9, 2020 18:34
Changed a few descriptions
@clokep clokep self-requested a review June 16, 2020 15:02
@clokep clokep merged commit 5c5516f into matrix-org:develop Jun 16, 2020
@clokep
Copy link
Member

clokep commented Jun 16, 2020

Thanks! 👍

@hungrymonkey
Copy link
Contributor Author

@clokep , You could have told me and I would have squashed my commits. I am sorry. I polluted the history by spreading through 5 different commits which is excessive.

@hungrymonkey hungrymonkey deleted the patch-1 branch June 16, 2020 15:43
@hungrymonkey
Copy link
Contributor Author

Nevermind, I did not know github auto squash commits. Cool

@clokep
Copy link
Member

clokep commented Jun 16, 2020

Yeah, there's a little drop down where you can choose to do a merge, a squash or a rebase. For synapse we generally do a squash to keep the history linear!

babolivier pushed a commit that referenced this pull request Sep 1, 2021
* commit '5c5516f80':
  Add instructions for authing with Keycloak via OpenID (#7659)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants