gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-21 00:21:35 +03:00
Code Issues Packages Projects Releases Wiki Activity
5,154 Commits 157 Branches 1,064 Tags 61 MiB
ae0c24ffaa
Commit Graph

5154 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qix
82a0677847
Merge pull request #2558 from gitbutlerapp/pull-request-actions-trigger 
trigger CI on pull_request in addition to push
 2024-02-06 23:14:16 +01:00
Josh Junon
a2cc3ea2f3 trigger CI on pull_request in addition to push 2024-02-06 23:12:43 +01:00
Qix
6761c9996d
Merge pull request #2557 from namanlp/enhance-tauri 
Add authors in Packager.toml
 2024-02-06 23:11:45 +01:00
Naman Garg
1cf8880a43
Update Author Email 2024-02-07 03:29:59 +05:30
Naman Garg
42befc62cd
Add authors in Packager.toml 2024-02-07 02:44:07 +05:30
Kiril Videlov
1501699689 Revert "update rate limiting for Sentry events to allow for burst" 
This reverts commit 64962078d2.
 2024-02-06 21:01:46 +01:00
Nikita Galaiko
a44d955262 remove obsolete test 2024-02-06 13:12:06 +01:00
Nikita Galaiko
ff8aac3d32 apply reverse hunk to unapply ownership 2024-02-06 12:48:43 +01:00
Mattias Granlund
4462d08371
Merge pull request #2550 from gitbutlerapp/show-merge-button-for-prs-without-checks 
Show merge button for PRs without checks
 2024-02-05 19:13:33 +01:00
Mattias Granlund
eb1556f0d7 Show merge button for PRs without checks 
- for now the button will unfortunately only appear after five seconds when no checks are configured
- we need to find an API that tells us if checks are configured or not
- octokit.checks.listForRef gives [] result immediately after pr created, then changes
 2024-02-05 19:05:26 +01:00
