Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Age fallback using origin_server_ts instead of 0" #3853

Conversation

richvdh
Copy link
Member

@richvdh richvdh commented Nov 3, 2023

Reverts #3839.

This turns out to have caused test failures (element-hq/element-web#26500), and there is debate about what the correct fix is.

Fixes element-hq/element-web#26500


This change is marked as an internal change (Task), so will not be included in the changelog.

@richvdh richvdh requested review from a team as code owners November 3, 2023 13:06
@t3chguy t3chguy added the T-Task Tasks for the team like planning label Nov 3, 2023
@t3chguy t3chguy enabled auto-merge November 3, 2023 13:07
Copy link
Contributor

@toger5 toger5 left a comment

Choose a reason for hiding this comment

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

I think reverting for now makes sense.
Sorry for all the pain this caused.

Although Midhun's fix could be the better thing to merge. So we could also take the risk and see if it then works.
But we dont have to rush this one. Maybe its best unblocking everyone for sure (by reverting) and then retesting in a new pr.

@t3chguy t3chguy added this pull request to the merge queue Nov 3, 2023
Merged via the queue into develop with commit 5bc132a Nov 3, 2023
23 of 24 checks passed
@t3chguy t3chguy deleted the revert-3839-toger5/better-fallback-for-unavailabel-event-age branch November 3, 2023 14:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
T-Task Tasks for the team like planning
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Flaky jest test: TimelinePanel › with overlayTimeline › renders merged timeline
3 participants