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

Enable support for room version 3#4515

Merged
erikjohnston merged 3 commits into
developfrom
erikj/room_version_v3
Jan 29, 2019
Merged

Enable support for room version 3#4515
erikjohnston merged 3 commits into
developfrom
erikj/room_version_v3

Conversation

@erikjohnston
Copy link
Copy Markdown
Member

Based on #4499, #4514 and #4483

@erikjohnston erikjohnston force-pushed the erikj/room_version_v3 branch from 126ab94 to 18723db Compare January 29, 2019 18:23
@erikjohnston erikjohnston requested a review from a team January 29, 2019 18:25
@codecov-io
Copy link
Copy Markdown

codecov-io commented Jan 29, 2019

Codecov Report

Merging #4515 into develop will increase coverage by 0.02%.
The diff coverage is 50%.

@@             Coverage Diff             @@
##           develop    #4515      +/-   ##
===========================================
+ Coverage    74.69%   74.72%   +0.02%     
===========================================
  Files          336      336              
  Lines        34288    34293       +5     
  Branches      5590     5592       +2     
===========================================
+ Hits         25611    25625      +14     
+ Misses        7092     7080      -12     
- Partials      1585     1588       +3

@erikjohnston erikjohnston force-pushed the erikj/room_version_v3 branch from c82ef4b to ebcffbc Compare January 29, 2019 23:09
Copy link
Copy Markdown
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

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

lgtm otherwise

Comment thread synapse/federation/federation_base.py Outdated
# checks. Only do this if the room version has a concept of event ID domain
if room_version in KNOWN_ROOM_VERSIONS:
if room_version in (
RoomVersions.V1, RoomVersions.V2, RoomVersions.VDH_TEST,
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

no vdh here

@erikjohnston erikjohnston merged commit 47d03a7 into develop Jan 29, 2019
@erikjohnston erikjohnston deleted the erikj/room_version_v3 branch March 5, 2019 13:52
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