Commit Graph

3226 Commits

Author SHA1 Message Date
Kiril Videlov
579807687c feat: add IconFilter component and its SVG markup 2023-10-28 19:24:03 +02:00
Kiril Videlov
3eba2c9bdb feat: add caching mechanism for pull requests list to improve performance and handle offline scenarios 2023-10-27 17:52:15 +03:00
Kiril Videlov
b0374e2f7a chore: remove duplicate RemoteBranches component 2023-10-25 22:24:38 +02:00
Kiril Videlov
8b5b37102e feat: add support for displaying and interacting with pull requests in the branch peek component 2023-10-25 22:24:38 +02:00
Nikita Galaiko
5f1a6a1d28
Merge pull request #1455 from gitbutlerapp/get-commits-not-on-target-1
Get commits not on target 1
2023-10-24 16:15:47 +02:00
Nikita Galaiko
2d64d29c47 refactor: avoid mutation 2023-10-24 14:51:24 +02:00
Nikita Galaiko
304ee291aa
Merge pull request #1454 from gitbutlerapp/add-merge-function-and-integrated-commits-test
fix integrated commit detection
2023-10-24 14:18:03 +02:00
Nikita Galaiko
f66c1e4db7 cranky fixes 2023-10-24 14:10:06 +02:00
Nikita Galaiko
687d73897a cargo fmt 2023-10-24 13:57:43 +02:00
Nikita Galaiko
52757a4ad5 better imitate a real remote merge 2023-10-24 13:57:22 +02:00
Nikita Galaiko
c0c8ac8133 fix integrated commit detection 2023-10-24 13:49:06 +02:00
Nikita Galaiko
5f4232adc0
Merge pull request #1453 from gitbutlerapp/fix-deduplication
when choosing new remote branch name, ignore case
2023-10-24 12:53:23 +02:00
Nikita Galaiko
7c56f41ab1 when choosing upstream branch name, ignore case 2023-10-24 12:46:59 +02:00
Nikita Galaiko
48b16b8881
Merge pull request #1443 from gitbutlerapp/add-cherry-pick-method
feat: cherry pick onto virtual branch
2023-10-24 08:45:46 +02:00
Nikita Galaiko
04007e5e87 expose cherry pick api 2023-10-23 15:57:44 +02:00
Nikita Galaiko
552fe0c5cd cherry-pick onto virtual branch 2023-10-23 15:51:31 +02:00
Nikita Galaiko
c3f63b5b3a
Merge pull request #1444 from gitbutlerapp/proxy-virtual-branch-with-upstream
🔨 chore: add support for proxying upstream branch in `proxy_virtual_b…
2023-10-23 15:29:04 +02:00
Nikita Galaiko
40d24641db 🔨 chore: add support for proxying upstream branch in proxy_virtual_branch method 2023-10-23 15:22:32 +02:00
extrawurst
0dadd38809
GB-623: make sure integration is up to date after flushing all vbranches (#1442)
make sure the integration update happens after flushing the vbranch trees
2023-10-23 13:18:37 +00:00
extrawurst
1925a06ce0
run cranky locally in nightly + clippy fixes (#1441)
* cleanup one `partial_pub_fields` lint
* run cranky locally in nightly too to align CI lints
2023-10-23 10:45:25 +00:00
Nikita Galaiko
e54f29b0f2
Merge pull request #1440 from gitbutlerapp/validation-code
add validation error code
2023-10-23 11:35:40 +02:00
Nikita Galaiko
3aa76e0ea9 adjust cranky 2023-10-23 11:18:17 +02:00
Nikita Galaiko
2addf81189 fix cranky 2023-10-23 10:05:20 +02:00
Nikita Galaiko
3d14551ed2 add validation error code 2023-10-23 09:37:54 +02:00
Nikita Galaiko
665254f98a
Merge pull request #1439 from gitbutlerapp/implement-indexing-functionality
bring back index handler
2023-10-20 15:10:50 +02:00
Nikita Galaiko
638620337e open less repos when reindexing 2023-10-20 15:01:43 +02:00
Nikita Galaiko
2b68cd23ce bring back index handler 2023-10-20 14:52:29 +02:00
Nikita Galaiko
8d0b58c0fa
Merge pull request #1438 from gitbutlerapp/virtual-branch
log app name on start
2023-10-20 14:31:53 +02:00
Nikita Galaiko
7d2dbb1b8a log app name on start 2023-10-20 14:24:40 +02:00
Nikita Galaiko
d76d63b8ff
Merge pull request #1434 from gitbutlerapp/remove-search-function
Remove search function
2023-10-20 13:45:38 +02:00
Nikita Galaiko
b04d3b168c update lock file 2023-10-20 13:39:00 +02:00
Nikita Galaiko
6ee208c611 rm tantivy dependency 2023-10-20 13:34:33 +02:00
Nikita Galaiko
601a6a34fe
Merge pull request #1436 from gitbutlerapp/fix-github-actions-permissions
🔨 chore: update GitHub Actions workflow permissions and add custom to…
2023-10-20 13:32:34 +02:00
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