Commit Graph

7851 Commits

Author SHA1 Message Date
Kiril Videlov
ef3e6afdc9
Merge pull request #4252 from gitbutlerapp/disable-project-semaphore-usage
feature flag for disabling the project semaphore
2024-07-06 19:11:15 +02:00
Kiril Videlov
532b51bade
feature flag for disabling the project semaphore
It's possible that the sempahore state in the virtual branches controller is completely unnecessary. This feature flag allows us to test this hypothesis
2024-07-06 18:57:58 +02:00
Kiril Videlov
66d0ba2ac2
Merge pull request #4251 from gitbutlerapp/create-virtual-branch-changes
virtual branches controller - remove state dependency to credentials controller
2024-07-06 17:15:00 +02:00
Kiril Videlov
819b327973
virtual branches controller - remove state dependency to credentials controller 2024-07-06 17:03:46 +02:00
Kiril Videlov
3d0953e50c
Merge pull request #4250 from gitbutlerapp/deprecate-generated-key
remove the gitbutler generated key flow
2024-07-06 16:23:16 +02:00
Kiril Videlov
c777431363 remove the gitbutler generated key flow 2024-07-05 15:56:24 +02:00
Kiril Videlov
d3b4900fd1
Merge pull request #4246 from gitbutlerapp/refactor-remove-with_verify_branch-middleware-closures
remove with_verify_branch middleware closures
2024-07-04 17:26:04 +02:00
Kiril Videlov
3e01e86701
remove with_verify_branch middleware closures 2024-07-04 17:12:20 +02:00
Kiril Videlov
43afdfe559
Merge pull request #4245 from gitbutlerapp/Virtual-branch
move the updating of "last fetch timestamp" logic
2024-07-04 16:48:21 +02:00
Mattias Granlund
cf78a5b58b Work around bug in PR status after branch push
- gh can incorrectly report checks as completed even though they just started
- can be marked completed because not all checks are initially included in the check suite
- for GitButler specifically somtimes check-runs includes only a single completed GitGuardian check
2024-07-04 17:34:58 +03:00
Kiril Videlov
82dd580c27
move the updating of "last fetch timestamp" logic
Removing the updating of project from the virtual branch controller - this is the only dependency between the two controllers and likely indicates that the "last fetched at" should live somewhere else.
It will serve us well to not mutate the project state from the virtual branches domain
2024-07-04 16:34:53 +02:00
Kiril Videlov
ec52598f62
Merge pull request #4243 from gitbutlerapp/simplify-virtual-branches-controller-deps-graph
simplify virtual branches controller deps graph
2024-07-04 15:50:51 +02:00
Kiril Videlov
dfd15dc821
remove unused function 2024-07-04 15:36:36 +02:00
Kiril Videlov
fe7f1167bf
virtua branches controller - rm deps on project controller 2024-07-04 15:26:10 +02:00
Kiril Videlov
f1f7039053
Merge pull request #4241 from gitbutlerapp/simplify-vbranches-deps-graph
simplify vbranches deps graph
2024-07-04 13:49:22 +02:00
Kiril Videlov
babfa974ce
remove unnecessary lifetime annotations 2024-07-04 13:31:08 +02:00
Kiril Videlov
3dded08458
simplify virtual branches controller deps graph
users controller is not a real dependency
2024-07-04 13:28:17 +02:00
Mattias Granlund
2bc8ff1d03 Decrease metrics polling frequency
- it's unclear what the ideal window length is
- small window likely means tracking each change
- small window currently not beneficial in answering product questions 
- will re-evaluate based on findings
2024-07-04 14:10:01 +03:00
Kiril Videlov
6add0a40cc
remove unnecessary user dependency 2024-07-04 13:09:04 +02:00
Mattias Granlund
a85cc20582 Preserve line breaks in commit descriptions 2024-07-04 14:06:25 +03:00
Kiril Videlov
27f5bc40e1
Merge pull request #4238 from gitbutlerapp/rm-inner
refactor: virtual branch controller - rm inner pattern
2024-07-04 12:34:15 +02:00
Kiril Videlov
5e18071a30
refactor: virtual branch controller - rm inner pattern 2024-07-04 12:21:22 +02:00
Mattias Granlund
d150f61ed7 Capture branch metrics individually
- otherwise duplication of captured values grows as more metrics are added
- placed MetricsReporter in root +layout.svelte to accommodate future metrics
2024-07-04 03:51:14 +03:00
Mattias Granlund
c8e7368df5 Start capturing branch metrics
- service keeps count
- component polls every 15 minutes
- capture only when metrics have changed
- capture once a day if no changes
2024-07-04 02:11:03 +03:00
Caleb Owens
d9fcdc032f
Merge pull request #4236 from gitbutlerapp/Better-filter-branches-to-unapply-in-case-of-conflicts
Better filter branches to unapply in case of conflicts
2024-07-03 17:51:43 +02:00
Caleb Owens
5b42e6e9e6 Remove virtual flag from front end 2024-07-03 17:18:11 +02:00
Caleb Owens
2d0dc3a9ff Better filter branches to unapply in case of conflicts 2024-07-03 14:57:18 +02:00
Mattias Granlund
6618c5630c Fix project selector label overflow
- needs nowrap to show ellipsis when name is long
2024-07-03 12:54:20 +03:00
Pavel Laptev
9ff735fd4e
Drag-n-drop update (#4220)
* Reuse `splitFilePath` function

* unnecessary `width` and `height` removed

* added utils for draggable file list items

- added separate CSS

* WIP new styles for the commit draggable

* styles for draggable commit cards updated

* Draggable hunk added

* Draggable lanes updated

* Dropzone design updated

* Dropzones code refactor

* reordering lines design update

* Update logic for determining reorder shift

* Remove unused CSS fix scrollable container prop

* dropzone animations added

* Dropzone hover state UI updated

* CSS update: Card overlay labels

* Fix: horizontal scroll wrong observer trigger

* UX: Automatically close the commit message box after commit
2024-07-02 20:49:17 +02:00
Kiril Videlov
a1c591ffb6
Merge pull request #4230 from gitbutlerapp/upload-rpm-artifacts
upload the rpm packages
2024-07-02 17:42:43 +02:00
Caleb Owens
5bbc2830ea
Merge pull request #4229 from gitbutlerapp/Use-correct-headers-for-unapplying-wip-commits
Use correct headers for unapplying wip commits
2024-07-02 17:41:50 +02:00
Kiril Videlov
2299579ed0
upload the rpm packages 2024-07-02 17:30:12 +02:00
Caleb Owens
49236707be Use correct headers for unapplying wip commits 2024-07-02 17:30:00 +02:00
Caleb Owens
0408f5ec11
Merge pull request #4228 from gitbutlerapp/I-hired-an-exorcist
I hired an exorcist
2024-07-02 17:26:56 +02:00
Caleb Owens
f19e3bafcf I hired an exorcist 2024-07-02 17:25:14 +02:00
Kiril Videlov
68ac572dc2
Merge pull request #4226 from gitbutlerapp/ndom91/cleanup-nightly-build-gha
fix: cleanup GHA setup for nightly builds
2024-07-02 17:20:55 +02:00
Nico Domino
1b3c78dad2
Merge branch 'master' into ndom91/cleanup-nightly-build-gha 2024-07-02 17:07:27 +02:00
Pavel Laptev
400381b8b4
refactor: Use normalizeBranchName in ActiveBranchStatus component for virtual branch names (#4225) 2024-07-02 17:06:53 +02:00
ndom91
699542933b
fix: cleanup nightly build jobs 2024-07-02 17:02:09 +02:00
Kiril Videlov
be6eaa3156
Merge pull request #4121 from Lukylix/askpass-pipe-windows-fix
Fix askpass pipe on windows
2024-07-02 16:40:03 +02:00
Kiril Videlov
8e3601e855 Merge: resolve lockfile conflicts 2024-07-02 16:21:54 +02:00
Kiril Videlov
88da873128
Merge pull request #4184 from gitbutlerapp/bundle-as-RPM
make RPM bundles
2024-07-02 15:54:42 +02:00
Caleb Owens
6d2b41e481
Merge pull request #4192 from gitbutlerapp/ndom91/create-gitbutler-ui-package
feat: create separate component library subpackage
2024-07-02 15:47:13 +02:00
Caleb Owens
ac4f3b926c
Merge remote-tracking branch 'origin/master' into ndom91/create-gitbutler-ui-package 2024-07-02 15:31:00 +02:00
Kiril Videlov
ab941cb31f
Merge pull request #4219 from gitbutlerapp/bump-tauri-minor-version
bump tauri minor version
2024-07-02 15:28:39 +02:00
Caleb Owens
ee8f871005
Correctly add package as a dependency for linting 2024-07-02 15:18:37 +02:00
Kiril Videlov
1ac47405fc
fix clippy warning about missing crossbeam feature 2024-07-02 15:14:40 +02:00
Kiril Videlov
6e8e6b7b9b
remote unneccesary borrow 2024-07-02 15:11:28 +02:00
Kiril Videlov
23503afd25
merge stuff 2024-07-02 15:05:56 +02:00
Caleb Owens
5e463f7011
Fix linting setup; eslint and prettier are global to all the packages 2024-07-02 15:00:59 +02:00