Skip to content

fix: Misc fixes (backport #4985) #5009

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
Open
mergify wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix: Misc fixes (backport #4985) #5009

mergify wants to merge 4 commits into from
+20 −6

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 9, 2026

This is an automatic backport of pull request #4985 done by [Mergify](https://mergify.com).

phot0n added 4 commits February 9, 2026 05:33
@phot0n @mergify
chore(proxy-failover): reduce scheduled time for the failover banner …
7dfe6a8 
…(and remove title as well)

(cherry picked from commit 53b101d)
@phot0n @mergify
chore(proxy-failover): use lower batchsize for updating dns records
1b8bba3 
* also only forward undelivered agent jobs from last 2 days to secondary

(cherry picked from commit 0ff3322)
@phot0n @mergify
chore(proxy-server): fetch public ip from vm when creating proxy server
510c2f4 
(cherry picked from commit ffdbb2a)
@phot0n @mergify
fix(dashboard): pass hide action to downloadbackup to handle async cases
4945231 
(cherry picked from commit 1aa1bfc)

# Conflicts:
#	dashboard/src/objects/site.js
@mergify mergify bot added the conflicts label Feb 9, 2026
@mergify mergify bot requested review from adityahase and regdocs as code owners February 9, 2026 05:33
@mergify
Copy link
Contributor Author

mergify bot commented Feb 9, 2026

Cherry-pick of 1aa1bfc has failed:

On branch mergify/bp/master/pr-4985
Your branch is ahead of 'origin/master' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 1aa1bfc3a.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   dashboard/src/objects/site.js

no changes added to commit (use "git add" and/or "git commit -a")

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

@mergify mergify bot assigned phot0n Feb 9, 2026
@mergify mergify bot added the conflicts label Feb 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@regdocs regdocs Awaiting requested review from regdocs regdocs is a code owner

@adityahase adityahase Awaiting requested review from adityahase adityahase is a code owner

Assignees

@phot0n phot0n

Labels

conflicts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@phot0n