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.

Sign up for GitHub

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

Jump to bottom

Move to one bundle #7151

Merged
merged 38 commits into from
Jan 25, 2024
Merged

Move to one bundle #7151

merged 38 commits into from
Jan 25, 2024

Conversation

yguedidi
Copy link
Contributor

@yguedidi yguedidi commented Jan 1, 2024 •
edited

A prerequisite work to the move to Flex.

@yguedidi yguedidi added this to the 2.8.0 milestone Jan 1, 2024
@yguedidi yguedidi force-pushed the one-bundle branch 2 times, most recently from b027d22 to a887189 Compare January 20, 2024 23:31
j0k3r
j0k3r reviewed Jan 22, 2024
View reviewed changes
Copy link
Member

@j0k3r j0k3r left a comment

Choose a reason for hiding this comment

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

Why can't this be merged in 2.7?

@yguedidi
Copy link
Contributor Author

Why can't this be merged in 2.7?

it could if we want! I'd be completely fine with that!
as we said the move to #7115 will be for 2.8 I thought this is similar.

@j0k3r
Copy link
Member

j0k3r commented Jan 22, 2024

Moving to one bundle is more safe from my POV than the Flex structure :)

@yguedidi yguedidi modified the milestones: 2.8.0, 2.7.0 Jan 22, 2024
@yguedidi
Copy link
Contributor Author

@j0k3r fine by me then! will rebase and fix tests this morning, I think I found what makes tests fail while working on #7196 , I'll include the hotfix here, except if you prefer that I open a dedicated PR

@yguedidi yguedidi force-pushed the one-bundle branch 2 times, most recently from 220c8cc to 2b5d940 Compare January 22, 2024 09:43
@yguedidi yguedidi marked this pull request as ready for review January 22, 2024 09:56
@yguedidi yguedidi marked this pull request as draft January 22, 2024 16:28
@yguedidi
Copy link
Contributor Author

@j0k3r @nicosomb @Kdecherf I think it's better to have the upgrade to Symfony 5 merged first and then rebase this one on top of it, hoping that there will be almost no conflict to resolve manually as this PR is the one owning the renaming :)

@yguedidi
Copy link
Contributor Author

@j0k3r @nicosomb @Kdecherf rebased on top of #7137 already so that it's ready to merge after the merge of the upgrade 🙂

@yguedidi yguedidi mentioned this pull request Jan 25, 2024
Merged
4 tasks
@yguedidi yguedidi requested review from j0k3r, nicosomb and Kdecherf and removed request for j0k3r, nicosomb and Kdecherf January 25, 2024 19:45
@yguedidi yguedidi marked this pull request as ready for review January 25, 2024 19:45
@yguedidi yguedidi requested a review from j0k3r January 25, 2024 20:02
@yguedidi yguedidi merged commit 2fd1f23 into wallabag:master Jan 25, 2024
21 checks passed
@yguedidi yguedidi deleted the one-bundle branch January 25, 2024 20:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@j0k3r j0k3r j0k3r approved these changes

@Kdecherf Kdecherf Kdecherf approved these changes

@nicosomb nicosomb Awaiting requested review from nicosomb

Assignees
No one assigned
Labels
Ready for review
Projects
None yet
Milestone
2.7.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@yguedidi @j0k3r @Kdecherf