Nikita Galaiko
311cada1fc
Merge pull request #1429 from gitbutlerapp/proxy-author-and-commit
...
cache all gravatars
2023-10-20 10:09:28 +02:00
Nikita Galaiko
54a4bc204e
ensure gravatars are always cached
2023-10-20 09:42:23 +02:00
Nikita Galaiko
6d97aeea13
Merge pull request #1428 from gitbutlerapp/remove-upstream-commits-container
...
Remove upstream commits container
2023-10-20 09:08:37 +02:00
Nikita Galaiko
9f9d1e4149
dark mode: fix upstream commit bg
2023-10-20 09:07:14 +02:00
Nikita Galaiko
c8433a0e4c
Merge pull request #1427 from gitbutlerapp/update-branch-upstream
...
Update branch upstream
2023-10-19 15:42:45 +02:00
Nikita Galaiko
bd69016737
allow similar names
2023-10-19 15:35:33 +02:00
Nikita Galaiko
048b118569
cleanup some cranky rules
2023-10-19 15:25:27 +02:00
Nikita Galaiko
173f047f8e
merged upstream
2023-10-19 15:25:12 +02:00
Nikita Galaiko
78ed6319fa
Merge pull request #1426 from gitbutlerapp/update-branch-upstream
...
Update branch upstream
2023-10-19 15:08:44 +02:00
Nikita Galaiko
0c88552d00
fix cranky
2023-10-19 14:52:56 +02:00
Nikita Galaiko
2534b09184
merged upstream
2023-10-19 14:33:29 +02:00
Nikita Galaiko
aefc469b97
refactor: rm extra mut
2023-10-19 14:32:57 +02:00
Nikita Galaiko
3628190fcb
Merge pull request #1425 from gitbutlerapp/virtual-branch
...
fix condition for berlin runner
2023-10-19 14:31:51 +02:00
Nikita Galaiko
3331bf0831
merged upstream
2023-10-19 14:30:46 +02:00
Nikita Galaiko
b5b531aff8
fix condition for berlin runner
2023-10-19 14:30:35 +02:00
Nikita Galaiko
7e24e5b4bb
Merge pull request #1424 from gitbutlerapp/fix-push-and-merge-functions
...
Fix push and merge functions
2023-10-19 13:45:28 +02:00
Nikita Galaiko
e1fcc5546f
show force push when upstream commits present
2023-10-19 13:41:42 +02:00
Nikita Galaiko
7a3de16e0f
Merge pull request #1420 from gitbutlerapp/add-rust-tests-and-check
...
🔨 chore: update Rust test and check workflows
2023-10-19 13:09:34 +02:00
Nikita Galaiko
e50651d28f
rename step
2023-10-19 13:08:08 +02:00
Nikita Galaiko
2271aa3a21
merged upstream
2023-10-19 12:50:31 +02:00
Nikita Galaiko
1943590e7b
fixbup
2023-10-19 12:50:24 +02:00
Nikita Galaiko
6aa940281c
Merge pull request #1423 from gitbutlerapp/virtual-branch-1
...
do not cache node in berlin
2023-10-19 12:47:26 +02:00
Nikita Galaiko
5f1f5298d4
do not cache node in berlin
2023-10-19 12:46:28 +02:00
Nikita Galaiko
8a416611f0
merged upstream
2023-10-19 12:28:18 +02:00
Nikita Galaiko
cdc203d8fb
Merge pull request #1422 from gitbutlerapp/remove-disk-alternate-function
...
only add disk alternate when creating gb_repo
2023-10-19 11:34:15 +02:00
Nikita Galaiko
701937ea06
only add disk alternate when creating gb_repo
...
it will be read from disk otherwise
2023-10-19 11:29:20 +02:00
Nikita Galaiko
9aef6a437c
merged upstream
2023-10-19 11:07:44 +02:00
Nikita Galaiko
0fe5f109c3
Merge pull request #1421 from gitbutlerapp/handle-upstream-branch-not-found
...
🔨 chore: improve error handling when finding upstream branch for list…
2023-10-19 10:54:04 +02:00
Nikita Galaiko
f395c541db
🔨 chore: improve error handling when finding upstream branch for listing virtual branches
2023-10-19 10:48:57 +02:00
Nikita Galaiko
cd6acd6a47
🔨 chore: update Rust test and check workflows
2023-10-19 10:44:26 +02:00
Nikita Galaiko
ab50510e31
Merge pull request #1419 from gitbutlerapp/check-can-apply-remote-branch
...
fix local branch name serialization
2023-10-19 10:43:41 +02:00
Nikita Galaiko
cddc3e0fff
cranky
2023-10-19 10:37:09 +02:00
Nikita Galaiko
f3decc57e0
return upstream name too
2023-10-19 10:29:33 +02:00
Nikita Galaiko
df098e8d57
fix local branch name serialization
2023-10-19 10:23:58 +02:00
Nikita Galaiko
6bb05f8cc9
Merge pull request #1417 from gitbutlerapp/Add-upstream-commits-test
...
move upstream detection tests to integration
2023-10-19 10:07:41 +02:00
Nikita Galaiko
b73359fb57
Merge pull request #1418 from gitbutlerapp/Update-rust-cache-action
...
do not cache rust in berlin
2023-10-19 10:05:02 +02:00
Nikita Galaiko
e5f928cea6
do not cache rust in berlin
2023-10-19 10:03:50 +02:00
Nikita Galaiko
6044cf874d
move upstream detection tests to integration
2023-10-19 09:59:57 +02:00
Nikita Galaiko
d8a54e5c49
Merge pull request #1416 from gitbutlerapp/make-vbranch-remote-a-branch
...
Make vbranch remote a branch
2023-10-19 09:51:02 +02:00
Nikita Galaiko
5d9fe88b08
Merge pull request #1415 from gitbutlerapp/Virtual-branch
...
🔨 chore: improve error handling when writing alternates file
2023-10-19 09:48:37 +02:00
Nikita Galaiko
8cff188c6e
cranky fix!
2023-10-19 09:39:59 +02:00
Nikita Galaiko
a76ff7b988
🔨 chore: improve error handling when writing alternates file
2023-10-19 09:36:24 +02:00
Nikita Galaiko
36eea73e52
🔨 chore: update references to branch upstream and upstreamCommits in client code
...
The changes in this commit update the references to the `branch.upstream` property and `branch.upstreamCommits` array in the client code. The code now uses the `branch.upstream.name` property instead of `branch.upstream` and `branch.upstream.commits` instead of `branch.upstreamCommits`. This change ensures that the code is compatible with the updated data structure.
2023-10-19 09:30:31 +02:00
Nikita Galaiko
474cfa2249
🔨 chore: refactor branch upstream handling
2023-10-19 09:12:20 +02:00
Nikita Galaiko
45dce1ecea
extract branch to remove branch
2023-10-19 08:50:53 +02:00
Nikita Galaiko
e3d8b850b6
Merge pull request #1413 from gitbutlerapp/cargo-cranky-fix-bin-and-lib
...
fix bin/lib and use cargo cranky instead of clippy
2023-10-19 08:18:31 +02:00
extrawurst
eb5b7ea6d3
fix new tests
2023-10-18 17:26:54 +02:00
extrawurst
1cea6fb988
fix long line
2023-10-18 16:47:28 +02:00
extrawurst
36c4d104bc
fix weird long lines
2023-10-18 16:47:00 +02:00
extrawurst
bb56719d1e
fix merge conflict
2023-10-18 16:45:40 +02:00
