Mattias Granlund
5d927abfcc
Simplify GitHub service a little
...
- this branch will be force pushed again
2024-03-15 23:27:52 +01:00
Pavel Laptev
229b9b9bc9
Merge pull request #3134 from gitbutlerapp/Commit-box-two-fields
...
Add summary and description fields. Show tooltip for long summary messages
2024-03-15 15:15:29 +01:00
Pavel Laptev
180d0eebd5
Commit box: race condition fixeed
2024-03-15 15:13:45 +01:00
Pavel Laptev
546e60c433
Merged origin/master into Commit box two fields
2024-03-15 14:32:48 +01:00
Scott Chacon
1cdf1264f0
Merge pull request #3150 from gitbutlerapp/More-feedback-context
...
send more context with feedback (OS, browser, index size)
2024-03-15 06:16:45 +01:00
Scott Chacon
5afa391dfe
wrong lint order
2024-03-15 05:45:34 +01:00
Scott Chacon
7fc51b775e
Add GitButler app version
2024-03-15 05:45:34 +01:00
Scott Chacon
cec15bcdd0
send more context with feedback (OS, browser, index size)
2024-03-15 05:45:34 +01:00
Josh Junon
af811e0481
unconditionally check all skipped jobs
2024-03-14 20:31:21 +01:00
Josh Junon
6c20463bf5
remove extraneous comment
2024-03-14 20:31:21 +01:00
Kiril Videlov
e0b0b85ad8
refactor: Update email input placeholder text and add required attribute to improve user experience
2024-03-14 20:31:21 +01:00
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
Josh Junon
ef9239b712
Merge pull request #3154 from gitbutlerapp/fix-all-green
...
unconditionally check all skipped jobs
2024-03-14 19:47:26 +01:00
Josh Junon
0468a6f48c
unconditionally check all skipped jobs
2024-03-14 19:46:46 +01:00
Josh Junon
d8640a90df
Merge pull request #3151 from gitbutlerapp/remove-extraneous-comment
...
remove extraneous comment
2024-03-14 16:48:26 +01:00
Josh Junon
b108708c1a
remove extraneous comment
2024-03-14 16:47:47 +01:00
Josh Junon
c6398aa235
Merge pull request #3089 from OlenaYefymenko/2848-ci-bug-check-rust
...
Integrate alls-green in rust-check job to improve status checks
2024-03-14 16:47:20 +01:00
Mattias Granlund
263ef78ed6
Refactor a couple of things for clarity
2024-03-14 14:29:06 +01:00
Josh Junon
f6941c3cb0
Merge pull request #3145 from gitbutlerapp/elide-lifetimes
...
elide lifetimes
2024-03-14 12:14:42 +01:00
Kiril Videlov
e6acfe9afd
refactor: Update email input placeholder text and add required attribute to improve user experience
2024-03-14 12:04:13 +01:00
Josh Junon
6ce77c8a06
elide lifetimes
2024-03-14 11:54:13 +01:00
Pavel Laptev
7faefd849f
Merge pull request #3144 from gitbutlerapp/removed-unused-UpstreamCommits-card
...
Remove unused code and Tag component CSS fix
2024-03-14 11:51:08 +01:00
Pavel Laptev
15d2238d82
style: add white-space: nowrap to label class
...
In order to prevent line breaks on the Tag component
2024-03-14 11:49:00 +01:00
Pavel Laptev
3203acf971
refactor: Remove unused code
2024-03-14 11:42:49 +01:00
Josh Junon
ef4a075497
Merge pull request #3143 from gitbutlerapp/more-path-refactorings
...
refactor the rest of repository.rs path handling
2024-03-14 11:38:34 +01:00
Josh Junon
c5f8571e53
refactor the rest of repository.rs path handling
2024-03-14 11:30:24 +01:00
Josh Junon
5d6491f482
Merge pull request #3142 from gitbutlerapp/robust-alternates-writing
...
make the alternates path writing more robust
2024-03-14 10:47:58 +01:00
Josh Junon
86e02b53c3
Merge pull request #3141 from gitbutlerapp/remove-unused-imports
...
remove unused import
2024-03-14 10:40:51 +01:00
Josh Junon
2a08d87d72
make the alternates path writing more robust
2024-03-14 10:37:52 +01:00
Josh Junon
0f6f8427e7
remove unused import
2024-03-14 10:30:56 +01:00
Mattias Granlund
e7b80725ea
Switch to new style of upstream commit list
...
- this work was left uncompleted a month back
2024-03-14 09:23:53 +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
