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

Revert "Unblacklist /upgrade creates a new room"#7254

Merged
anoadragon453 merged 1 commit intodevelopfrom
revert-7228-anoa/allow_upgrade_worker_sytests
Apr 9, 2020
Merged

Revert "Unblacklist /upgrade creates a new room"#7254
anoadragon453 merged 1 commit intodevelopfrom
revert-7228-anoa/allow_upgrade_worker_sytests

Conversation

@anoadragon453
Copy link
Member

Reverts #7228

Needed to wait for matrix-org/sytest#848 to be approved first.

@anoadragon453 anoadragon453 merged commit e3cd28d into develop Apr 9, 2020
@anoadragon453 anoadragon453 deleted the revert-7228-anoa/allow_upgrade_worker_sytests branch April 9, 2020 11:47
anoadragon453 added a commit that referenced this pull request Apr 9, 2020
anoadragon453 added a commit that referenced this pull request Apr 9, 2020
This commit was originally merged in #7228 but reverted in #7254 as the
associated sytest was not ready yet. Now that it is, we can merge this
again.
phil-flex pushed a commit to phil-flex/synapse that referenced this pull request Jun 16, 2020
phil-flex pushed a commit to phil-flex/synapse that referenced this pull request Jun 16, 2020
This commit was originally merged in matrix-org#7228 but reverted in matrix-org#7254 as the
associated sytest was not ready yet. Now that it is, we can merge this
again.
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.

1 participant