dependabot[bot]
1c88d963e3
Bump tauri-plugin-window-state from 70d9908 to 056a458 
Bumps [tauri-plugin-window-state](https://github.com/tauri-apps/plugins-workspace) from `70d9908` to `056a458`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](70d99086de...056a458d30)

---
updated-dependencies:
- dependency-name: tauri-plugin-window-state
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-05 16:24:10 +00:00
dependabot[bot]
ae78f53096
Bump tauri-plugin-single-instance from 70d9908 to 056a458 
Bumps [tauri-plugin-single-instance](https://github.com/tauri-apps/plugins-workspace) from `70d9908` to `056a458`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](70d99086de...056a458d30)

---
updated-dependencies:
- dependency-name: tauri-plugin-single-instance
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-05 16:22:25 +00:00
dependabot[bot]
3e10cfbb3f
Bump the rust-patch-updates group with 3 updates 
Bumps the rust-patch-updates group with 3 updates: [itertools](https://github.com/rust-itertools/itertools), [reqwest](https://github.com/seanmonstar/reqwest) and [sentry](https://github.com/getsentry/sentry-rust).


Updates `itertools` from 0.12.0 to 0.12.1
- [Changelog](https://github.com/rust-itertools/itertools/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-itertools/itertools/compare/v0.12.0...v0.12.1)

Updates `reqwest` from 0.11.23 to 0.11.24
- [Release notes](https://github.com/seanmonstar/reqwest/releases)
- [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/seanmonstar/reqwest/compare/v0.11.23...v0.11.24)

Updates `sentry` from 0.32.1 to 0.32.2
- [Release notes](https://github.com/getsentry/sentry-rust/releases)
- [Changelog](https://github.com/getsentry/sentry-rust/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-rust/compare/0.32.1...0.32.2)

---
updated-dependencies:
- dependency-name: itertools
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-patch-updates
- dependency-name: reqwest
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-patch-updates
- dependency-name: sentry
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-patch-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-05 16:20:33 +00:00
Nikita Galaiko
64962078d2 update rate limiting for Sentry events to allow for burst 2024-02-05 17:09:39 +01:00
dependabot[bot]
6f66db2780
Bump the rust-minor-updates group with 1 update 
Bumps the rust-minor-updates group with 1 update: [tokio](https://github.com/tokio-rs/tokio).


Updates `tokio` from 1.35.1 to 1.36.0
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.35.1...tokio-1.36.0)

---
updated-dependencies:
- dependency-name: tokio
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-minor-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-05 16:08:23 +00:00
Mattias Granlund
d3aca530fa Fetch base branch after merging pull request 2024-02-05 13:56:04 +01:00
Mattias Granlund
ecd37a38a8 Retry fetching checks after PR creation 2024-02-05 13:46:11 +01:00
Mattias Granlund
f45e29b474 Add dropdown for choice of merge, rebase and squash 2024-02-04 22:19:58 +01:00
Mattias Granlund
daf389a4f6
Merge pull request #2534 from gitbutlerapp/show-disabled-merged-button-when-pr-merged 
Show disabled "merged" button when PR merged
 2024-02-04 21:20:27 +01:00
Mattias Granlund
34b10fae7d
Show disabled "merged" button when PR merged 2024-02-04 21:19:07 +01:00
Mattias Granlund
28efb148ae
Merge pull request #2533 from gitbutlerapp/bugfix-pr-status-when-pr-closed-and-remote-branch-deleted 
Bugfix pr status when pr closed and remote branch deleted
 2024-02-04 21:05:10 +01:00
Mattias Granlund
a64ea2586c
Bugfix pr status when pr closed and remote branch deleted 
- manually refetch after completing merge
- change update terminology to fetch, reads more correct
 2024-02-04 20:58:57 +01:00
Mattias Granlund
c37fbc2872
Merge pull request #2532 from gitbutlerapp/add-error-handling-for-failure-to-load-pr-status 
Add error handling for failure to load PR status
 2024-02-04 20:34:05 +01:00
Mattias Granlund
1eb7c34fae
Add error handling for failure to load PR status 
- silently ignore if commit/sha not found (happens after merge)
 2024-02-04 20:28:00 +01:00
Mattias Granlund
f65f42f50b
Merge pull request #2531 from gitbutlerapp/make-pr-status-reloadable 
Make PR status reloadable
 2024-02-04 20:23:21 +01:00
Mattias Granlund
cee31fe1bf Make PR status reloadable 
- also adds tooltip based on status
 2024-02-04 20:18:08 +01:00
Mattias Granlund
44860048fb
Merge pull request #2530 from gitbutlerapp/add-github-checks-status-to-branch-header-test- 
Add github checks status to branch header [test]
 2024-02-04 19:39:19 +01:00
Mattias Granlund
0c63a1b7cf Add github checks status to branch header 
- more work needed on when to request and how often to update
 2024-02-04 19:09:08 +01:00
Mattias Granlund
a34f766dac Remove resizer from FileCard component 
- resizing should be done in context of e.g. branch lane
- leaves branch previews with simpler max 50rem file previews
- no need for those pages to have resizers since we have no actual designs yet
 2024-02-04 13:41:34 +01:00
Mattias Granlund
6a56fa582c Show busy indicator when updating base branch 
- make update button its own component
- show busy while updating
- remove unnecessary log statement
 2024-02-04 12:38:25 +01:00
Mattias Granlund
26fdfdbc39 Pre-populate default when changing remote branch name 
- requested by r0derik on discord
 2024-02-04 10:38:25 +01:00
Mattias Granlund
ca89384ef5 Fix file status for remote files 
- the heuristics for A and D are correct when there is exactly one hunk
- more than one hunk means the file was modified
 2024-02-04 10:24:55 +01:00
Mattias Granlund
389959b756 Add option for creating draft pull request 
- as additional option for the push button
 2024-02-04 10:24:40 +01:00
Mattias Granlund
d68ae9e697 Fix typo in error message 2024-02-03 15:30:48 +01:00
Mattias Granlund
d900ad9649 Remove drag handle from branch preview headers 
- would be preferable to reuse header layout than copying it branch lanes
 2024-02-03 15:19:42 +01:00
Mattias Granlund
cdaaccae2c Add commit link to footer of opened commit card 2024-02-02 17:54:46 +01:00
Mattias Granlund
a7aad139c0 Use same route for viewing remote branchs and PRs 
- like in the board, show tag with link to pull request
- if remote branch does not exist then fall back to old page
- similar header to other branches
- explore commit diffs
 2024-02-02 17:54:46 +01:00
Mattias Granlund
78296f76b0 fix: delete branch instead of applying branch 2024-02-02 15:18:46 +01:00
Mattias Granlund
79e0cc7c2f Remove clowny console.log 2024-02-01 18:06:45 +01:00
Mattias Granlund
7b4ea0e45e Compute file status for remote files 
- based on the diff header
 2024-02-01 18:03:10 +01:00
Mattias Granlund
a85087436c Fix commit card styling 
- refactored a bit after losing the 10px gap between description and author
 2024-02-01 17:59:33 +01:00
Mattias Granlund
874005c1ff Enable file diff viewing for commits in trunk 2024-02-01 17:49:32 +01:00
Mattias Granlund
e5fe606ab0 Lock hunks when viewing remote files 
- readonly prop for hunks to disable cursor and dragging
- removes a console.log
- undo a previous change related to AnyFile
- fix gap between text selection blocks line numbers
 2024-02-01 16:02:28 +01:00
Mattias Granlund
90e7b0f192 Replace LocalFile | RemoteFile with AnyFile 2024-02-01 11:07:13 +01:00
Mattias Granlund
c813dddcd9 Rename File -> LocalFile 2024-02-01 11:07:13 +01:00
Mattias Granlund
f5428dcec7 Make it possible to view remote commits using existing components 
- we need a union type rather than using File | RemoteFile everywhere
 2024-02-01 11:07:13 +01:00
Kiril Videlov
a69b6d9279 Replace GUI with tool, since it better describes the scope of virtual branches 2024-02-01 10:45:49 +01:00
Scott Chacon
b12029a79d
Merge pull request #2498 from gitbutlerapp/schacon-patch-1 
Update README.md
 2024-02-01 10:07:50 +01:00
Scott Chacon
a2939ac3aa
Update README.md 2024-02-01 10:07:20 +01:00
Mattias Granlund
2138a5cc03 Use same FileDiff in FileCard and CommitCard 2024-01-31 18:40:33 +01:00