Kiril Videlov
5bfb3395a0
Merge pull request #3714 from gitbutlerapp/fix-race-condition-issue
...
fixes a possible condition where if integration commit is not found a…
2024-05-07 00:16:50 +02:00
Kiril Videlov
80346af154
fixes a possible condition where if integration commit is not found a lot of integreated commits are added to a vbranch
2024-05-07 00:02:22 +02:00
Kiril Videlov
1c7ce2cfe0
Merge pull request #3712 from gitbutlerapp/update-gitbutler-watcher
...
fix ci: add missing job for watcher
2024-05-06 21:29:23 +02:00
Kiril Videlov
893439976c
Merge pull request #3705 from gitbutlerapp/blame-hunk-applied-status-fix
...
dont panic on commit not found in commit_to_branch
2024-05-06 21:25:10 +02:00
Kiril Videlov
cc642c4ea6
Merge pull request #3710 from gitbutlerapp/Don-t-parse-and-re-parse-branch_id
...
Don't reparse branch_id
2024-05-06 21:22:53 +02:00
Kiril Videlov
d7eccf78e2
fix ci: add missing job for watcher
2024-05-06 21:15:56 +02:00
Kiril Videlov
9fc3b97a6f
Merge pull request #3706 from gitbutlerapp/Add-cmd-R-page-reloads
...
Add cmd+R to reload the page
2024-05-06 21:11:16 +02:00
Caleb Owens
f13e827e33
Don't reparse branch_id
...
This should make the situation where an error occurs even more absurd. It should also be saving some extra work which is always a bonus
2024-05-06 19:50:07 +01:00
Josh Junon
0b903bcaef
Merge pull request #3697 from anaisbetts/clean-up-win32-menus
...
Clean up win32 menus
2024-05-06 20:44:40 +02:00
Josh Junon
0ba06e4292
Merge pull request #3709 from gitbutlerapp/cleanups
...
A few cleanups of virtual.rs
2024-05-06 20:36:06 +02:00
Josh Junon
dce8ead62f
use simpler virtual branch handle fetch in tests (and fix strange uncaught compilation error)
2024-05-06 20:22:40 +02:00
Josh Junon
da62926a30
simplify retrieving of the vb_state handle
2024-05-06 20:08:28 +02:00
Josh Junon
85d045362a
remove useless AsRef impl
2024-05-06 20:07:47 +02:00
Josh Junon
dffca846c4
remove empty else branch
2024-05-06 20:07:42 +02:00
Josh Junon
58f866d588
simplify certain uses of as_ref() in virtual.rs
2024-05-06 20:07:39 +02:00
Josh Junon
d6baf7d8f0
simplify hunk hash diff calls
2024-05-06 20:07:34 +02:00
Josh Junon
21dd4800c3
fix typo: timestam_ms -> timestamp_ms
2024-05-06 20:04:29 +02:00
Kiril Videlov
9ca080c940
Merge pull request #3708 from gitbutlerapp/fix-spinny
...
fixes a bug where after updating the workspace the app shows infinite…
2024-05-06 18:34:38 +02:00
Kiril Videlov
98e511c459
fixes a bug where after updating the workspace the app shows infinite spinner
2024-05-06 18:20:09 +02:00
Caleb Owens
15cbe8bc01
Add cmd+R to reload the page
2024-05-06 16:57:20 +01:00
Ani Betts
1309481273
Fix lint
2024-05-06 17:42:34 +02:00
Kiril Videlov
0091bfa1eb
Merge pull request #3688 from gitbutlerapp/resolve-large-quantity-of-files-slow-start
...
Optimize list_virtual_branches
2024-05-06 16:43:30 +02:00
Scott Chacon
d79bf65e51
Merge pull request #3677 from gitbutlerapp/target-branch-selector-fix
...
initial implementation of different push target
2024-05-06 16:31:01 +02:00
Ani Betts
ec320376ff
Don't have a Window menu on Win32/Linux
...
Generally, we have a Window menu only in apps that can have multiple related windows or tabs. Since we don't have that at the moment, 🔪 the Window menu
2024-05-06 16:28:01 +02:00
Ani Betts
828a7e55b2
We don't need a separate "Close" item on non-macOS
...
Because Win32 and Linux apps generally close when their windows close, we don't need a separate "Close" vs "Quit" item on these platforms
2024-05-06 16:27:25 +02:00
Kiril Videlov
2393df2449
dont panic on commit not found in commit_to_branch
2024-05-06 16:19:12 +02:00
Kiril Videlov
a6e80d9d7f
Merge pull request #3704 from gitbutlerapp/add-workdir-snapshot-details
...
add-workdir-snapshot-details
2024-05-06 16:08:08 +02:00
Scott Chacon
4ea691a1cd
fetch from push remote too
2024-05-06 16:01:06 +02:00
ndom91
565140e832
fix: eslint ignore e2e dir for now
2024-05-06 15:50:24 +02:00
Kiril Videlov
c29440e472
remove files list trailer from snapshot
...
This info is extracted from the snapshot itself
2024-05-06 15:36:56 +02:00
Kiril Videlov
42d8e6fd5d
show extra snapshot details in ui
2024-05-06 15:34:42 +02:00
Scott Chacon
c3ac916c32
link to cross-repo unified diff on github
2024-05-06 15:30:38 +02:00
Kiril Videlov
b1bb9bf51c
snapshot listing includes stats about the snapshot
...
inclue files touched as well as lines added and removed
2024-05-06 15:26:44 +02:00
Scott Chacon
46fe51eeda
fix rust errors
2024-05-06 14:30:25 +02:00
Kiril Videlov
80a41b5ef0
Merge pull request #3701 from ndom91/ndom91/add-nix-flake
...
feat: add flake.nix for nix dev
2024-05-06 14:11:02 +02:00
Scott Chacon
ca634807b1
Merge branch 'master' into target-branch-selector-fix
2024-05-06 13:49:27 +02:00
ndom91
414e0d121e
Merge branch 'ndom91/add-playwright-test' of github.com:ndom91/gitbutler into ndom91/add-playwright-test
2024-05-06 13:49:03 +02:00
ndom91
96d62c9cb9
chore: eslint fix import order
2024-05-06 13:48:59 +02:00
Scott Chacon
344e3d3f38
small rust stuff
2024-05-06 13:44:08 +02:00
Pavel Laptev
358292dc1c
Refactor CSS and code ( #3703 )
...
- Modal trigger code refactor
- Unused CSS removed
2024-05-06 13:19:51 +02:00
Josh Junon
83dec79ef0
Merge pull request #3700 from gitbutlerapp/share-debug-info-menu
...
add help menu handler for debug info sharing and remove panic
2024-05-06 13:11:38 +02:00
Nico Domino
512b5c2b8e
Discard changes to app/src/app.html
2024-05-06 13:06:34 +02:00
ndom91
a6968438a2
chore: prettier
2024-05-06 13:06:13 +02:00
ndom91
80f517b13b
chore: cleanup app/package.json
2024-05-06 13:01:22 +02:00
ndom91
72be19a3f2
chore: cleanup fixtures
2024-05-06 12:59:41 +02:00
Josh Junon
add0a84165
add help menu handler for debug info sharing and remove panic
2024-05-06 12:58:50 +02:00
ndom91
1081ca1c6d
chore: cleanup playwright utils
2024-05-06 12:41:00 +02:00
Josh Junon
cf74b12a3c
Merge pull request #3693 from gitbutlerapp/Help-window-menu
...
"Help" window menu
2024-05-06 12:37:14 +02:00
Pavel Laptev
53d6e58850
match statement update
2024-05-06 12:24:18 +02:00
Pavel Laptev
81ff230fb7
code review fixes
2024-05-06 12:12:39 +02:00
