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

Disallow user_consent where experimental MSC3861 is enabled #16127

Merged
merged 5 commits into from
Aug 22, 2023

Conversation

hughns
Copy link
Member

@hughns hughns commented Aug 17, 2023

Fixes #16126

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.
    • Feel free to credit yourself, by adding a sentence "Contributed by @github_username." or "Contributed by [Your Name]." to the end of the entry.
  • Pull request includes a sign off
  • Code style is correct
    (run the linters)

@hughns hughns force-pushed the hughns/msc3861-user-consent branch 2 times, most recently from 5ad23d4 to 5841189 Compare August 17, 2023 15:29
@hughns hughns changed the title Disallow user_consent.require_at_registration=True where experimental MSC3861 is enabled Disallow user_consent where experimental MSC3861 is enabled Aug 17, 2023
@hughns hughns marked this pull request as ready for review August 18, 2023 14:15
@hughns hughns requested a review from a team as a code owner August 18, 2023 14:15
@hughns hughns force-pushed the hughns/msc3861-user-consent branch from 264d7fd to fd106a8 Compare August 21, 2023 09:01
@erikjohnston erikjohnston added the X-Release-Blocker Must be resolved before making a release label Aug 21, 2023
@clokep clokep merged commit 7dbac12 into develop Aug 22, 2023
37 checks passed
@clokep clokep deleted the hughns/msc3861-user-consent branch August 22, 2023 11:42
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
X-Release-Blocker Must be resolved before making a release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

user_consent config should be disallowed if experimental MSC3861 is enabled
3 participants