Kiril Videlov
abde2a03b6
fix merge conflict oopsie
2024-07-25 20:27:03 +02:00
Kiril Videlov
b47530af3a
Merged origin/master into new branch list api
2024-07-25 19:29:26 +02:00
Kiril Videlov
69b7aa3d8a
refactor - move given_name_for_branch from the context to an extension on git2::Reference
2024-07-25 19:29:13 +02:00
Nico Domino
5f7a67f271
fix: update web env file ( #4495 )
2024-07-25 15:58:56 +00:00
Nico Domino
bce53ba383
feat: move @gitbutler/cloud into monorepo ( #4494 )
2024-07-25 15:53:28 +00:00
Kiril Videlov
3afabc2a30
merge conflict fix
2024-07-25 16:34:18 +02:00
GitButler
62f0712399
GitButler WIP Commit
2024-07-25 16:32:39 +02:00
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
Kiril Videlov
970c193696
fix an incorrect assumption about gix reference remotes work
2024-07-25 15:49:44 +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
Kiril Videlov
6eea8d2993
trying to get branch remote name
2024-07-25 15:36:16 +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
Kiril Videlov
e5729fe56d
use the correct oxide api for getting the branch given name
2024-07-25 14:54:21 +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
Kiril Videlov
a0c724077a
handle the case when a branch is only a virtual branch and a remote is not yet set
2024-07-25 13:53:02 +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
Kiril Videlov
5147638d74
avoids a gix panic with symbolic references
2024-07-24 23:29:57 +02:00
Kiril Videlov
10f7604670
add some UI code for the new branch listing command
2024-07-24 23:10:51 +02:00
Kiril Videlov
187a3c22fe
create a tauri commant for the new branch listing
2024-07-24 22:51:14 +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
Kiril Videlov
d0545a219e
implement branch listings stats calculation
2024-07-24 15:53:49 +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
Kiril Videlov
bbd3aea3d0
reimplement with gitoxide
2024-07-23 17:33:28 +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
Kiril Videlov
4e4326d42b
remove unnecessary branch reference chack
...
We already had that info, use an enum variant to encode it
2024-07-23 15:48:37 +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
Kiril Videlov
a3b865a7f4
implement list branches
2024-07-23 10:45:16 +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
