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

Bring matrix-org-hotfixes changes into mainline #4826

Open
erikjohnston opened this issue Mar 7, 2019 · 2 comments
Open

Bring matrix-org-hotfixes changes into mainline #4826

erikjohnston opened this issue Mar 7, 2019 · 2 comments
Labels
O-Occasional Affects or can be seen by some users regularly or most users rarely S-Minor Blocks non-critical functionality, workarounds exist. T-Task Refactoring, removal, replacement, enabling or disabling functionality, other engineering tasks. Z-Help-Wanted We know exactly how to fix this issue, and would be grateful for any contribution

Comments

@erikjohnston
Copy link
Member

There aren't many changes, so we may as well move the rest into mainline (behind config flags or whatever)
@neilisfragile neilisfragile added the z-p2 (Deprecated Label) label Mar 8, 2019
@ShadowJonathan
Copy link
Contributor

I got a diff here for the current (22-4-2021) changes in -hotfixes that aren't in develop.

@erikjohnston erikjohnston added the T-Task Refactoring, removal, replacement, enabling or disabling functionality, other engineering tasks. label Jul 26, 2021
@richvdh richvdh mentioned this issue Feb 2, 2022
Closed
@DMRobertson DMRobertson mentioned this issue Feb 2, 2022
Closed
@DMRobertson
Copy link
Contributor

DMRobertson commented Feb 2, 2022 •
edited
Loading

State of play as I see it today:

@DMRobertson DMRobertson added P3 (OBSOLETE: use S- labels.) Approved backlog: not yet scheduled, will accept patches Z-Help-Wanted We know exactly how to fix this issue, and would be grateful for any contribution and removed z-p2 (Deprecated Label) labels Feb 2, 2022
@richvdh richvdh mentioned this issue Feb 4, 2022
Merged
This was referenced Feb 15, 2022
Closed
Merged
babolivier added a commit that referenced this issue Feb 16, 2022
@babolivier
Limit concurrent AS joins (#11996)
130fd45 
Initially introduced in matrix-org-hotfixes by e5537cf (and tweaked by later commits).

Fixes #11995

See also #4826
DMRobertson pushed a commit that referenced this issue Aug 23, 2022
Remove the hotfix-specific hack for auth on room_members
7ba0336 
This reverts fae708c.

We believe this to be unnecessary---other Synapse deployments do not
have this patch, and we are not aware of bridging problems as a result.

Related:

- matrix-org/matrix-appservice-irc#506
- #4826
@DMRobertson DMRobertson mentioned this issue Aug 23, 2022
Merged
DMRobertson pushed a commit that referenced this issue Feb 10, 2023
Apply logging from hotfixes branch to develop
6d9779c 
Part of #4826.

Originally added in #11882.
@DMRobertson DMRobertson mentioned this issue Feb 10, 2023
Merged
DMRobertson pushed a commit that referenced this issue Feb 13, 2023
Apply logging from hotfixes branch to develop (#15054)
c10e131 
* Apply logging from hotfixes branch to develop

Part of #4826.

Originally added in #11882.

* Changelog
@H-Shay H-Shay added O-Occasional Affects or can be seen by some users regularly or most users rarely S-Minor Blocks non-critical functionality, workarounds exist. and removed P3 (OBSOLETE: use S- labels.) Approved backlog: not yet scheduled, will accept patches labels Mar 22, 2023
@matrixbot matrixbot mentioned this issue Dec 21, 2023
Open
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
O-Occasional Affects or can be seen by some users regularly or most users rarely S-Minor Blocks non-critical functionality, workarounds exist. T-Task Refactoring, removal, replacement, enabling or disabling functionality, other engineering tasks. Z-Help-Wanted We know exactly how to fix this issue, and would be grateful for any contribution
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
5 participants
@neilisfragile @erikjohnston @DMRobertson @H-Shay @ShadowJonathan