Skip to content

feat(frontend): server locks - #7789

Merged
mergify[bot] merged 43 commits into
mainfrom
sychic/server-locks
Oct 6, 2026
Merged

mergify[bot] merged 43 commits into
mainfrom
sychic/server-locks

Conversation

@Sychic

@Sychic Sychic commented Oct 2, 2026

Copy link
Copy Markdown
Member

No description provided.

@Sychic
Sychic requested a review from IMB11 October 2, 2026 14:38
@Sychic
Sychic added this pull request to stack #7756 October 2, 2026 14:38
@github-actions

github-actions Bot commented Oct 2, 2026 •

Copy link
Copy Markdown
Contributor

Note

This changelog has been merged into the changelog for #7762

Pull request changelog

App

Added

Changed

Deprecated

Removed

Fixed

Security

Website

Added

Changed

Deprecated

Removed

Fixed

Security

Hosting

Added

Changed

Deprecated

Removed

Fixed

Security

@Sychic

Sychic commented Oct 2, 2026

Copy link
Copy Markdown
Member Author

@Mergifyio rebase

@mergify

mergify Bot commented Oct 2, 2026

Copy link
Copy Markdown

rebase

☑️ Nothing to do, the required conditions are not met

Details
  • any of:
    • #commits-behind > 0 [📌 rebase requirement]
    • -linear-history [📌 rebase requirement]
  • -closed [📌 rebase requirement]
  • -conflict [📌 rebase requirement]
  • queue-position = -1 [📌 rebase requirement]

@github-actions

github-actions Bot commented Oct 2, 2026 •

Copy link
Copy Markdown
Contributor

@mergify

mergify Bot commented Oct 2, 2026 •

Copy link
Copy Markdown

Queued — the merge queue status continues in this comment ↓.

Base automatically changed from sychic/pass-2fa-reset to main October 2, 2026 18:18
@Sychic

Sychic commented Oct 2, 2026

Copy link
Copy Markdown
Member Author

@Mergifyio rebase

@mergify

mergify Bot commented Oct 2, 2026

Copy link
Copy Markdown

rebase

☑️ Nothing to do, the required conditions are not met

Details
  • -conflict [📌 rebase requirement]
  • -closed [📌 rebase requirement]
  • queue-position = -1 [📌 rebase requirement]
  • any of:
    • #commits-behind > 0 [📌 rebase requirement]
    • -linear-history [📌 rebase requirement]

# Conflicts:
#	packages/ui/src/layouts/shared/user-profile/components/lock-user-modal.vue
@mergify

mergify Bot commented Oct 6, 2026 •

Copy link
Copy Markdown

Merge Queue Status

This pull request spent 57 minutes 26 seconds in the queue, including 34 minutes 34 seconds running CI.

Required conditions to merge

@mergify mergify Bot added the queued label Oct 6, 2026
@mergify
mergify Bot merged commit 44c8081 into main Oct 6, 2026
15 checks passed
@mergify
mergify Bot deleted the sychic/server-locks branch October 6, 2026 16:23
@mergify mergify Bot removed the queued label Oct 6, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants