Josh Junon
61db260ac8
elide lifetimes
2024-03-14 20:31:21 +01:00
Pavel Laptev
ddee80788b
style: add white-space: nowrap to label class
...
In order to prevent line breaks on the Tag component
2024-03-14 20:31:21 +01:00
Pavel Laptev
558340d17b
refactor: Remove unused code
2024-03-14 20:31:21 +01:00
Josh Junon
4ab5ff2b22
refactor the rest of repository.rs path handling
2024-03-14 20:31:21 +01:00
Josh Junon
3d475b7a3c
make the alternates path writing more robust
2024-03-14 20:31:21 +01:00
Josh Junon
c2b4087e93
remove unused import
2024-03-14 20:31:21 +01:00
Mattias Granlund
82650a5500
Switch to new style of upstream commit list
...
- this work was left uncompleted a month back
2024-03-14 20:31:21 +01:00
Olena
4d6b1daafb
Integrate alls-green in rust-check job to improve status checks
...
This patch integrates alls-green, that checks whether all dependency jobs
have passed successfully. This change also simplifies the CI setup by
requiring only the rust-check job for status checks.
Resolves #2848
2024-03-14 20:31:21 +01:00
Mattias Granlund
263ef78ed6
Refactor a couple of things for clarity
2024-03-14 14:29:06 +01:00
Pavel Laptev
f2856ea899
Removed console.log
2024-03-13 23:59:20 +01:00
Pavel Laptev
8611597eaa
Added custom useResize hook, code review
...
- Code review fixes
- In order to correct textareas hights I added custom hook that's watch for any size changes. Added it only for the summary because it's always on
2024-03-13 21:26:39 +01:00
Pavel Laptev
ac314fd143
Merged origin/master into Commit box two fields
2024-03-13 21:02:33 +01:00
Mattias Granlund
464fafc12a
Refactor checks loading status
...
- it was left a bit too chaotic and hard to follow in the last commit
2024-03-13 19:29:10 +01:00
Josh Junon
16140c7b4a
Merge pull request #3123 from gitbutlerapp/Virtual-branch-7
...
perform proper path handling and vectorized writes in conflict resolver
2024-03-13 18:50:29 +01:00
Kiril Videlov
ba42702118
feat: Add information about joining the GitButler Team with job openings in various roles.
2024-03-13 18:27:19 +01:00
Mattias Granlund
07d7879f31
Show loading state while fetching PR checks
2024-03-13 18:06:32 +01:00
Josh Junon
8de956400f
perform proper path handling and vectorized writes in conflict resolver
2024-03-13 15:33:53 +01:00
GitButler
c9f7ea0494
GitButler Integration Commit
...
This is an integration commit for the virtual branches that GitButler is tracking.
Due to GitButler managing multiple virtual branches, you cannot switch back and
forth between git branches and virtual branches easily.
If you switch to another branch, GitButler will need to be reinitialized.
If you commit on this branch, GitButler will throw it away.
Here are the branches that are currently applied:
- Virtual branch 7 (refs/gitbutler/Virtual-branch-7)
branch head: 8111cbe7994127d7c50f2ba164d06ae34f1dd302
- gitbutler-app/src/project_repository/conflicts.rs
- gitbutler-app/src/virtual_branches/virtual.rs
- Virtual branch 8 (refs/gitbutler/Virtual-branch-8)
- gitbutler-app/src/project_repository/conflicts.rs
Your previous branch was: refs/heads/exec-stuff
The sha for that commit was: 2bd1e8748628648e96d925b3bdba7572ce9ae734
For more information about what we're doing here, check out our docs:
https://docs.gitbutler.com/features/virtual-branches/integration-branch
2024-03-13 15:31:04 +01:00
Pavel Laptev
9148df8ac7
Code review fixes
...
- Removed unused import
- Removed commited `console.log)
- Updated logic to correctly handle splitting summary and description
- Updated text styling for commit message textarea
2024-03-13 15:13:21 +01:00
Pavel Laptev
4ce119758e
Merged origin/Commit-box-two-fields into Commit box two fields
2024-03-13 14:37:49 +01:00
Pavel Laptev
756efcb102
Formatting fixes
2024-03-13 13:50:15 +01:00
Pavel Laptev
560e0fb8ce
added tooltip if commit summary is too long
2024-03-13 13:50:15 +01:00
Pavel Laptev
6fd1b1f23f
Two fields workaround
...
- modified commit box in order to support summary and description
- modified useAutoHight hook, made two functions
- added focus class for input styles
2024-03-13 13:50:15 +01:00
Mattias Granlund
60e5f3d600
Change copy on pull request card
...
- Capitalize pr status
- Merge -> Merge pull request
- View PR -> Open in browser
2024-03-13 12:41:55 +01:00
Pavel Laptev
169aef2d81
Formatting fixes
2024-03-13 02:01:17 +01:00
Pavel Laptev
2e2db06e28
added tooltip if commit summary is too long
2024-03-13 02:00:08 +01:00
Pavel Laptev
7b11ee6a22
Two fields workaround
...
- modified commit box in order to support summary and description
- modified useAutoHight hook, made two functions
- added focus class for input styles
2024-03-13 01:08:57 +01:00
Pavel Laptev
584cd98909
Merge pull request #3131 from gitbutlerapp/remove-video-files-from-the-app
...
remove video from the app
2024-03-12 23:36:11 +01:00
Pavel Laptev
cfe347f343
unused component VideoTip and imports removed
2024-03-12 23:34:26 +01:00
Pavel Laptev
3d54ac7b16
Formatting fixes
2024-03-12 23:30:57 +01:00
Pavel Laptev
c310fa0e9f
remove video from the app
...
related issue #3126
2024-03-12 23:29:23 +01:00
Pavel Laptev
300b6e307a
Merge pull request #3130 from gitbutlerapp/Replace-WebM-with-MP4
...
Fix: Replace WebM with MP4
2024-03-12 23:00:10 +01:00
Pavel Laptev
d894690ec2
related issue #3126
2024-03-12 22:58:47 +01:00
Mattias Granlund
9aa2115c12
Fix for merge button being incorrectly disabled
...
- disable only if checks exist and they have not succeeded
2024-03-12 21:49:34 +01:00
Kiril Videlov
9892e4f9c8
refactor: Remove condition for admin role check in rendering upstreamCommits component.
2024-03-12 20:48:04 +01:00
Scott Chacon
95fdf64db8
Merge pull request #3122 from chadwhitacre/fsl-1.1
...
Upgrade FSL to 1.1
2024-03-12 15:14:36 +01:00
Chad Whitacre
ed538cb345
Upgrade FSL to 1.1
2024-03-12 10:06:43 -04:00
Kiril Videlov
9a3fc86a8e
fix test
2024-03-11 22:44:19 +01:00
Kiril Videlov
6aabf37b2c
refactor: when fetching hunks by file return a map of DiffFile
...
Adding stonger types to the result will allow us to more easily propagate information like old/new files paths, size etc
2024-03-11 22:44:19 +01:00
Pavel Laptev
bdb70f114c
Merge pull request #3118 from gitbutlerapp/docs-updated-1
...
development.md updated
2024-03-11 22:39:29 +01:00
Pavel Laptev
b2e181ba16
copy change
2024-03-11 22:37:57 +01:00
Pavel Laptev
7e7ff89e79
development.md updated
...
- added Table of Content for east navigation
- added Design section
- fixed headings level. h1 could be only one a page
- added dividers between sections
2024-03-11 22:35:51 +01:00
Josh Junon
a8b294d597
Merge pull request #3113 from gitbutlerapp/fixup-path-handling
...
fixup many instances of poor path handling
2024-03-11 19:24:54 +01:00
Josh Junon
2e13650a7f
fixup many instances of poor path handling
2024-03-11 19:06:22 +01:00
Josh Junon
940059ef95
Merge pull request #3112 from gitbutlerapp/dont-use-results-in-tests
...
don't use results in tests
2024-03-11 18:41:15 +01:00
Josh Junon
da97b0e31f
Merge pull request #3111 from gitbutlerapp/trivial-path-consistency-fix
...
use simpler path representation at call site
2024-03-11 18:41:06 +01:00
Josh Junon
86a621f2b2
don't use results in tests
2024-03-11 18:28:04 +01:00
Josh Junon
4c6d40da6e
use simpler path representation at call site
2024-03-11 18:23:06 +01:00
Josh Junon
f2413bbfbb
Merge pull request #3109 from gitbutlerapp/fix-alternates-test-path-handling
...
fix test alternates test to be more robust
2024-03-11 17:03:25 +01:00
Josh Junon
a5e71b6903
fix test alternates test to be more robust
2024-03-11 16:40:02 +01:00
