Nikita Galaiko
|
c4a04cf5d5
|
🔨 chore: update GitHub Actions workflow permissions and add custom token for pushing tags
|
2023-10-20 13:32:11 +02:00 |
|
Nikita Galaiko
|
8a568e5737
|
cargo fmt
|
2023-10-20 13:18:56 +02:00 |
|
Nikita Galaiko
|
56bb58767e
|
merged upstream
|
2023-10-20 13:18:10 +02:00 |
|
Nikita Galaiko
|
bcb5472660
|
Merge pull request #1435 from gitbutlerapp/add-permissions-for-tag-manipulation
🔨 chore: update permissions for tag manipulation in publish-tauri job
|
2023-10-20 13:16:39 +02:00 |
|
Nikita Galaiko
|
9277f4a8de
|
🔨 chore: update permissions for tag manipulation in publish-tauri job
|
2023-10-20 13:16:13 +02:00 |
|
Nikita Galaiko
|
519a7e7a25
|
rm search from rust
|
2023-10-20 13:11:48 +02:00 |
|
Nikita Galaiko
|
01180178fb
|
rm search from ui
|
2023-10-20 13:07:18 +02:00 |
|
Nikita Galaiko
|
103d120add
|
Merge pull request #1433 from gitbutlerapp/virtual-branch
🔨 chore: add write permission to contents in GitHub Actions workflow
|
2023-10-20 13:05:43 +02:00 |
|
Nikita Galaiko
|
866a9652b7
|
🔨 chore: add write permission to contents in GitHub Actions workflow
|
2023-10-20 13:05:17 +02:00 |
|
Nikita Galaiko
|
59165a7c0c
|
Merge pull request #1432 from gitbutlerapp/virtual-branch
🔨 chore: update tag creation process to handle existing tags gracefully
|
2023-10-20 12:49:41 +02:00 |
|
Nikita Galaiko
|
6c2c860f2d
|
🔨 chore: update tag creation process to handle existing tags gracefully
|
2023-10-20 12:49:18 +02:00 |
|
Nikita Galaiko
|
74a4ee6740
|
Merge pull request #1431 from gitbutlerapp/add-release-tagging
chore: update release workflow to include tagging of releases
|
2023-10-20 11:10:26 +02:00 |
|
Nikita Galaiko
|
3868de6c18
|
fix: update TAG_NAME format in release job
|
2023-10-20 11:10:02 +02:00 |
|
Nikita Galaiko
|
dfab6e1263
|
chore: update release workflow to include tagging of releases
- Added a step to tag the release with the format "channel::version"
- If the tag already exists, it is deleted and then recreated
|
2023-10-20 11:09:15 +02:00 |
|
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 |
|