Caleb Owens
008a411ebf
Merge pull request #4493 from gitbutlerapp/encode-branch-names
...
Encode branch names
2024-07-25 16:28:44 +02:00
Caleb Owens
3a90776657
Encode branch names
2024-07-25 16:26:58 +02:00
Caleb Owens
064fdc04e3
Merge pull request #4492 from gitbutlerapp/Dont-create-unrequired-wip-commits
...
Always overwrite local references
2024-07-25 16:25:18 +02:00
Caleb Owens
7a6c7472a4
Always overwrite local references
2024-07-25 15:49:22 +02:00
Caleb Owens
3f37df4d84
Merge pull request #4490 from gitbutlerapp/Dont-create-unrequired-wip-commits
...
Don't create unrequired wip commits
2024-07-25 15:45:02 +02:00
Caleb Owens
7aaabccd90
Merge pull request #4491 from gitbutlerapp/Match-PR-by-given-name
...
Match pull requests on their given names rather than display names
2024-07-25 15:34:59 +02:00
Caleb Owens
5a4c202b25
Match pull requests on their given names rather than display names
...
While we would ideally like to have PRs match on owner+repo+branchname, using the given name is a step forwards as the display name doesn't always accuratly map to the branchname
2024-07-25 15:33:26 +02:00
Caleb Owens
9e2f065109
Merge pull request #4489 from gitbutlerapp/Apply-from-local-branches
...
Apply from local branches
2024-07-25 15:30:59 +02:00
Caleb Owens
2f54e51a33
Don't create unrequired wip commits
2024-07-25 15:25:51 +02:00
Caleb Owens
6f4fc20f36
Added a comment
2024-07-25 15:14:37 +02:00
Caleb Owens
c1c5d88303
Specify the correct branch to be the upstream
...
asdf
2024-07-25 15:11:07 +02:00
Caleb Owens
2540642aaa
Update context spelling
2024-07-25 14:20:20 +02:00
Caleb Owens
c6badd9f3e
Update sidebar grouping of branches
2024-07-25 14:07:21 +02:00
Scott Chacon
443d8d6b71
Merge pull request #4488 from gitbutlerapp/Update-the-README
...
Add fun repobeats analytics
2024-07-25 10:43:21 +02:00
Scott Chacon
70f6f39cdb
Add fun repobeats analytics
2024-07-25 10:42:08 +02:00
Caleb Owens
9d71f007e5
Merge pull request #4486 from gitbutlerapp/remote-branch-metric
...
Added metric for whether a brnahc is remote or not
2024-07-24 19:01:20 +02:00
Caleb Owens
cdc9fa6445
Added metric for whether a brnahc is remote or not
2024-07-24 18:59:46 +02:00
Mattias Granlund
318f89462e
Fix for context menu not closing on collapse
2024-07-24 16:42:19 +02:00
Mattias Granlund
1fb87a4edb
Fix spelling mistake
...
fixes #4478
2024-07-24 11:38:26 +02:00
Nico Domino
d51138c18b
feat: bump svelte to next.196 ( #4481 )
2024-07-24 08:45:36 +00:00
Pavel Laptev
5c299c0b93
Remove console.log statement in Select.svelte. ( #4480 )
2024-07-24 00:59:22 +02:00
Sebastian Thiel
a2ccbcf19c
Merge pull request #4477 from Byron/update-gix
...
update `gix` to 0.64
2024-07-23 21:07:42 +02:00
Sebastian Thiel
1139918777
update gix to 0.64
...
It comes with various fixes and improvements, and the new APIs
that we were already depending on using the `git` dependency.
2024-07-23 20:54:45 +02:00
Kiril Videlov
8ea8b463bb
Merge pull request #4465 from gitbutlerapp/dependabot/cargo/cargo-5c0860a51f
...
Bump openssl from 0.10.64 to 0.10.66 in the cargo group
2024-07-23 17:47:59 +02:00
Mattias Granlund
369f5f1dde
Add back copy link context menu for view pr button
2024-07-23 17:07:38 +02:00
Mattias Granlund
c3a65292ae
Upgrade svelte-eslint-parser to 0.41.0
2024-07-23 17:04:51 +02:00
Pavel Laptev
eccb896c6d
Use UI package functions instead of app utility functions ( #4471 )
...
* replace `pxToRem`
* replace `tooltip` and `typeguards`
* replace `tooltip`
* `Actions` updated
* draggable.ts update
2024-07-23 12:15:05 +02:00
Mattias Granlund
14702e8c1e
Combine separate posthog metrics into one
2024-07-23 01:38:05 +02:00
Mattias Granlund
d65dd9c75f
Log hunk and locked hunk counts
2024-07-23 01:01:54 +02:00
Mattias Granlund
8c3f690e01
Fix mergeability status of pr
...
- used to disable merge button
- will need to be moved to GitHub implementation of GitHost
2024-07-23 00:10:17 +02:00
Mattias Granlund
ab3fd56b38
Log min/max metrics
2024-07-23 00:03:32 +02:00
Mattias Granlund
6a4e37f8c3
Fix for state_unsafe_mutation error
2024-07-22 23:30:15 +02:00
dependabot[bot]
e3472b2a0b
Bump openssl from 0.10.64 to 0.10.66 in the cargo group
...
Bumps the cargo group with 1 update: [openssl](https://github.com/sfackler/rust-openssl ).
Updates `openssl` from 0.10.64 to 0.10.66
- [Release notes](https://github.com/sfackler/rust-openssl/releases )
- [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.64...openssl-v0.10.66 )
---
updated-dependencies:
- dependency-name: openssl
dependency-type: indirect
dependency-group: cargo
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-07-22 18:13:28 +00:00
Kiril Videlov
07872123e7
Merge pull request #4463 from gitbutlerapp/get-workspace-head-return-early-when-nothign-applied
...
get_workspace_head exit early when there are no applied branches
2024-07-22 11:30:59 +02:00
Kiril Videlov
d8a1b4bc6b
get_workspace_head exit early when there are no applied branches
...
Avoids erroring out
2024-07-22 11:25:02 +02:00
Kiril Videlov
67c2ee7e03
Merge pull request #4462 from gitbutlerapp/branch-removal-update
...
more possible mitigations for the "failed to apply" problemt related to merge conflicts
2024-07-21 22:36:30 +02:00
Kiril Videlov
54ae0cf9e8
more possible mitigations for the "failed to apply" problemt related to merge conflicts
2024-07-21 22:30:24 +02:00
Pavel Laptev
10da0ae567
empty board links fixes ( #4461 )
2024-07-21 22:22:13 +02:00
Kiril Videlov
aa0ec8d256
Merge pull request #4460 from gitbutlerapp/mitigate-conflict-failure-to-unapply
...
possible mitigation for the case when a conflicting branch is incorrectly not unapplied base update
2024-07-21 22:08:52 +02:00
Kiril Videlov
581a793773
possible mitigation for the case when a conflicting branch is incorrectly not unapplied base update
2024-07-21 22:04:46 +02:00
Kiril Videlov
a148f90ccb
Merge pull request #4458 from gitbutlerapp/modularize-virtual.rs---move-and-siplify-status-commit-file-and-hunk
...
modularize virtual.rs - move and siplify status commit file and hunk
2024-07-21 20:24:16 +02:00
Kiril Videlov
ea4f47da1b
get_applied_status returns VirtualBranchFiles instead of a tuple of path and hunks
2024-07-21 20:12:54 +02:00
Kiril Videlov
c25e48877b
move hunk related functions and structs to a module
2024-07-21 18:22:50 +02:00
Kiril Videlov
c2d135872a
rename files module to singular for consistency
2024-07-21 18:09:15 +02:00
Kiril Videlov
880ac13f21
move commit related functions and struct to a module
2024-07-21 18:06:52 +02:00
Kiril Videlov
6e27756098
move file related operations out of virtual.rs
2024-07-21 17:59:17 +02:00
Kiril Videlov
f30cb51540
Merge pull request #4457 from gitbutlerapp/move-tree-writing-out-of-virtual-branch-actions
...
move tree writing out of virtual branch actions
2024-07-21 16:44:54 +02:00
Kiril Videlov
0f00f0425a
move tree writing out of virtual branch actions crate
2024-07-21 16:15:41 +02:00
Kiril Videlov
38e01c931c
rename tree writer functions to be actually descriptive of what they do
2024-07-21 15:59:30 +02:00
Kiril Videlov
4faaf77d08
Merge pull request #4456 from gitbutlerapp/use-virtual-branch-hunk-type-in-virtual
...
make virtual.rs functions operate on VirtualBranchHunk
2024-07-21 15:50:56 +02:00
