Commit Graph

7986 Commits

Author SHA1 Message Date
Sebastian Thiel
9da051b089
improve naming of tokens stored in the keychain: do not 'abuse' user field
Currently, the user is used as handle name, but instead, just name it
`GitButler`.
2024-07-02 10:02:46 +02:00
Sebastian Thiel
fbfeba0637
auto-delete a user if its access token can't be found 2024-07-02 10:02:46 +02:00
Sebastian Thiel
ee5ff95649
Assure Sensitive fields can't be serialized
This does not only mean that they cannot be written to disk, but also
that extra work has to be done to serialize them over the wire.

This is very much by design, as they can be in structs that are
seemingly serializable and contain sensitive data, but they must
never actually be serialized.

For use in the UI, an extra type must be used that marks the secret
differently, for instance by field name.
2024-07-02 10:02:45 +02:00
Sebastian Thiel
bc8f3b74c7
tauri specializes the secret-store depending on application type
That way, there is no overlap in the technically global store, just
like before when secrets were stored in plain text.
2024-07-02 10:02:45 +02:00
Sebastian Thiel
929eb52224
auto-migrate secrets from user.json to their location in the keyring
This will also remove them from their plain-text location.

Further, when the secrets are required they will be obtained
specifically, instead of always having them at hand.

The frontend doesn't ever show these, but needs them, and
it now asks for them when it needs them.
2024-07-02 10:02:43 +02:00
Sebastian Thiel
f3e6c7ba94
Add the capability to store and retrieve secrets
This is a global facility without any state, and provides a simplified
interface to the `keyring` crate.
2024-07-02 10:01:44 +02:00
Sebastian Thiel
cedb893ad6
put 'core::serde' into its own module file
It started small, but now is large enough to warrant that.
2024-07-02 10:01:44 +02:00
Kiril Videlov
4db2698cda
bump tauri minor version
this allows us to bundle RPM packages!
2024-07-02 10:48:47 +03:00
Caleb Owens
4d29cd0723
Get things working a little tiny bit more 2024-07-01 21:09:10 +02:00
Kiril Videlov
18006a9f2a
Merge pull request #4212 from gitbutlerapp/dependabot/cargo/tauri-plugin-log-862c42a 2024-07-01 19:05:22 +02:00
Kiril Videlov
abae97fea0
Merge pull request #4213 from gitbutlerapp/dependabot/cargo/tauri-plugin-single-instance-862c42a 2024-07-01 19:05:06 +02:00
Kiril Videlov
dbba13f16b
Merge pull request #4214 from gitbutlerapp/dependabot/cargo/tauri-plugin-store-862c42a 2024-07-01 19:04:55 +02:00
Kiril Videlov
8a46a6c496
Merge pull request #4215 from gitbutlerapp/dependabot/cargo/tauri-plugin-window-state-862c42a 2024-07-01 19:04:47 +02:00
ndom91
b1b390ce72
fix: ui export map 2024-07-01 18:58:40 +02:00
ndom91
74383ba239
fix: prettier 2024-07-01 18:48:22 +02:00
ndom91
b46c2c4d5b
feat: add initial turbo cli 2024-07-01 18:47:43 +02:00
dependabot[bot]
34673ef938
Bump tauri-plugin-window-state from 5e3900e to 862c42a
Bumps [tauri-plugin-window-state](https://github.com/tauri-apps/plugins-workspace) from `5e3900e` to `862c42a`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](5e3900e682...862c42a457)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-01 15:42:06 +00:00
dependabot[bot]
b60e5a2714
Bump tauri-plugin-store from 5e3900e to 862c42a
Bumps [tauri-plugin-store](https://github.com/tauri-apps/plugins-workspace) from `5e3900e` to `862c42a`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](5e3900e682...862c42a457)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-01 15:41:06 +00:00
dependabot[bot]
523bfa5160
Bump tauri-plugin-single-instance from 5e3900e to 862c42a
Bumps [tauri-plugin-single-instance](https://github.com/tauri-apps/plugins-workspace) from `5e3900e` to `862c42a`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](5e3900e682...862c42a457)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-01 15:40:13 +00:00
dependabot[bot]
f001fc819b
Bump tauri-plugin-log from 5e3900e to 862c42a
Bumps [tauri-plugin-log](https://github.com/tauri-apps/plugins-workspace) from `5e3900e` to `862c42a`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](5e3900e682...862c42a457)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-01 15:37:54 +00:00
Caleb Owens
82c3987d45
Unapply to real branches (#4025)
* Don't return optional

* Rename get_integration_commiter

* Add a header to wip commit

* Stuff

* Unapply all branches

* Reorder code

* Fix one test

* Name resolution

* Fix two tests

* Fix another!

* wip

* Fix so many tests

* Fix unapply.rs tests

* Fix selected for changes tests

* Move unapplying logic to delete_branch method

* Remove unused and kinda borked cherry_commit code

* Fix the tests!!!!!

* Make apply_branch private

* Change handling of headers

* Improve order integrity

* Updated types and comments to convey more meaning
2024-07-01 14:13:52 +00:00
ndom91
b8e51eeeee
fix: ui export map 2024-07-01 13:53:05 +02:00
Nico Domino
9aac60b1e4
fix: add Sentry RewriteFrames integration (#4210) 2024-07-01 13:38:15 +02:00
ndom91
911c2230c9
fix: fix test import paths 2024-07-01 13:37:52 +02:00
ndom91
cdc4359003
fix: prettier ui/package.json 2024-07-01 13:34:20 +02:00
ndom91
f0ae83fda5
fix: move CommitLines dir and update export map 2024-07-01 13:04:47 +02:00
Nico Domino
6f403b9325
Merge branch 'master' into ndom91/create-gitbutler-ui-package 2024-07-01 10:28:55 +02:00
Mattias Granlund
d4c0b97f7d Use pr source branch as title in branch list 2024-06-30 19:56:44 +03:00
Mattias Granlund
8851780851 Fix bug related to switching from integration branch
- value of projects store should never be undefined
2024-06-30 19:53:19 +03:00
Pavel Laptev
d9f314f49b
Do not allow pxToRem function get undifined (#4206)
* Do not allow `pxToRem` function get `undifined`

* `TextBox` width fix
2024-06-29 15:26:44 +02:00
Mattias Granlund
7f929837f9 Show remote branch using name instead of sha
- multiple branches can have the same sha
2024-06-28 17:58:42 +03:00
Mattias Granlund
7073308c9a Drop unused symbols
- been meaing to remove these for a while
2024-06-28 15:41:03 +03:00
ndom91
5b9991b93c
fix: types in ui package 2024-06-28 13:39:06 +02:00
Mattias Granlund
9912e2df40 chore: update incorrect variable names in BranchFooter 2024-06-28 14:38:10 +03:00
ndom91
3dfcc5a1a9
fix: playwright/test GHA 2024-06-28 13:30:52 +02:00
Mattias Granlund
0082099f8c Fix bug in PushButton component
- show selected action rather than preferred action
2024-06-28 14:23:21 +03:00
ndom91
e96987307c
fix: add GHA init-env-node prep for @gitbutler/ui consumption 2024-06-28 13:05:06 +02:00
ndom91
007f3516fe
fix: commitlines type import 2024-06-28 12:55:26 +02:00
ndom91
836b86a753
Merge branch 'master' into ndom91/create-gitbutler-ui-package 2024-06-28 12:50:44 +02:00
ndom91
d5e73ed8df
fix: update gitignore and vscode settings.json 2024-06-28 12:45:26 +02:00
ndom91
e8c36f10db
fix: cleanup ui vite config 2024-06-28 12:41:18 +02:00
ndom91
7bfadc5adb
fix: update eslint ignores 2024-06-28 12:16:04 +02:00
Mattias Granlund
fd3e846989 Fail gracefully if remote branch not found 2024-06-28 12:57:43 +03:00
ndom91
7e8ebdab76
fix: move globals dep to root 2024-06-28 11:57:16 +02:00
Kiril Videlov
720e50d5a5
Merge pull request #4200 from gitbutlerapp/refactor-move-error-marker
move error marker out of virtual_branches mod
2024-06-28 11:48:42 +02:00
ndom91
628fdd1459
fix: rename eslint/prettier configs to mjs in root 2024-06-28 11:42:22 +02:00
ndom91
e84946d9b5
fix: move eslint/prettier config to root 2024-06-28 11:40:36 +02:00
Mattias Granlund
8f052c04b7 Fix commit dialog backspace bug
- place curstor at end of commit title when backspacing from empty description
2024-06-28 12:39:07 +03:00
Kiril Videlov
b72f9c2199
move error marker out of virtual_branches mod
It's useful outside of it
2024-06-28 11:35:44 +02:00
ndom91
25068de8bb
fix: move eslint/prettier to root only 2024-06-28 11:34:54 +02:00