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

Upstream merge 2024-10-16 #233

Merged
merged 279 commits into from
Oct 17, 2024
Merged

Conversation

leonardehrenfried
Copy link

@leonardehrenfried leonardehrenfried commented Oct 16, 2024

This is massive change that not only touches all files in the repo but also brings the following improvements and fixes:

@miles-grant-ibigroup I've updated the S3 upload a tiny bit: 2516f5f

Can you check that this is what you want?

Closes #223

t2gran and others added 30 commits September 22, 2024 20:03
This extract logic to merge a hierarchy of objects containing composites, flatten
the structure into one list of elements. There is a small performance optimization,
but the important thing is that we will use this later in the design later.
Parameters for via locations with wait-time and allowAsPassThroughPoint flag are added.
vpaturet and others added 23 commits October 14, 2024 10:39
…tops-fixup

Improve logic for transfers in consolidated stops
…/guava-monorepo

Update dependency com.google.guava:guava to v33.3.1-jre
…/jersey-monorepo

Update jersey monorepo to v3.1.9
…/graphqlcodegenerator-monorepo

Update dependency @graphql-codegen/cli to v5.0.3
…ty_timetables

Fix duplicated dirty timetables
Copy link

@miles-grant-ibigroup miles-grant-ibigroup left a comment

Choose a reason for hiding this comment

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

All working! Thanks for this difficult merge. This is almost crashing my browser

@miles-grant-ibigroup miles-grant-ibigroup merged commit 31d69cb into ibi-dev-2.x Oct 17, 2024
16 checks passed
@miles-grant-ibigroup miles-grant-ibigroup deleted the upstream-merge-2024-10-16 branch October 17, 2024 12:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants