estib
a1b727bf18
fix: PR creation order checks only unarchived series
...
Whenever we check if all previous series have a PR associated with them, check only unarchived series.
2024-11-25 16:19:53 +01:00
Esteban Vega
049eb3ca74
Merge pull request #5654 from gitbutlerapp/e-branch-5
...
Warn the user about not deleting their branches
2024-11-25 11:43:10 +01:00
estib
d0725e4a21
Opening a PR should always probe for upstream
...
The PR details modal is the one responsible for checking whether the branch should be pushed before creating the PR.
2024-11-24 10:37:11 +01:00
estib
aa2fe0b2e8
Warn the user if they don't automatically delete their branches on merge
...
If a user starts using stacks and their forge won't automatically delete branches on merge, display a info message.
Don't show it again after they acknowledge it.
2024-11-24 10:04:36 +01:00
estib
307e49b09f
ForgeRepoService
...
Create a repo service that gets information about a given repository
The current information that's important to us is whether the repository will delete the branches automatically after merging them or not
2024-11-24 09:58:10 +01:00
Mattias Granlund
2ea1f0f856
Fix gitlab and github branch comparison URLs
...
- we don't want to provide fork information to forges unless actually forked
2024-11-22 18:54:39 +01:00
Caleb Owens
7db6fc54b4
Merge pull request #5652 from gitbutlerapp/Improve-upstream-commits
...
Improve upstream commits view
2024-11-22 17:30:37 +01:00
Pavel Laptev
03c4fc59e1
comment case updated
2024-11-22 17:18:21 +01:00
Pavel Laptev
5a5397cff9
updated UpstreamCommitsAccordion
component
2024-11-22 17:15:51 +01:00
Caleb Owens
fa6c39ca45
Merge pull request #5637 from gitbutlerapp/gitbutler-feeds
...
gitbutler-feeds
2024-11-22 16:54:23 +01:00
Caleb Owens
02ed5290ef
Handle remote integrated commits
2024-11-22 15:46:13 +01:00
Pavel Laptev
d3e152da87
font-weight-update ( #5643 )
...
* style: update font sizes and weights for consistency
Adjusts font sizes and weights across various components to ensure
typographic consistency. Changes include updating the font size in
the EmptySeries and TargetCard components, and modifying font
weights in the text.css file to create a more uniform appearance.
These updates enhance readability and maintain a cohesive design
language throughout the application.
* style: update font size for empty series label
Increase the font size of the empty series label from 12px to 13px
to enhance readability and improve the overall user interface.
* fix body text line-height
* style: update text weights
* update text-tokens
* refactor: remove nonexistent variable refs
2024-11-22 14:30:34 +01:00
Caleb Owens
9fe6da2607
Remove debug logs
2024-11-22 14:27:07 +01:00
Caleb Owens
ad8e3ae6ae
Update naming conventions
2024-11-22 14:27:07 +01:00
Caleb Owens
4ae7fd0760
Use localised selectors
2024-11-22 14:27:07 +01:00
Caleb Owens
13110ff6b1
Paginate bleep feeds
2024-11-22 14:27:07 +01:00
Caleb Owens
b9afbdfee3
Load bleeps and their replies
...
asdfsad
2024-11-22 14:27:07 +01:00
Caleb Owens
5e69e35173
Implement system of registering interests
2024-11-22 14:27:07 +01:00
Esteban Vega
aa2418e1fe
Merge pull request #5639 from gitbutlerapp/zip-rebase
...
Weave the remote branch into the local one
2024-11-22 13:30:29 +01:00
Kiril Videlov
42a4f5d12e
Merge pull request #5649 from gitbutlerapp/upstream-integration-logging
...
Upstream integration logging
2024-11-22 12:07:47 +01:00
Caleb Owens
d7f231433c
Upstream integration logging
2024-11-22 11:58:47 +01:00
ndom91
637133ca1c
fix: dont use archived branch as base
2024-11-22 11:46:27 +01:00
estib
251a6771c2
Add the option to use the new branch integration algorithm
...
Add an option in the 'Experimental' settings tab to toggle the use of the new branch upstream integration algorithm.
2024-11-22 10:39:38 +01:00
Caleb Owens
a233cbcb1f
Added example page for redux
2024-11-20 18:56:35 +01:00
Caleb Owens
fb1d1703ed
Install redux in appropriate packages
2024-11-20 18:56:35 +01:00
ndom91
c13aba6219
feat: add copyToClipboard and text wrap to ErrorSeries card's error msg
2024-11-20 17:23:08 +01:00
estib
70ff5ace3f
fix: Hide the push button if there's nothing to push
...
We can fully trust the patch status when checking whether a patch already has been integrated or published.
2024-11-20 14:53:28 +01:00
Mattias Granlund
596112d89a
Rename uniqueDeduplicate -> shallowDeduplicate
2024-11-20 14:44:34 +01:00
estib
d1b926517b
ai: Pass the correct file hunks when editing a commit message
...
Give the commit message generation method the file changes of the commit that's being edited, instead of the uncommited files
2024-11-20 11:43:53 +01:00
ndom91
6f71ebeaea
fix: commitlist css cleanup
2024-11-20 11:42:31 +01:00
estib
fcaf484b96
PR creation: Correctly set the PR description
...
Prefer using the `input` handler instead of the `change` handler.
The change handler will only update the state variable on blur, while the input handler will do so on key press.
2024-11-20 08:57:51 +01:00
Esteban Vega
788d26722b
Merge pull request #5580 from gitbutlerapp/edit-mode-improvements
...
Edit mode: Display changed state and warn about conflicts
2024-11-20 08:45:13 +01:00
Mattias Granlund
def6d9a2fd
Add option for creating new pr
...
- we automatically re-attach open prs, so we only allow it when pr is closed
2024-11-19 23:35:55 +01:00
Kiril Videlov
42b855f867
Merge pull request #5617 from gitbutlerapp/fix-reopen-merged
...
Do not show "reopen pr" button if merged
2024-11-19 22:35:57 +01:00
Caleb Owens
304919246e
Improve last divergent commit behaviour
...
Previously it didn't consider if there were no diverged commits and or no remote commits. This handles those two cases.
2024-11-19 22:32:30 +01:00
Mattias Granlund
15d3ea7526
Do not show "reopen pr" button if merged
2024-11-19 21:08:52 +00:00
Caleb Owens
d12c1cbd2a
Fail loudly if workspace state out of sync
2024-11-19 22:00:56 +01:00
Mattias Granlund
62ea095eec
Remove duplicate instance of ForgePrMonitor
...
- pr did not refresh after merging
2024-11-19 21:34:50 +01:00
Mattias Granlund
a215cc3d55
Disable merge button if pr base is not target branch
2024-11-19 20:56:14 +01:00
Mattias Granlund
f42a5ecef8
Use stable #each key in SeriesList component
2024-11-19 20:52:12 +01:00
Mattias Granlund
4c212cdd11
Parse url for base branch and pr bases
...
- will help us compare pr base against target
2024-11-19 20:51:56 +01:00
Mattias Granlund
a045cfdc09
Add dervied store that only emits shallow unique values
2024-11-19 20:51:56 +01:00
Caleb Owens
ebaf8ed79b
Remove rouge logging statement that got integrated
2024-11-19 18:39:50 +01:00
estib
96798c6377
Display the resolution state of conflicts
...
Use the new badges in the file-list items to convey whether or not a conflicted file was resolved.
The user can mark them manually as resolved, but they will also be automatically marked as such if it's detectable.
Also:
- Fix the detection of other file change types for non conflicted files
2024-11-19 17:20:39 +01:00
estib
bd7e25694d
File status is calculated the same for any file
...
Local and remote files now are consitently used to derive the file status
2024-11-19 17:09:57 +01:00
estib
3eb27711cb
Diff serialization: rename change type
...
Renam `change_type` to `changeType` for the front-end
2024-11-19 17:08:23 +01:00
Pavel Laptev
9650b0070e
show modified
status as a dot
2024-11-19 16:46:26 +01:00
Pavel Laptev
bc5b239964
display border when scroll the commit list
2024-11-19 16:46:26 +01:00
Pavel Laptev
1a2e9eddbd
increase line-height in the commit-card-title
2024-11-19 16:46:26 +01:00
estib
e027e43ccf
Edit mode: Display changed state and warn about conflicts
...
Check whether initially conflicted files are still conflicted. If not, display them as 'Modified' in the files list.
Warn about saving files that still look conflicted.
2024-11-19 16:46:26 +01:00