gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-02 07:53:55 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,800 Commits 148 Branches 1,032 Tags 66 MiB
96c1fb0064
Commit Graph

874 Commits

Author SHA1 Message Date
Mattias Granlund
92893d4b14 Remove console.log and fix lint error 2023-11-16 15:00:00 +00:00
Mattias Granlund
d37daed784 Subscribe to branches using new API 
This completely removes the need for the delta service, and simplifies the vbranch service.
 2023-11-16 14:54:31 +00:00
Kiril Videlov
d12d647ba9 refactor: simplify payload assignment in Event struct 2023-11-16 15:51:29 +01:00
Kiril Videlov
b23169fc92 chore: update emit_vbranches function signature to accept a reference to AppHandle instead of value 2023-11-16 12:30:28 +01:00
Kiril Videlov
d7306d4cd9 feat: add event emission for virtual branches after certain actions to keep UI in sync 2023-11-16 12:30:28 +01:00
Mattias Granlund
eda172ac19 Fixes broken project settings page 2023-11-16 11:27:02 +00:00
Mattias Granlund
d5f9216956 Fixes github login 2023-11-16 10:58:16 +00:00
Mattias Granlund
3e76504ded A few more fixes to the observable streams 2023-11-16 10:49:08 +00:00
Mattias Granlund
52a028440f Fix reactive variables to make project navigation work 2023-11-16 10:22:37 +00:00
dependabot[bot]
61eb145215 chore(deps-dev): bump eslint-plugin-import from 2.28.1 to 2.29.0 
Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.28.1 to 2.29.0.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.28.1...v2.29.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-16 10:21:58 +00:00
dependabot[bot]
d74607321c chore(deps-dev): bump eslint-plugin-svelte from 2.33.1 to 2.35.0 
Bumps [eslint-plugin-svelte](https://github.com/sveltejs/eslint-plugin-svelte) from 2.33.1 to 2.35.0.
- [Release notes](https://github.com/sveltejs/eslint-plugin-svelte/releases)
- [Changelog](https://github.com/sveltejs/eslint-plugin-svelte/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sveltejs/eslint-plugin-svelte/compare/v2.33.1...v2.35.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-svelte
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-16 10:21:51 +00:00
dependabot[bot]
35017d4233 chore(deps-dev): bump @types/diff-match-patch from 1.0.34 to 1.0.36 
Bumps [@types/diff-match-patch](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/diff-match-patch) from 1.0.34 to 1.0.36.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/diff-match-patch)

---
updated-dependencies:
- dependency-name: "@types/diff-match-patch"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-16 10:21:43 +00:00
dependabot[bot]
01884b2541 chore(deps-dev): bump @sveltejs/kit from 1.27.3 to 1.27.5 
Bumps [@sveltejs/kit](https://github.com/sveltejs/kit/tree/HEAD/packages/kit) from 1.27.3 to 1.27.5.
- [Release notes](https://github.com/sveltejs/kit/releases)
- [Changelog](https://github.com/sveltejs/kit/blob/master/packages/kit/CHANGELOG.md)
- [Commits](https://github.com/sveltejs/kit/commits/@sveltejs/kit@1.27.5/packages/kit)

---
updated-dependencies:
- dependency-name: "@sveltejs/kit"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-16 10:21:33 +00:00
Mattias Granlund
a8c2fb6884 Fixes user login that broke in previous commit 2023-11-16 10:06:01 +00:00
Mattias Granlund
e243b4d9ff Replace most stores with observables 
Heads up, this is a massive commit touching at least 50-60 files. We want to
remove square/svelte-store completely, and we're almost there.

In this commit we also drop the /old/ code.
 2023-11-16 09:28:07 +00:00
Nikita Galaiko
13d3588a87
Merge pull request #1610 from gitbutlerapp/fix-session-flush-error 
Fix session flush error
 2023-11-15 14:01:11 +01:00
Nikita Galaiko
4164907245 log which session is failed to flush 2023-11-15 13:55:59 +01:00
Nikita Galaiko
6bf22e4e93 fix branch reorder 2023-11-15 11:55:30 +01:00
Nikita Galaiko
4eabae9f76
Merge pull request #1608 from gitbutlerapp/update-debouncer-timeout 
Update debouncer timeout
 2023-11-15 10:50:12 +01:00
Nikita Galaiko
2a1723cb8c set file watch debouncer to 10ms 2023-11-15 10:45:32 +01:00
Nikita Galaiko
182449b0f1
Merge pull request #1607 from gitbutlerapp/handle-binary-hunks 
Handle binary hunks
 2023-11-15 10:42:16 +01:00
Nikita Galaiko
b142a3c25b fix: handle binary files and prioritize binary hunks 2023-11-15 10:21:33 +01:00
Nikita Galaiko
824012466d do not send handled auth errors to sentry 2023-11-15 09:13:50 +01:00
Nikita Galaiko
e24ebcdbab set default path to homedir 2023-11-14 18:02:26 +01:00
Nikita Galaiko
779c731f1c introduce rate limiter for sentry 2023-11-14 16:58:51 +01:00
Nikita Galaiko
9eb3cf9e0a handle open error 2023-11-14 15:19:22 +01:00
Nikita Galaiko
bdd24b69da extract sentry mod 2023-11-14 15:09:01 +01:00
Nikita Galaiko
165b0fcf46 handle projects that were removed 2023-11-14 15:02:16 +01:00
Nikita Galaiko
4684e22ba1
Merge pull request #1586 from gitbutlerapp/dependabot/cargo/tokio-1.34.0 
chore(deps): bump tokio from 1.33.0 to 1.34.0
 2023-11-14 11:45:13 +01:00
Nikita Galaiko
ab893091ad
Merge pull request #1590 from gitbutlerapp/dependabot/cargo/uuid-1.5.0 
chore(deps): bump uuid from 1.4.1 to 1.5.0
 2023-11-14 11:44:56 +01:00
Nikita Galaiko
8dcc102d29 debounce file change events 2023-11-14 11:37:40 +01:00
Nikita Galaiko
9f1910a59e ignore some vbranch errors while flushing 2023-11-14 10:25:31 +01:00
Nikita Galaiko
ee2e281ec3
Merge pull request #1595 from gitbutlerapp/fix-amend-ownership-check 
Fix amend ownership check
 2023-11-14 10:14:21 +01:00
Nikita Galaiko
0046cc2628 merged upstream 2023-11-14 10:06:37 +01:00
Nikita Galaiko
2cccfec49a merged upstream 2023-11-14 10:06:37 +01:00
Nikita Galaiko
f6531e815e verify amendable diffs agains real diff 2023-11-14 09:48:18 +01:00
Nikita Galaiko
449c0092e5 make sure all dirs exist when creating project 2023-11-14 09:47:49 +01:00
Nikita Galaiko
bdb0753e0b chore: fix warnings 2023-11-14 09:24:26 +01:00
Mattias Granlund
ed7410e186 Fixing some container and theme stuff for PR list/page 2023-11-13 19:01:37 +00:00
Mattias Granlund
ca21e879ac Use observable suffix in pr component 2023-11-13 18:22:12 +00:00
Nikita Galaiko
19619a6781
Merge pull request #1585 from gitbutlerapp/remove-result-from-handle-event 
Remove result from handle event
 2023-11-13 16:59:58 +01:00
dependabot[bot]
fd7a0a6b92
chore(deps): bump uuid from 1.4.1 to 1.5.0 
Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.4.1 to 1.5.0.
- [Release notes](https://github.com/uuid-rs/uuid/releases)
- [Commits](https://github.com/uuid-rs/uuid/compare/1.4.1...1.5.0)

---
updated-dependencies:
- dependency-name: uuid
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-13 15:55:30 +00:00
dependabot[bot]
875ee4b40a
chore(deps): bump tokio from 1.33.0 to 1.34.0 
Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.33.0 to 1.34.0.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.33.0...tokio-1.34.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-13 15:54:23 +00:00
Mattias Granlund
e62157646f Add error handling to PR service 2023-11-13 15:44:20 +00:00
Mattias Granlund
3e162e645c Add service for pull requests 2023-11-13 15:44:20 +00:00
Mattias Granlund
dbfff1e52f Make remote contributions code a bit more succinct 2023-11-13 15:44:20 +00:00
Nikita Galaiko
75541c16b8 remove wd_tree flush optimization 2023-11-13 16:34:15 +01:00
Mattias Granlund
cceac88b85 Darken overlay backdrop color slightly 2023-11-13 10:55:51 +00:00
Kiril Videlov
bfa84c9d46 chore: remove unused imports and variables 2023-11-12 23:18:01 +01:00
Kiril Videlov
c01c7626ce feat: add support for filtering pull requests by "Only Yours" in project pull request listing, based on the logged-in user's GitHub username 2023-11-12 23:07:30 +01:00
Kiril Videlov
8de3eaf9b2 feat: add function to generate remote contributions based on pull requests and remote branches 2023-11-12 22:47:53 +01:00
Mattias Granlund
e79d3e9ebe Fix text input styles 2023-11-12 21:09:23 +00:00
Mattias Granlund
6d0d34fa65 Add first iteration of project switcher 
- next to base refresh button
 2023-11-12 20:45:50 +00:00
Mattias Granlund
6e2139b224 Improve stashed branch view 2023-11-12 20:45:50 +00:00
Kiril Videlov
1882b8e736 fix: remove unused imports and update conditional rendering in PullRequestPage component 2023-11-12 19:39:55 +01:00
Kiril Videlov
94ff6cb3b9 feat: update dependencies and refactor pullRequestsStore to use RxJS Observable 2023-11-12 19:39:55 +01:00
Mattias Granlund
b4c11c9e6a Move some files into nav package 2023-11-12 16:03:02 +00:00
Mattias Granlund
5ed72f3883
Moving faster with the UI (#1569) 
- using css vars directly in components for theming
- getting far with app bg, surfaces and cards
- lots of files touched to make app generally look better
 2023-11-12 15:50:02 +00:00
Mattias Granlund
4d22f1339e
More UI edits for the board (#1568) 
- adjusting colors, spacing, borders
 2023-11-11 19:51:15 +00:00
Mattias Granlund
0b05eea9de Fixes the style of the email button in the footer 2023-11-11 18:55:51 +00:00
Mattias Granlund
6ce3335170 Update the board UI with more padding 2023-11-11 18:46:15 +00:00
Mattias Granlund
a49d146d96 - active branch domain link 
- settigns domain link
- remove project header
 2023-11-11 18:27:49 +00:00
Mattias Granlund
9aa9ab14aa Make default bg color a bit brighter 2023-11-11 18:27:28 +00:00
Mattias Granlund
6ceca226ec Fixes weird commit card overflow 2023-11-11 18:02:07 +00:00
Mattias Granlund
8ebc746bd0 Fix some things related to project store 2023-11-11 17:20:44 +00:00
Mattias Granlund
e9563d9437 Refactor project store 
- also changes how the base branch is displayed
 2023-11-11 17:20:44 +00:00
Mattias Granlund
e1b63dfbc3 Show trunk as card 2023-11-11 17:20:44 +00:00
Mattias Granlund
a480ea0ecc Make base branch into component 2023-11-11 17:20:44 +00:00
Kiril Videlov
071889592c chore: simplify filter condition in list_remote_branches function 2023-11-11 18:02:23 +01:00
Kiril Videlov
c00e645881 list all remote branches 2023-11-11 18:02:23 +01:00
Mattias Granlund
4de1f8ad7f Show loading stack on hovering spinner 2023-11-11 13:24:05 +00:00
Mattias Granlund
267d073f7a Use Meta + Shift + S for manual sync to cloud 2023-11-11 10:49:32 +00:00
Mattias Granlund
66b05c0430 Show loading spinner during ipc/fetch 2023-11-11 10:24:42 +00:00
Nikita Galaiko
8f43847213
Merge pull request #1557 from gitbutlerapp/add-commit-method 
Add commit method
 2023-11-10 16:12:59 +01:00
Nikita Galaiko
77a8f15efa no signing when authors might mismatch 2023-11-10 16:04:39 +01:00
Nikita Galaiko
f58a79eb0c chore: remove migration logic for old data format 2023-11-10 15:48:23 +01:00
Nikita Galaiko
b48815c4d7
Merge pull request #1555 from gitbutlerapp/virtual-branch 
Virtual branch
 2023-11-10 13:02:33 +01:00
Nikita Galaiko
9949d2aa39
Merge pull request #1554 from gitbutlerapp/check-and-push-project-code 
Check and push project code
 2023-11-10 13:02:23 +01:00
Nikita Galaiko
b11f9be1ba refactor: remove unused activeZones set from draggable function 2023-11-10 12:29:29 +01:00
Nikita Galaiko
018a480f3f feat: optimize code push check to only push if sync is enabled and code URL is present 2023-11-10 12:26:53 +01:00
Nikita Galaiko
b2c97fcc89 fix: fix order of commit descriptions in assertion statements 2023-11-10 12:19:57 +01:00
Nikita Galaiko
67cea3c292
Merge pull request #1551 from gitbutlerapp/gb-601-squash-commits-ui 
GB-601: squash commits ui
 2023-11-10 10:42:24 +01:00
Nikita Galaiko
35dce0b728 fix draggable commit apperance 2023-11-10 10:34:20 +01:00
Mattias Granlund
b6e039115f Fix syntax highlighting backgrounds 2023-11-10 09:04:38 +00:00
Nikita Galaiko
dc2e8accfe simplify draggable 2023-11-10 09:09:29 +01:00
Nikita Galaiko
c144a82e36 feat: squash commits 2023-11-10 09:05:20 +01:00
Nikita Galaiko
41710e8656
Merge pull request #1549 from gitbutlerapp/add-squash-function 
GB-601 Add squash function
 2023-11-09 13:45:19 +01:00
Nikita Galaiko
ed8e348bfe feat: squash api 2023-11-09 13:00:14 +01:00
Kiril Videlov
1f7bcd05fb remove dead code 2023-11-08 18:45:32 +01:00
Mattias Granlund
308edbe1b9 Fix "open in vscode" context menu 2023-11-08 16:34:11 +00:00
Mattias Granlund
b101c1db58 Make pull request cache work with new store functionality 
This makes it load early based on cached results, followed up
with results from the API.
 2023-11-08 16:14:42 +00:00
Mattias Granlund
6809ada374 Bump the forked square/svelte-store library version 2023-11-08 16:11:20 +00:00
extrawurst
e94631cbb1 remove unused code 2023-11-08 16:36:11 +01:00
extrawurst
7e0a5844c4
GB-627: Session flush command (#1539) 2023-11-08 16:34:33 +01:00
Nikita Galaiko
26acd86063
Merge pull request #1542 from gitbutlerapp/remove-git-remote-branches-data 
Remove git remote branches data
 2023-11-08 15:08:34 +01:00
Mattias Granlund
8f9f29e8d6 Drop unused file 2023-11-08 13:48:08 +00:00
Nikita Galaiko
b277992391 move virtual branches call into controller 2023-11-08 14:38:27 +01:00
Nikita Galaiko
43ffb2dc05 extract bookmarks controller 2023-11-08 13:32:46 +01:00
Nikita Galaiko
21f678b273 extract deltas controller 2023-11-08 12:28:50 +01:00
extrawurst
7d7fbbb513 * not not try to push code to gb every tick 
* use same tick interval as for fetch: 15min
* flush leading to push is unaffected by this
 2023-11-08 12:08:48 +01:00
Mattias Granlund
3c9a1a3170 Make remote branch peek into page 2023-11-08 10:47:47 +00:00
Nikita Galaiko
cc900b911d
Merge pull request #1536 from gitbutlerapp/remove-log-tree-function 
Remove log tree function
 2023-11-08 11:13:49 +01:00
Nikita Galaiko
76c871bebe do not flush logs tree 2023-11-08 10:51:00 +01:00
Nikita Galaiko
14b25966e5 fix: handle removed files correctly when building working directory tree 2023-11-08 10:48:09 +01:00
Mattias Granlund
35cc2a5870 Make pull request peek into page 2023-11-08 09:46:02 +00:00
Nikita Galaiko
872079fc8a
Merge pull request #1532 from gitbutlerapp/add-sessions-controller 
Add sessions controller
 2023-11-08 10:45:53 +01:00
Nikita Galaiko
89f4ee7899
Merge pull request #1533 from gitbutlerapp/remove-git-gb-push 
Remove git gb push
 2023-11-08 10:45:45 +01:00
dependabot[bot]
cf28889d79
chore(deps-dev): bump prettier-plugin-tailwindcss from 0.5.4 to 0.5.6 (#1523) 
Bumps [prettier-plugin-tailwindcss](https://github.com/tailwindlabs/prettier-plugin-tailwindcss) from 0.5.4 to 0.5.6.
- [Release notes](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/releases)
- [Changelog](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/tailwindlabs/prettier-plugin-tailwindcss/compare/v0.5.4...v0.5.6)

---
updated-dependencies:
- dependency-name: prettier-plugin-tailwindcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-11-08 09:09:45 +00:00
dependabot[bot]
64efd859b3
chore(deps-dev): bump @codemirror/state from 6.2.1 to 6.3.1 (#1522) 
Bumps [@codemirror/state](https://github.com/codemirror/state) from 6.2.1 to 6.3.1.
- [Changelog](https://github.com/codemirror/state/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/state/compare/6.2.1...6.3.1)

---
updated-dependencies:
- dependency-name: "@codemirror/state"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-11-08 09:09:34 +00:00
dependabot[bot]
bec7bafa96
chore(deps): bump tokio-util from 0.7.9 to 0.7.10 
Bumps [tokio-util](https://github.com/tokio-rs/tokio) from 0.7.9 to 0.7.10.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/commits)

---
updated-dependencies:
- dependency-name: tokio-util
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-08 08:23:24 +00:00
Nikita Galaiko
18c83607bb
Merge pull request #1516 from gitbutlerapp/dependabot/cargo/chrono-0.4.31 
chore(deps): bump chrono from 0.4.29 to 0.4.31
 2023-11-08 09:20:46 +01:00
Nikita Galaiko
f8ef0e005a
Merge pull request #1515 from gitbutlerapp/dependabot/cargo/thiserror-1.0.50 
chore(deps): bump thiserror from 1.0.48 to 1.0.50
 2023-11-08 09:20:17 +01:00
Nikita Galaiko
84bb4f0eee rm unused methods 2023-11-08 09:18:12 +01:00
Nikita Galaiko
8e895a90c4 extract session commands 2023-11-08 09:16:40 +01:00
Mattias Granlund
e9cf8cfa7f
Remove vbranch peek (#1531) 
Make virtual branch peek into a page
 2023-11-07 16:56:32 +00:00
Kiril Videlov
53e97b9a77 feat: adds commit URL to CommitCard component to allow linking to the commit details page 2023-11-07 17:45:22 +01:00
extrawurst
fe0368219f workaround libgit2 limitation of not pushing wildcards: explicitly pushing all ref/gitbutler/.. refs 2023-11-07 17:23:56 +01:00
Kiril Videlov
ed8606d5e1 feat: add logic to determine whether to show HTTPS warning banner or not based on project configuration and environment variables 2023-11-07 17:17:14 +01:00
Nikita Galaiko
823672ff47
Merge pull request #1527 from gitbutlerapp/fix-session-indexing 
less aggressive session indexing hack
 2023-11-07 14:54:20 +01:00
Nikita Galaiko
5027509640 cargo fmt 2023-11-07 14:02:57 +01:00
Nikita Galaiko
bd022452f1 less aggressive session indexing hack 2023-11-07 13:35:18 +01:00
Nikita Galaiko
3a3f8da54c make sure deleted files are removed from session/wd 2023-11-07 13:31:14 +01:00
Nikita Galaiko
735e23be83 chore: refactor code to remove unnecessary references in function signatures 2023-11-07 12:42:38 +01:00
Nikita Galaiko
90db1ae8c3
Merge pull request #1510 from gitbutlerapp/add-draggable-action 
Add draggable action
 2023-11-07 08:52:43 +01:00
Nikita Galaiko
5496cfb7b1 refactor to have flat function arguments 2023-11-07 08:51:17 +01:00
dependabot[bot]
c2e5b1bc5f chore(deps-dev): bump @codemirror/view from 6.21.4 to 6.22.0 
Bumps [@codemirror/view](https://github.com/codemirror/view) from 6.21.4 to 6.22.0.
- [Changelog](https://github.com/codemirror/view/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/view/compare/6.21.4...6.22.0)

---
updated-dependencies:
- dependency-name: "@codemirror/view"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-07 06:38:20 +00:00
dependabot[bot]
8314d525fc chore(deps-dev): bump @sveltejs/kit from 1.24.1 to 1.27.3 
Bumps [@sveltejs/kit](https://github.com/sveltejs/kit/tree/HEAD/packages/kit) from 1.24.1 to 1.27.3.
- [Release notes](https://github.com/sveltejs/kit/releases)
- [Changelog](https://github.com/sveltejs/kit/blob/master/packages/kit/CHANGELOG.md)
- [Commits](https://github.com/sveltejs/kit/commits/@sveltejs/kit@1.27.3/packages/kit)

---
updated-dependencies:
- dependency-name: "@sveltejs/kit"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-07 06:38:09 +00:00
dependabot[bot]
8fff608165 chore(deps-dev): bump eslint from 8.52.0 to 8.53.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.52.0 to 8.53.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.52.0...v8.53.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-07 06:38:00 +00:00
Kiril Videlov
20baf0a2f5 feat: remove BackButton component from Upstream page, add ProjectHeader component to Trunk and Board pages 2023-11-06 17:18:15 +01:00
dependabot[bot]
d07530d554
chore(deps): bump chrono from 0.4.29 to 0.4.31 
Bumps [chrono](https://github.com/chronotope/chrono) from 0.4.29 to 0.4.31.
- [Release notes](https://github.com/chronotope/chrono/releases)
- [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md)
- [Commits](https://github.com/chronotope/chrono/compare/v0.4.29...v0.4.31)

---
updated-dependencies:
- dependency-name: chrono
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-06 15:36:05 +00:00
dependabot[bot]
b77e604ebb
chore(deps): bump thiserror from 1.0.48 to 1.0.50 
Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.48 to 1.0.50.
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.48...1.0.50)

---
updated-dependencies:
- dependency-name: thiserror
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-06 15:35:48 +00:00
Nikita Galaiko
1aeedbba4d allow amending locked hunks 2023-11-06 15:56:21 +01:00
Nikita Galaiko
7389091c18 refactor dropzone and draggable functions to support dynamic updating of options 2023-11-06 15:50:58 +01:00
Nikita Galaiko
fe03c342f0 review fixes 2023-11-06 15:38:41 +01:00
Nikita Galaiko
8917e3b9ba git: treat ssh key error as auth error 2023-11-06 15:24:08 +01:00
Nikita Galaiko
e5ee060eaf re-enable branch reorder 2023-11-06 14:15:17 +01:00
Nikita Galaiko
26800a81c6 purge branch re-order 2023-11-06 13:44:55 +01:00
Nikita Galaiko
f4f140afa5 new branch dropzone works again 2023-11-06 13:36:14 +01:00
Nikita Galaiko
6bcf1f90c6 fix dragable bug 2023-11-06 13:36:03 +01:00
Nikita Galaiko
7f6e391347 cherry picking works again 2023-11-06 13:13:16 +01:00
Nikita Galaiko
97cd2d4920 ammendable commit card 2023-11-06 12:53:47 +01:00
Nikita Galaiko
b31441b888 drag & amend works 2023-11-06 11:41:18 +01:00
Nikita Galaiko
f946a58d5f feat: use From instead of TryForm where possible 2023-11-06 10:57:00 +01:00
Nikita Galaiko
7dc9f45d1a chore: refactor Controller initialization to use from method instead of try_from for improved code readability and consistency 2023-11-06 10:32:12 +01:00
Mattias Granlund
fff966a063 Fix event propagation for cherry picking 2023-11-03 15:01:40 +01:00
Nikita Galaiko
f00aa38677
Merge pull request #1508 from gitbutlerapp/add-test-for-dirty-function 
GB-626
 2023-11-03 14:47:38 +01:00
Nikita Galaiko
5581a476e9 refresh sessions on vbranch updates 2023-11-03 14:30:40 +01:00
Nikita Galaiko
1a5cda3799 extra check for sessions indexer 2023-11-03 14:30:30 +01:00
Nikita Galaiko
7480ac20be
Merge pull request #1506 from gitbutlerapp/create-virtual-branch-reference 
Create virtual branch reference
 2023-11-03 13:30:44 +01:00
Mattias Granlund
d2ba79a695 Prevent navigation on clicking refresh button 2023-11-03 13:28:48 +01:00
Nikita Galaiko
40bf6c6670 add missing reference creation 2023-11-03 13:08:37 +01:00
Mattias Granlund
58a74873fe Fix button that takes you back to integration branch 2023-11-03 12:37:27 +01:00
Mattias Granlund
91dd37e570 Make base branch popout into page 2023-11-03 12:06:20 +01:00
Kiril Videlov
232a0dcf01 feat: add ProjectHeader component to display project title and GitHub icon, update SVG components to spread props for reusability 2023-11-02 17:34:15 +01:00
extrawurst
dc4fddf81f code push ends with pushing all gb refs 2023-11-02 16:20:39 +01:00
Mattias Granlund
7a787f53eb chore: use correct BranchLane import name 2023-11-02 14:48:44 +01:00
extrawurst
918a093d89
GB-613 push project code to gb repo (#1479) 2023-11-02 14:45:50 +01:00
Mattias Granlund
0513ccccdb Fix settings UI by refactoring layout structure 2023-11-02 12:52:29 +01:00
Kiril Videlov
85022032fe fix: mergeability check for remote branches is not suitable for eager execution because it's expensive and the results are not immediatelly needed 2023-11-02 12:08:03 +01:00
Nikita Galaiko
b0aac0d3dc
Merge pull request #1492 from gitbutlerapp/add-amend-virtual-branch-command 
Add amend virtual branch command
 2023-11-02 10:47:11 +01:00
Mattias Granlund
4b51ebc565 Fix navigation after adding new project 2023-11-02 10:47:04 +01:00
Nikita Galaiko
911f884552 ensure can amend only to the same branch 2023-11-02 10:25:54 +01:00
Nikita Galaiko
67fce382d9 merged upstream 2023-11-02 09:45:45 +01:00
Nikita Galaiko
52089f8ab1
Merge pull request #1494 from gitbutlerapp/symlinks 
symlinks
 2023-11-02 09:45:36 +01:00
Nikita Galaiko
531bff3061 satisfy cranky 2023-11-02 09:21:05 +01:00
Nikita Galaiko
3ebd071e9e do not unwrap 2023-11-02 09:19:28 +01:00
Nikita Galaiko
ede64d3501 recursive link test 2023-11-02 09:00:07 +01:00
Nikita Galaiko
0edbfc1a54 fix: handle symlinks correctly when adding and flushing files in the repository 2023-11-02 08:43:25 +01:00
Mattias Granlund
c5f53f003f Add back tauri dragger to top left corner 2023-11-01 17:20:22 +01:00
Mattias Granlund
c9ba804674 Fix imports and drop unused page file 2023-11-01 17:16:55 +01:00
Mattias Granlund
83b3df7315 Create new page for board in nested layout 2023-11-01 17:16:55 +01:00
Nikita Galaiko
b221254257 to_same_branch working 2023-11-01 14:44:47 +01:00
Mattias Granlund
a3dc701a8f Create modules under $lib 2023-11-01 14:01:08 +01:00
Mattias Granlund
9c0e4bd427 Move sentry and posthog into analytics module 2023-11-01 14:01:08 +01:00
Mattias Granlund
72d59d1fa2 Rename lib/api -> lib/backend 2023-11-01 14:01:08 +01:00
Mattias Granlund
f2e609e791 Flatten the front end api folder 2023-11-01 14:01:08 +01:00
Nikita Galaiko
693e92119d add tests 2023-11-01 13:45:13 +01:00
Nikita Galaiko
ad7d0d6f62 feat: allow amending hunks to the branch top commit 2023-11-01 13:42:58 +01:00
Nikita Galaiko
ba0069e6ae fix hunk locking 2023-11-01 13:27:12 +01:00
Nikita Galaiko
78c179389b
Merge pull request #1487 from gitbutlerapp/refactor-get-applied-status-function 
Refactor get applied status function
 2023-11-01 12:17:05 +01:00
Nikita Galaiko
65b1d7ed38 simplify virtual branch types conversion 2023-11-01 11:54:59 +01:00
Mattias Granlund
f10a443606 Move svelte lib components into a flat directory 2023-11-01 11:47:00 +01:00
Mattias Granlund
84121b94f0 Move a few more files 2023-11-01 11:47:00 +01:00
Mattias Granlund
b8d163de89 Remove histoire since it's not useful 2023-11-01 11:47:00 +01:00
Mattias Granlund
5916d9ac82 Rearrange stuff in the [projectId] route 2023-11-01 11:47:00 +01:00
Mattias Granlund
01dd7972fb Rename projects route to 'old' 2023-11-01 11:07:05 +01:00
Mattias Granlund
b597cc5310 Remove more unused Svelte code 2023-11-01 10:48:23 +01:00
Mattias Granlund
a75abcef6c Remove unnecessary nesting of repo route 2023-11-01 10:37:46 +01:00
Mattias Granlund
986490fb37 Remove a bunch of unused front end code 2023-11-01 10:22:41 +01:00
Kiril Videlov
f594f2c762 chore: update modal title to clarify purpose of sharing data with GitButler team 2023-11-01 09:54:17 +01:00
extrawurst
e1a13b4cd1 cleanup to be more idiomatic rust by warpping the shared resource inside a Mutex 2023-10-31 20:16:40 +01:00
Mattias Granlund
c48a0f40a3 Fix lint error 2023-10-31 17:21:08 +01:00
Mattias Granlund
cfd3b0d72b Add email button that was lost 2023-10-31 17:21:08 +01:00
Mattias Granlund
7dc7a2259b Remove header and footer in favor of left hand navigation 2023-10-31 16:55:41 +01:00
Nikita Galaiko
c54a8f283d ✨ feat: add support for caching and retrieving authenticated user information from GitHub API 
The changes include:
- Added a new function `getAuthenticatedWithCache` in `client/src/lib/github/user.ts` to retrieve authenticated user information from the GitHub API and cache it using `lscache`
- Added a new function `getAuthenticated` in `client/src/lib/github/user.ts` to retrieve authenticated user information from the GitHub API
- Updated the `userStore` in `client/src/lib/stores/user.ts` to include a new property `github_username` to store the GitHub username of the authenticated user
- Updated the `gitHubOauthCheckStatus` function in `client/src/routes/auth/github.ts` to set the `github_username` property of the `userStore` with the authenticated user's username
- Updated the `openURL` function in `client/src/cmd/login.go` to check for the presence of `DESKTOP_SESSION` or `XDG_CURRENT_DESKTOP`
 2023-10-31 13:25:21 +01:00
Nikita Galaiko
1720fb098f
Merge pull request #1446 from gitbutlerapp/dependabot/cargo/async-trait-0.1.74 
Bump async-trait from 0.1.73 to 0.1.74
 2023-10-31 12:04:49 +01:00
Nikita Galaiko
5b2e87c003
Merge pull request #1448 from gitbutlerapp/dependabot/cargo/ssh-key-0.6.2 
Bump ssh-key from 0.6.1 to 0.6.2
 2023-10-31 12:04:42 +01:00
Nikita Galaiko
181c83e792
Merge pull request #1449 from gitbutlerapp/dependabot/cargo/tokio-1.33.0 
Bump tokio from 1.32.0 to 1.33.0
 2023-10-31 12:04:35 +01:00
Nikita Galaiko
6c4e47f19f
Merge pull request #1473 from gitbutlerapp/add-drag-and-drop-support-for-commit-cards 
Add drag and drop support for commit cards
 2023-10-31 11:59:07 +01:00
Nikita Galaiko
7dcdd959ed fix cherry pick conflict resolution 2023-10-31 11:52:11 +01:00
Mattias Granlund
c5c5152bf2 Extract header and footer into their own components 2023-10-31 10:43:02 +01:00
Mattias Granlund
1d983516ed chore: fix formatting 2023-10-31 10:42:49 +01:00
dependabot[bot]
e92a87f65e chore(deps-dev): bump marked from 9.1.3 to 9.1.4 
Bumps [marked](https://github.com/markedjs/marked) from 9.1.3 to 9.1.4.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v9.1.3...v9.1.4)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-31 10:40:00 +01:00
Mattias Granlund
d41c2d1e7d Remove use of null from user store 2023-10-31 10:39:50 +01:00
dependabot[bot]
4c4327a3a0 chore(deps-dev): bump vite from 4.4.9 to 4.5.0 
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.4.9 to 4.5.0.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v4.5.0/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-31 10:39:37 +01:00
dependabot[bot]
080f10f4eb chore(deps-dev): bump marked from 9.0.3 to 9.1.3 
Bumps [marked](https://github.com/markedjs/marked) from 9.0.3 to 9.1.3.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v9.0.3...v9.1.3)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-31 10:36:14 +01:00
dependabot[bot]
595aae95c5 chore(deps-dev): bump svelte from 4.2.1 to 4.2.2 
Bumps [svelte](https://github.com/sveltejs/svelte/tree/HEAD/packages/svelte) from 4.2.1 to 4.2.2.
- [Release notes](https://github.com/sveltejs/svelte/releases)
- [Changelog](https://github.com/sveltejs/svelte/blob/master/packages/svelte/CHANGELOG.md)
- [Commits](https://github.com/sveltejs/svelte/commits/svelte@4.2.2/packages/svelte)

---
updated-dependencies:
- dependency-name: svelte
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-31 10:36:06 +01:00
dependabot[bot]
4da0edaf63 chore(deps-dev): bump autoprefixer from 10.4.15 to 10.4.16 
Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 10.4.15 to 10.4.16.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/10.4.15...10.4.16)

---
updated-dependencies:
- dependency-name: autoprefixer
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-31 10:35:59 +01:00
dependabot[bot]
06498cdfbf chore(deps-dev): bump @codemirror/view from 6.18.0 to 6.21.4 
Bumps [@codemirror/view](https://github.com/codemirror/view) from 6.18.0 to 6.21.4.
- [Changelog](https://github.com/codemirror/view/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/view/compare/6.18.0...6.21.4)

---
updated-dependencies:
- dependency-name: "@codemirror/view"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-31 10:35:51 +01:00
Nikita Galaiko
8922c60ad9 gap between upstream commits 2023-10-31 09:55:17 +01:00
Nikita Galaiko
97d6be48f0 refactor cherry picking 2023-10-31 08:45:53 +01:00
Nikita Galaiko
b773901683 cherry pick ui 2023-10-31 08:45:46 +01:00
dependabot[bot]
7586d6a233 Bump eslint from 8.50.0 to 8.52.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.50.0 to 8.52.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.50.0...v8.52.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-30 15:47:23 +01:00
dependabot[bot]
e7a88aead5 chore(deps-dev): bump @lezer/common from 1.0.4 to 1.1.0 
Bumps [@lezer/common](https://github.com/lezer-parser/common) from 1.0.4 to 1.1.0.
- [Changelog](https://github.com/lezer-parser/common/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lezer-parser/common/compare/1.0.4...1.1.0)

---
updated-dependencies:
- dependency-name: "@lezer/common"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-30 13:07:58 +01:00
dependabot[bot]
5a0d33cf95 chore(deps-dev): bump @typescript-eslint/parser from 6.7.3 to 6.9.0 
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.7.3 to 6.9.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.9.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-30 13:06:57 +01:00
dependabot[bot]
e3b379e684 Bump posthog-js from 1.81.2 to 1.84.2 
Bumps [posthog-js](https://github.com/PostHog/posthog-js) from 1.81.2 to 1.84.2.
- [Release notes](https://github.com/PostHog/posthog-js/releases)
- [Changelog](https://github.com/PostHog/posthog-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/PostHog/posthog-js/compare/v1.81.2...v1.84.2)

---
updated-dependencies:
- dependency-name: posthog-js
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-30 13:03:47 +01:00
dependabot[bot]
219f5e32bf chore(deps-dev): bump eslint-import-resolver-typescript 
Bumps [eslint-import-resolver-typescript](https://github.com/import-js/eslint-import-resolver-typescript) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/import-js/eslint-import-resolver-typescript/releases)
- [Changelog](https://github.com/import-js/eslint-import-resolver-typescript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-import-resolver-typescript/compare/v3.6.0...v3.6.1)

---
updated-dependencies:
- dependency-name: eslint-import-resolver-typescript
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-30 13:03:33 +01:00
Nikita Galaiko
b896c34b70
Merge pull request #1464 from gitbutlerapp/handle-missing-default-target 
🔧 fix: handle case when default target is not set
 2023-10-30 10:11:08 +02:00
Nikita Galaiko
2a43aff7de 🔧 fix: handle case when default target is not set 2023-10-30 08:54:15 +01:00
Nikita Galaiko
a0a6b6090d
Merge pull request #1463 from gitbutlerapp/fix-project-fetch-error 
do not log auth error
 2023-10-30 09:52:04 +02:00
Nikita Galaiko
e24f00864a do not log auth error 2023-10-30 08:37:36 +01:00
dependabot[bot]
41707dfad5
Bump ssh-key from 0.6.1 to 0.6.2 
Bumps [ssh-key](https://github.com/RustCrypto/SSH) from 0.6.1 to 0.6.2.
- [Commits](https://github.com/RustCrypto/SSH/compare/ssh-key/v0.6.1...ssh-key/v0.6.2)

---
updated-dependencies:
- dependency-name: ssh-key
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-28 19:52:24 +00:00
Kiril Videlov
5f1ef9149c chore: update tauri-plugin-context-menu dependency to use the gitbutlerapp repository instead of c2r0b repository 
This is a workaround for the lacking linux support, we want to at least be able to compile
 2023-10-28 21:51:30 +02:00
Kiril Videlov
19e933d713 feat: add filter functionality to pull requests listing in project view using the native context menu 2023-10-28 21:51:30 +02:00
Kiril Videlov
a9f1da75af chore: move expand/collapse to the left 2023-10-28 19:25:12 +02:00
Kiril Videlov
579807687c feat: add IconFilter component and its SVG markup 2023-10-28 19:24:03 +02:00
Kiril Videlov
3eba2c9bdb feat: add caching mechanism for pull requests list to improve performance and handle offline scenarios 2023-10-27 17:52:15 +03:00
Kiril Videlov
b0374e2f7a chore: remove duplicate RemoteBranches component 2023-10-25 22:24:38 +02:00
Kiril Videlov
8b5b37102e feat: add support for displaying and interacting with pull requests in the branch peek component 2023-10-25 22:24:38 +02:00
Nikita Galaiko
2d64d29c47 refactor: avoid mutation 2023-10-24 14:51:24 +02:00
Nikita Galaiko
304ee291aa
Merge pull request #1454 from gitbutlerapp/add-merge-function-and-integrated-commits-test 
fix integrated commit detection
 2023-10-24 14:18:03 +02:00
Nikita Galaiko
f66c1e4db7 cranky fixes 2023-10-24 14:10:06 +02:00
Nikita Galaiko
687d73897a cargo fmt 2023-10-24 13:57:43 +02:00
Nikita Galaiko
52757a4ad5 better imitate a real remote merge 2023-10-24 13:57:22 +02:00
Nikita Galaiko
c0c8ac8133 fix integrated commit detection 2023-10-24 13:49:06 +02:00
Nikita Galaiko
7c56f41ab1 when choosing upstream branch name, ignore case 2023-10-24 12:46:59 +02:00
Nikita Galaiko
48b16b8881
Merge pull request #1443 from gitbutlerapp/add-cherry-pick-method 
feat: cherry pick onto virtual branch
 2023-10-24 08:45:46 +02:00
dependabot[bot]
efbd5fbe34
Bump tokio from 1.32.0 to 1.33.0 
Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.32.0 to 1.33.0.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.32.0...tokio-1.33.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-23 15:37:26 +00:00
dependabot[bot]
6f5f3aa811
Bump async-trait from 0.1.73 to 0.1.74 
Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.73 to 0.1.74.
- [Release notes](https://github.com/dtolnay/async-trait/releases)
- [Commits](https://github.com/dtolnay/async-trait/compare/0.1.73...0.1.74)

---
updated-dependencies:
- dependency-name: async-trait
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-23 15:36:15 +00:00
Nikita Galaiko
04007e5e87 expose cherry pick api 2023-10-23 15:57:44 +02:00
Nikita Galaiko
552fe0c5cd cherry-pick onto virtual branch 2023-10-23 15:51:31 +02:00
Nikita Galaiko
c3f63b5b3a
Merge pull request #1444 from gitbutlerapp/proxy-virtual-branch-with-upstream 
🔨 chore: add support for proxying upstream branch in `proxy_virtual_b…
 2023-10-23 15:29:04 +02:00
Nikita Galaiko
40d24641db 🔨 chore: add support for proxying upstream branch in proxy_virtual_branch method 2023-10-23 15:22:32 +02:00
extrawurst
0dadd38809
GB-623: make sure integration is up to date after flushing all vbranches (#1442) 
make sure the integration update happens after flushing the vbranch trees
 2023-10-23 13:18:37 +00:00
extrawurst
1925a06ce0
run cranky locally in nightly + clippy fixes (#1441) 
* cleanup one `partial_pub_fields` lint
* run cranky locally in nightly too to align CI lints
 2023-10-23 10:45:25 +00:00
Nikita Galaiko
2addf81189 fix cranky 2023-10-23 10:05:20 +02:00
Nikita Galaiko
3d14551ed2 add validation error code 2023-10-23 09:37:54 +02:00
Nikita Galaiko
638620337e open less repos when reindexing 2023-10-20 15:01:43 +02:00
Nikita Galaiko
2b68cd23ce bring back index handler 2023-10-20 14:52:29 +02:00
Nikita Galaiko
7d2dbb1b8a log app name on start 2023-10-20 14:24:40 +02:00
Nikita Galaiko
6ee208c611 rm tantivy dependency 2023-10-20 13:34:33 +02:00
Nikita Galaiko
8a568e5737 cargo fmt 2023-10-20 13:18:56 +02:00
Nikita Galaiko
519a7e7a25 rm search from rust 2023-10-20 13:11:48 +02:00
Nikita Galaiko
01180178fb rm search from ui 2023-10-20 13:07:18 +02:00
Nikita Galaiko
54a4bc204e ensure gravatars are always cached 2023-10-20 09:42:23 +02:00
Nikita Galaiko
9f9d1e4149 dark mode: fix upstream commit bg 2023-10-20 09:07:14 +02:00
Nikita Galaiko
048b118569 cleanup some cranky rules 2023-10-19 15:25:27 +02:00
Nikita Galaiko
0c88552d00 fix cranky 2023-10-19 14:52:56 +02:00
Nikita Galaiko
aefc469b97 refactor: rm extra mut 2023-10-19 14:32:57 +02:00
Nikita Galaiko
e1fcc5546f show force push when upstream commits present 2023-10-19 13:41:42 +02:00
Nikita Galaiko
701937ea06 only add disk alternate when creating gb_repo 
it will be read from disk otherwise
 2023-10-19 11:29:20 +02:00
Nikita Galaiko
0fe5f109c3
Merge pull request #1421 from gitbutlerapp/handle-upstream-branch-not-found 
🔨 chore: improve error handling when finding upstream branch for list…
 2023-10-19 10:54:04 +02:00
Nikita Galaiko
f395c541db 🔨 chore: improve error handling when finding upstream branch for listing virtual branches 2023-10-19 10:48:57 +02:00
Nikita Galaiko
cddc3e0fff cranky 2023-10-19 10:37:09 +02:00
Nikita Galaiko
f3decc57e0 return upstream name too 2023-10-19 10:29:33 +02:00
Nikita Galaiko
df098e8d57 fix local branch name serialization 2023-10-19 10:23:58 +02:00
Nikita Galaiko
6044cf874d move upstream detection tests to integration 2023-10-19 09:59:57 +02:00
Nikita Galaiko
d8a54e5c49
Merge pull request #1416 from gitbutlerapp/make-vbranch-remote-a-branch 
Make vbranch remote a branch
 2023-10-19 09:51:02 +02:00
Nikita Galaiko
8cff188c6e cranky fix! 2023-10-19 09:39:59 +02:00
Nikita Galaiko
a76ff7b988 🔨 chore: improve error handling when writing alternates file 2023-10-19 09:36:24 +02:00
Nikita Galaiko
36eea73e52 🔨 chore: update references to branch upstream and upstreamCommits in client code 
The changes in this commit update the references to the `branch.upstream` property and `branch.upstreamCommits` array in the client code. The code now uses the `branch.upstream.name` property instead of `branch.upstream` and `branch.upstream.commits` instead of `branch.upstreamCommits`. This change ensures that the code is compatible with the updated data structure.
 2023-10-19 09:30:31 +02:00
Nikita Galaiko
474cfa2249 🔨 chore: refactor branch upstream handling 2023-10-19 09:12:20 +02:00
Nikita Galaiko
45dce1ecea extract branch to remove branch 2023-10-19 08:50:53 +02:00
extrawurst
eb5b7ea6d3 fix new tests 2023-10-18 17:26:54 +02:00
extrawurst
bb56719d1e fix merge conflict 2023-10-18 16:45:40 +02:00
dependabot[bot]
f0e71a1c43 Bump sha2 from 0.10.7 to 0.10.8 
Bumps [sha2](https://github.com/RustCrypto/hashes) from 0.10.7 to 0.10.8.
- [Commits](https://github.com/RustCrypto/hashes/compare/sha2-v0.10.7...sha2-v0.10.8)

---
updated-dependencies:
- dependency-name: sha2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-18 16:39:41 +02:00
extrawurst
eb569b389c * cleanup combined bin/lib in gitbutler 
* gitbutler as a lib is `gblib` now and used accordingly by `butler`
* use `cargo-cranky` for shared lints across workspace until cargo supports Cargo.toml lints section in 1.75
 2023-10-18 16:39:14 +02:00
Nikita Galaiko
6afa9ad187
Merge pull request #1412 from gitbutlerapp/correctly-track-references 
correctly track local references
 2023-10-18 15:27:05 +02:00
Nikita Galaiko
6fb3cba980 correctly track local references 2023-10-18 15:17:09 +02:00
Kiril Videlov
0857b4483b 🔨 chore: add GitHub integration context to tray components 2023-10-18 14:50:37 +02:00
Kiril Videlov
1e23e77ffa 🔨 chore: move github context to page and inject into components 2023-10-18 14:50:37 +02:00
Kiril Videlov
3f74c66fb7 refactor: move remote branches out of tray and into their own component 2023-10-18 14:11:15 +02:00
Nikita Galaiko
b916eb8afe
Merge pull request #1409 from gitbutlerapp/allow-non-unique-branch-names 
move reset tests to integration
 2023-10-18 13:37:03 +02:00
dependabot[bot]
94d5730135 Bump clap from 4.4.2 to 4.4.6 
Bumps [clap](https://github.com/clap-rs/clap) from 4.4.2 to 4.4.6.
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.4.2...v4.4.6)

---
updated-dependencies:
- dependency-name: clap
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-18 13:27:41 +02:00
extrawurst
cd44939926 bump sha2, tokio-util, tauri and bstr. for consistency i pinned the tauri version to the specific semver like the others 2023-10-18 13:26:01 +02:00
Nikita Galaiko
b7e24fa4f4 move reset tests to integration 2023-10-18 13:23:55 +02:00
extrawurst
c5f5dc015f
check unused dependencies in ci (#1406) 
also
* remove unused `sentry-rust-minidump`
* use maintained rust toolchain github action
* make `init-env-rust` parameterized to allow picking `nightly`
 2023-10-18 12:52:37 +02:00
Nikita Galaiko
71f391926b
Merge pull request #1407 from gitbutlerapp/allow-non-unique-branch-names 
allow non unique branch names
 2023-10-18 12:33:41 +02:00
Nikita Galaiko
ab46442731 allow non unique branch names 2023-10-18 12:20:37 +02:00
extrawurst
f1d52adecb cleanup since we have a handcrafted posthog implementation and this cargo dep only made sure chrono has the feature serde enabled 2023-10-18 10:45:31 +02:00
Nikita Galaiko
fe14df8c66
Merge pull request #1404 from gitbutlerapp/single-instance 
ensure single instance
 2023-10-18 10:26:02 +02:00
Nikita Galaiko
210e748d15 ensure single instance 2023-10-18 10:14:37 +02:00
Nikita Galaiko
18c7fe74bd use backoff while fetching data in background 2023-10-18 09:59:58 +02:00
Nikita Galaiko
261ba4bf38
Merge pull request #1401 from gitbutlerapp/Fix-casts-and-types 
refactor: update type conversions and remove unnecessary clippy lints
 2023-10-17 15:51:31 +02:00
Nikita Galaiko
11e052fc82 fixup 2023-10-17 15:46:38 +02:00
extrawurst
0f4a799882
reduce dynamic allocations (#1402) 
* reduce dynamic allocations
 2023-10-17 15:30:46 +02:00
Nikita Galaiko
0cac4c29c0 refactor: update type conversions and remove unnecessary clippy lints 2023-10-17 15:05:40 +02:00
extrawurst
23741716f9
fix vbranch flushing to not flush non-applied vbranches (#1398) 
* fix vbranch flushing to not flush non-applied vbranches
* do not use `flush_vbranch_as_tree` when flushing all vbranches
 2023-10-17 15:03:19 +02:00
extrawurst
9bbfda975e use !any(f) to simplify and remove allocating collect 2023-10-17 14:57:41 +02:00
Nikita Galaiko
94f257e8b1 satisfy clippy 2023-10-17 14:40:11 +02:00