8000 fix: set same cookie expiry on client side (backport #24560) by mergify[bot] · Pull Request #24567 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: set same cookie expiry on client side (backport #24560) #24567

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 2 commits into from
Feb 19, 2024
Merged

fix: set same cookie expiry on client side (backport #24560) #24567

merged 2 commits into from
Feb 19, 2024

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Jan 29, 2024

This is an automatic backport of pull request #24560 done by Mergify.
Cherry-pick of 70a6a83 has failed:

On branch mergify/bp/version-14-hotfix/pr-24560
Your branch is up to date with 'origin/version-14-hotfix'.

You are currently cherry-picking commit 70a6a8334f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frappe/tests/test_auth.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/auth.py
	both modified:   frappe/sessions.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@ankush @mergify
fix: set same cookie expiry as client side (#24560)
a243c8c 
(cherry picked from commit 70a6a83)

# Conflicts:
#	frappe/auth.py
#	frappe/sessions.py
@mergify mergify bot requested a review from a team January 29, 2024 05:53
@mergify mergify bot added the conflicts label Jan 29, 2024
@mergify mergify bot requested review from ankush and removed request for a team January 29, 2024 05:53
@mergify mergify bot assigned ankush Jan 29, 2024
@ankush ankush closed this Jan 29, 2024
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-24560 branch January 29, 2024 06:01
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 13, 2024
@ankush ankush restored the mergify/bp/version-14-hotfix/pr-24560 branch February 19, 2024 12:57
@ankush ankush reopened this Feb 19, 2024
@ankush ankush enabled auto-merge (squash) February 19, 2024 13:04
@ankush ankush force-pushed the mergify/bp/version-14-hotfix/pr-24560 branch from fc2901c to d7450ad Compare February 19, 2024 13:28
@ankush ankush merged commit 744b363 into version-14-hotfix Feb 19, 2024
@ankush ankush deleted the mergify/bp/version-14-hotfix/pr-24560 branch February 19, 2024 13:44
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.66.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ankush ankush Awaiting requested review from ankush

Assignees

@ankush ankush

Labels
conflicts released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@frappe-pr-bot @ankush
0