github-starred/actual
2
0
Fork 0
mirror of https://github.com/actualbudget/actual.git synced 2026-05-06 15:12:35 -05:00
Code Issues 1.5k Packages Projects Releases 54 Wiki Activity

[PR #4160] [MERGED] 👷 Prep work for merging actual-server into actual repo #35418

New Issue
Closed
opened 2026-04-20 22:25:12 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-20 22:25:12 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/actualbudget/actual/pull/4160
Author: @MikesGlitch
Created: 1/15/2025
Status: ✅ Merged
Merged: 1/16/2025
Merged by: @MikesGlitch

Base: master ← Head: prep-for-merging-server-repo

📝 Commits (2)

  • 83f6c9a prep work for merging actual-server into actual repo
  • 7e5a770 release notes

📊 Changes

5 files changed (+15 additions, -6 deletions)

View changed files

📝 .yarnrc.yml (+2 -0)
📝 eslint.config.mjs (+1 -0)
📝 packages/loot-core/package.json (+2 -2)
➕ upcoming-release-notes/4160.md (+6 -0)
📝 yarn.lock (+4 -4)

📄 Description

Laying some groundwork to make merging the repo's a bit easier. These actions came out of this POC: https://github.com/actualbudget/actual/pull/4139

  • Ignore sync-server folder during lint - sync-server doesn't currently follow the linting rules
  • Turning off enableTransparentWorkspaces to allow us to use the npm packages instead of the workspace package.
    • This allows us to use the npm packages for crdt instead of being forced to build it directly in the workspace
    • If we wish to use the workspace package we have to explicitly set workspace:* in package.json

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/actualbudget/actual/pull/4160 **Author:** [@MikesGlitch](https://github.com/MikesGlitch) **Created:** 1/15/2025 **Status:** ✅ Merged **Merged:** 1/16/2025 **Merged by:** [@MikesGlitch](https://github.com/MikesGlitch) **Base:** `master` ← **Head:** `prep-for-merging-server-repo` --- ### 📝 Commits (2) - [`83f6c9a`](https://github.com/actualbudget/actual/commit/83f6c9ad61a0e3e864d7bb43f1832eefbe950de7) prep work for merging actual-server into actual repo - [`7e5a770`](https://github.com/actualbudget/actual/commit/7e5a770d86e2f004667a77deeca108a7531fda9d) release notes ### 📊 Changes **5 files changed** (+15 additions, -6 deletions) <details> <summary>View changed files</summary> 📝 `.yarnrc.yml` (+2 -0) 📝 `eslint.config.mjs` (+1 -0) 📝 `packages/loot-core/package.json` (+2 -2) ➕ `upcoming-release-notes/4160.md` (+6 -0) 📝 `yarn.lock` (+4 -4) </details> ### 📄 Description <!-- Thank you for submitting a pull request! Make sure to follow the instructions to write release notes for your PR — it should only take a minute or two: https://github.com/actualbudget/docs#writing-good-release-notes --> Laying some groundwork to make merging the repo's a bit easier. These actions came out of this POC: https://github.com/actualbudget/actual/pull/4139 - Ignore sync-server folder during lint - sync-server doesn't currently follow the linting rules - Turning off enableTransparentWorkspaces to allow us to use the npm packages instead of the workspace package. - This allows us to use the npm packages for crdt instead of being forced to build it directly in the workspace - If we wish to use the workspace package we have to explicitly set ```workspace:*``` in package.json --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-20 22:25:12 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
AI generated
API
bank sync
budgeting
bug
can’t replicate
dependencies
docker
documentation
electron
experimental feature
feature
feedback
goal templates
good first issue
help wanted
importers
maintenance
needs info
needs testing
needs triage
needs votes
openid
payees
pull-request
Mirrored from GitHub Pull Request
 regression
reports
responsive
rules
schedules
server
✨ merged
split transactions
tech debt
theme
transaction import
transaction reconciliation
transactions
translations
upstream
user interface
✅ approved
wontfix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/actual#35418
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?