Commit Graph

9860 Commits

Author SHA1 Message Date
Kiril Videlov
c0c6c8d13b
Merge pull request #5342 from gitbutlerapp/kv-branch-1
Test stack reorder shifting last in series to previous
2024-10-28 21:24:42 +01:00
Kiril Videlov
39f5b2e9a8 Test stack reorder shifting last in series to previous 2024-10-28 21:13:48 +01:00
Mattias Granlund
4b77cf4074 Default to experimental locking
- changing the name of the field since existing projects would have an explicit false value already
2024-10-28 21:08:59 +01:00
Kiril Videlov
6759d3e4dc
Merge pull request #5340 from gitbutlerapp/kv-branch-1
Prune integrated heads upon inegrating upstream
2024-10-28 19:06:05 +01:00
Kiril Videlov
7c61a9a236 Add test for stack pruning 2024-10-28 18:57:04 +01:00
Caleb Owens
d172bd5121
Merge pull request #5329 from gitbutlerapp/Rename-patchstacks
Rename away from patch stacks
2024-10-28 16:58:44 +00:00
Caleb Owens
f3b8ff60fe stuff 2024-10-28 16:57:08 +00:00
Kiril Videlov
dc07cd1ce3 Prune integrated heads upon inegrating upstream 2024-10-28 17:51:19 +01:00
ndom91
50ed7667b7 fix: StackingPullRequestCard reactivity 2024-10-28 17:27:03 +01:00
Kiril Videlov
d8328de56b
Merge pull request #5334 from gitbutlerapp/dependabot/github_actions/actions/cache-4
chore(deps): bump actions/cache from 3 to 4
2024-10-28 17:23:51 +01:00
Pavel Laptev
4ac22d5d5e
Update StackingSeriesHeader.svelte (#5333) 2024-10-28 17:21:33 +01:00
Kiril Videlov
4e84977516 Stack - handle the case where one of the stack heads can't be found
Handled by skipping in this case. What would be better is to not reach this state by updating the stack upon "update workspace"
2024-10-28 17:03:45 +01:00
Mattias Granlund
52d0dba39f Code cleanup for hunk dependency crate
- reformat comments
- fewer derives
- tighter types
2024-10-28 16:58:57 +01:00
Kiril Videlov
9e5496e3da
Merge pull request #5335 from gitbutlerapp/kv-branch-1
Fix - prevent pushing of already integrated branches when in a stack
2024-10-28 16:39:23 +01:00
dependabot[bot]
a255340a7b
chore(deps): bump actions/cache from 3 to 4
Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-10-28 15:27:44 +00:00
Kiril Videlov
3d4f1657d1 Fix - prevent pushing of already integrated branches when in a stack 2024-10-28 16:10:28 +01:00
Esteban Vega
3b8a96ca47
Merge pull request #5330 from gitbutlerapp/e-branch-2
fix: Modal closes on mouse down outside
2024-10-28 14:52:03 +01:00
estib
42270f1c9f fix: Modal closes on mouse down outside
Avoid closing the modals when releasing the mouse outside the modal.
Only close them on clicking down outside the modal
2024-10-28 14:44:50 +01:00
Pavel Laptev
7a03e89d28 fix typo 2024-10-28 13:34:17 +01:00
Pavel Laptev
60ccac2b63 reloadPR added 2024-10-28 13:34:17 +01:00
Pavel Laptev
f58a29fa1c added context menu to the whole hard 2024-10-28 13:34:17 +01:00
ndom91
655db0ffee fix: close contextMenus upon selection 2024-10-28 13:34:17 +01:00
ndom91
ffce14296a feat: add contextMenu to checks and pr btns in StackingPullRequestCard 2024-10-28 13:34:17 +01:00
Kiril Videlov
97c344404f
Merge pull request #5316 from gitbutlerapp/fix-dashed-lines
Fix dashed lines
2024-10-28 13:25:52 +01:00
Caleb Owens
41e8cc8ed3 Rename away from patch stacks 2024-10-28 11:47:32 +00:00
ndom91
b612b8ec82 fix: flake dev env environment variables 2024-10-28 12:12:00 +01:00
Esteban Vega
183a026703
Merge pull request #5326 from gitbutlerapp/fix-prompt-modal
fix: Mitigate Prompt modal race condition
2024-10-28 11:37:53 +01:00
Esteban Vega
40d6c2ddd9
Merge pull request #5325 from gitbutlerapp/modal-improvements
Modal: Close is a promise + onClickOutside
2024-10-28 11:37:08 +01:00
Esteban Vega
b077194502
Merge pull request #5327 from gitbutlerapp/e-branch-2
fix: Downgrade turbo to 2.1.1
2024-10-28 11:35:57 +01:00
estib
ccb7d82449 fix: Downgrade turbo to 2.1.1
This fixes the dev server disconnecting issue
2024-10-28 11:25:14 +01:00
estib
4f672d111a fix: Mitigate Prompt modal race condition
Add some checks and await the handling of git prompts.
2024-10-28 10:35:33 +01:00
estib
7b0e447a98 Modal: Close is a promise + onClickOutside
Make the modal closing function a promise as it's done asynchronously.
Add another optional callback that's called only in the case when clicking outside the modal.
2024-10-28 10:21:32 +01:00
Kiril Videlov
a4a41c69d4
Merge pull request #5324 from gitbutlerapp/kv-branch-1
reorder_stack: fix reordering between series
2024-10-27 22:58:06 +01:00
Kiril Videlov
94e205d6b9 reordering - handle empty series correctlly 2024-10-27 22:50:35 +01:00
Kiril Videlov
38c0453eed warn on unsafe index access in the stack crate 2024-10-27 22:27:55 +01:00
Kiril Videlov
b639859a65 fix reordering of series heads 2024-10-27 22:17:50 +01:00
ndom91
04d2fdd26c fix: playwright on nix 2024-10-27 10:54:10 +01:00
Kiril Videlov
a9c600e1a5
Merge pull request #5240 from gitbutlerapp/implement-reorder-stack
Implement stack commit reordering
2024-10-26 22:10:26 +02:00
ndom91
492a556f94 fix: include playwright.config.ts in app/web tsconfig 2024-10-26 17:24:23 +02:00
ndom91
f5f59c7a21 feat: add playwright browser caching to gha 2024-10-26 17:24:23 +02:00
ndom91
865a085096 feat: add playwright GHA 2024-10-26 17:24:23 +02:00
ndom91
e3ab1f092d feat: add playwright/test to apps/web 2024-10-26 17:24:23 +02:00
ndom91
d2e2d281a7 fix: rm unuesd playwright from packages/shared 2024-10-26 17:24:23 +02:00
Kiril Videlov
52929459e4 fix reordering series heads 2024-10-26 17:21:09 +02:00
ndom91
34cb68e52c fix: add timeAgo tests 2024-10-26 16:54:01 +02:00
ndom91
fe10b21602 fix: replace momet with dayjs 2024-10-26 16:54:01 +02:00
ndom91
e681aedc36 fix: renable type-aware linting rules 2024-10-26 16:53:26 +02:00
Kiril Videlov
c24888e16c fix test script 2024-10-26 15:11:35 +02:00
Kiril Videlov
a3933bae68 more tests 2024-10-26 14:53:30 +02:00
Kiril Videlov
6ba560aa6b make reorder tests a bit more succinct 2024-10-26 13:33:58 +02:00