3213 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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