Skip to content

refactor: Remove deprecation related to cookies #9406

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
Merged
merged 7 commits into from
Jan 14, 2025
Merged

refactor: Remove deprecation related to cookies #9406

merged 7 commits into from
Jan 14, 2025

Conversation

@neznaika0
Copy link
Contributor

@neznaika0 neznaika0 commented Jan 12, 2025 •
edited
Loading

Description
See #5429 v4.1.6
See #6413 v4.2.6
I looked for dependencies, everything seems to be in order.

Checklist:

  • Securely signed commits
  • Component(s) with PHPDoc blocks, only if necessary or adds value
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

michalsn
michalsn reviewed Jan 12, 2025
View reviewed changes
@michalsn michalsn added refactor Pull requests that refactor code 4.6 labels Jan 12, 2025
@neznaika0 neznaika0 force-pushed the refactor/rm-deprecated-deps-cookie branch from 0c67540 to b51f6c9 Compare January 12, 2025 21:23
@paulbalandan paulbalandan added the stale Pull requests with conflicts label Jan 13, 2025
@neznaika0 neznaika0 force-pushed the refactor/rm-deprecated-deps-cookie branch from b51f6c9 to 6fc99ea Compare January 13, 2025 04:39
@paulbalandan paulbalandan removed the stale Pull requests with conflicts label Jan 13, 2025
@github-actions github-actions bot added the stale Pull requests with conflicts label Jan 13, 2025
@github-actions
Copy link

👋 Hi, @neznaika0!

We detected conflicts in your PR against the base branch 🙊
You may want to sync 🔄 your branch with upstream!

Ref: Syncing Your Branch

@neznaika0
Copy link
Contributor Author

Thank you for your patience. But what is the best way to update multiple PR with conflicts? Which will be the first accepted to update the second, the third..?

@paulbalandan
Copy link
Member

Thank you for your patience. But what is the best way to update multiple PR with conflicts? Which will be the first accepted to update the second, the third..?

For PRs that touch code in system, they are generally ready to merge when they have at least 2 approving reviews.

@neznaika0
Copy link
Contributor Author

neznaika0 commented Jan 13, 2025 •
edited
Loading

I understand it's about the latest commits. Should I update all PR after accepting the first one, or wait for the rebase message? While the "stale" is hanging, you may not accept PR.

@paulbalandan
Copy link
Member

As this PR has 1 review while the other has 2 reviews, you can rebase the other now. After that is merged, you can rebase this for a review.

@paulbalandan
Copy link
Member

@neznaika0 pls rebase this again. thanks

@neznaika0 neznaika0 force-pushed the refactor/rm-deprecated-deps-cookie branch from 6fc99ea to b87710c Compare January 14, 2025 05:12
@paulbalandan paulbalandan removed the stale Pull requests with conflicts label Jan 14, 2025
@paulbalandan paulbalandan merged commit 17d6ade into codeigniter4:4.6 Jan 14, 2025
50 checks passed
@neznaika0 neznaika0 deleted the refactor/rm-deprecated-deps-cookie branch January 14, 2025 06:55
@paulbalandan paulbalandan mentioned this pull request Jan 19, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@michalsn michalsn michalsn approved these changes

@paulbalandan paulbalandan paulbalandan approved these changes

Assignees

No one assigned

Labels

refactor Pull requests that refactor code

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@neznaika0 @paulbalandan @michalsn