Commit Graph

9596 Commits

Author SHA1 Message Date
ndom91
b26b30d8d0 fix: ensure commit-lines.css works for both stacking/original lanes 2024-10-17 12:03:09 +02:00
Kiril Videlov
60b365d988
Merge pull request #5178 from gitbutlerapp/stack-compute-upstream-only-correctly
stack: improvve computing of upstream only commits
2024-10-16 20:30:41 +02:00
Kiril Videlov
5fbf242f86
Update virtual.rs 2024-10-16 20:25:08 +02:00
Kiril Videlov
98c537f5ec
stack: improvve computing of upstream only commits
It is necessary to compare against commits from either side of merge commits
2024-10-16 20:22:37 +02:00
Esteban Vega
08b29a7176
Merge pull request #5177 from gitbutlerapp/branch
fix: New branch dropzone only accepts uncommited files
2024-10-16 19:50:42 +02:00
Kiril Videlov
64fd3b893d
Merge pull request #5165 from Byron/fixup-5089
Some improvements on top of #5089
2024-10-16 19:19:46 +02:00
estib
73f81332a3 fix: New branch dropzone only accepts uncommited files
When creating a brand new branch, don't let commited files or hunks create new branches
2024-10-16 19:15:56 +02:00
Kiril Videlov
9a8dfa4eaa
Merge pull request #5176 from gitbutlerapp/branch
fix comment on a test assertion
2024-10-16 19:08:18 +02:00
Kiril Videlov
d8f10e1513
fix comment on a test assertion 2024-10-16 18:55:06 +02:00
Kiril Videlov
666c167e5e
Merge pull request #5174 from gitbutlerapp/revwalk-simplify-first-parent
When revwalking only get the commits from the first parent
2024-10-16 18:51:51 +02:00
Kiril Videlov
64d2641e70
fix an missed call site 2024-10-16 18:46:01 +02:00
Kiril Videlov
99ebced634
fix correct test expectations 2024-10-16 18:36:12 +02:00
Kiril Videlov
3bd4428f35
When revwalking only get the commits from the first parent
Also adding an option for getting all
2024-10-16 18:28:32 +02:00
Esteban Vega
740479861b
Merge pull request #5169 from gitbutlerapp/add-pr-details-and-refetch
PR card updates
2024-10-16 17:47:04 +02:00
Kiril Videlov
b1ecafcd8c
Merge pull request #5170 from gitbutlerapp/update-github-pull-request-source-branch
fix: Get the right PR source branch
2024-10-16 17:34:50 +02:00
Kiril Videlov
5cd9d77fec
Merge pull request #5173 from gitbutlerapp/fix-issues-with-series-listing
Stack - correctly flag remote commits when no changeid
2024-10-16 17:34:30 +02:00
Kiril Videlov
e587ee3dde
Merge pull request #5171 from gitbutlerapp/Fix-rebasers
Fix issue where incoming commit headers were caried into merge commit headers
2024-10-16 17:33:11 +02:00
Kiril Videlov
b3313fb60b
make it compile lol 2024-10-16 17:27:21 +02:00
Caleb Owens
10b7ab9471
Fix issue where incoming commit headers were caried into merge commit headers 2024-10-16 16:58:33 +02:00
ndom91
d9e103d898 fix: hide images > 5mb 2024-10-16 16:55:28 +02:00
ndom91
833d8510ce fix: disable image contextMenu in file preview 2024-10-16 16:55:28 +02:00
ndom91
5b09278807 fix: binary image display styling 2024-10-16 16:55:28 +02:00
Sebastian Thiel
201ceec88b
Adapt the UI implementation to deal with the lack of the FileInfo::status field 2024-10-16 16:49:44 +02:00
estib
af625080db fix: Get the right PR source branch
We were setting the PR **base branch** (e.g. main or master) as the source branch, instead of the head, as intended
2024-10-16 16:46:20 +02:00
Sebastian Thiel
f7d5380687
Some improvements on top of #5089
The PR was merged earlier to not hold it after a passed review,
yet I personally feel strongly enough about the backend portions
to give it another round of polish.
2024-10-16 16:35:06 +02:00
estib
fb152bcc96 PR card updates 2024-10-16 16:20:02 +02:00
Kiril Videlov
055a653979
Stack - correctly flag remote commits when no changeid 2024-10-16 15:53:56 +02:00
Esteban Vega
05e812ca88
Merge pull request #5167 from gitbutlerapp/default-target-on-fresh-install
fix: Swallow the default target not found
2024-10-16 15:49:35 +02:00
ndom91
eaa785e3bb fix: do not allow commit editing for upstream-only commits 2024-10-16 15:42:15 +02:00
estib
dec689c6ab fix: Swallow the default target not found
Don't surface the default target not found. This already is caught at the top level and the user is taken to the 'target not found' page.
2024-10-16 15:35:00 +02:00
Pavel Laptev
a7eef8ff38 center dots 2024-10-16 15:22:27 +02:00
ndom91
6b89ffdecf fix: bottom commitLine dashed 2024-10-16 15:22:27 +02:00
ndom91
4a3a67ffa5 feat: add seriesDividerLine between series 2024-10-16 15:22:27 +02:00
ndom91
7f63a34925 fix: rename stackingBranch* components to stackingSeries* 2024-10-16 15:22:27 +02:00
Esteban Vega
a2af3bb560
Merge pull request #5161 from gitbutlerapp/fix-input-auto-select-on-start-commit
fix: Auto-focus on 'Start commit'
2024-10-16 12:34:37 +02:00
estib
5de8266530 fix: Auto-focus on 'Start commit'
The auto-focus on the commit message input would not work, as the input would not be yet mounted.
Wait for the input to be mounted (`$expanded = true`) and then focus on it.
2024-10-16 12:24:01 +02:00
ndom91
a738db6150 fix: dont show empty state if there are upstreamPatches 2024-10-16 12:02:14 +02:00
Sebastian Thiel
22f0e4ab36
Merge pull request #5089 from Zamoca42/feat/parse-binary-file
feat: Parse & display binary files
2024-10-16 11:36:28 +02:00
Kiril Videlov
606354abfd
Merge pull request #5159 from gitbutlerapp/branch
Fix on fix: Push button on scroll and small UI tweaks
2024-10-16 10:15:01 +02:00
Kiril Videlov
e4294d02b7
Merge pull request #5142 from xxxoooxoxo/master
feat: add support for default code editor (Zed)
2024-10-16 00:48:10 +02:00
Ali Houssain Sareini
caf1b92b89
Merge branch 'master' into master 2024-10-15 18:33:23 -04:00
Ali Houssain Sareini
d06593bcd1 lint 2024-10-15 18:28:44 -04:00
Pavel Laptev
bf6ef90afe style: fix double top border on Stacking lanes 2024-10-15 23:50:33 +02:00
Pavel Laptev
e6eb938dc5 refactor: Add intersection observer to lane-branches action for scroll visibility 2024-10-15 23:44:04 +02:00
ndom91
72281cb207 fix: do not allow user to generate series name after branch has been pushed 2024-10-15 22:41:14 +02:00
Kiril Videlov
046036b41f
Merge pull request #5150 from gitbutlerapp/branch-entries-cleanup
Branch entries cleanup
2024-10-15 20:05:42 +02:00
ndom91
a2c010f66a fix: don't fail if the file isn't there anymore after discarding hunk 2024-10-15 19:01:35 +02:00
ndom91
7241902704 fix: update copy for contextMenu labels 2024-10-15 18:46:05 +02:00
ndom91
1f0dca4646 feat: add 'generate branch name' to stack series header 2024-10-15 18:46:05 +02:00
ndom91
ee3c1f4023 fix: use some to express intent better in other commit cases 2024-10-15 18:17:38 +02:00