Scott Chacon
5527d2b6e2
initial implementation of different push target
2024-05-03 11:20:47 +02:00
Kiril Videlov
8ef46ce42c
snapshots: use subtrees for virtual_branches.toml
...
Instead of copying the file to the working directory, simply create a top level tree with a subtree for the workdir and a blob for the toml file
2024-05-03 11:13:55 +02:00
Mattias Granlund
5bb8c25aca
Fix bug in updating base branch
...
- drop "double lock across branches" test because it can't happen
- save correct tree when updating branch states
- use correct integration commit when updating base branch
2024-05-02 17:39:52 +02:00
Kiril Videlov
2e5684a965
Merge pull request #3671 from gitbutlerapp/advanced-commit-operations
...
puts advanced commit ops behind a feature flag
2024-05-02 05:59:03 -07:00
Kiril Videlov
c312e7a287
puts advanced commit ops behind a feature flag
2024-05-02 14:57:32 +02:00
Pavel Laptev
5ba8243fd7
Experimental features toggle card fix ( #3670 )
2024-05-02 14:16:27 +02:00
Pavel Laptev
a73089718d
Text case fix ( #3669 )
...
* Text case fix
2024-05-02 13:58:34 +02:00
Josh Junon
e3263774f6
Merge pull request #3668 from gitbutlerapp/simplify-default-target
...
simplify default target retrieval logic
2024-05-02 13:41:07 +02:00
Josh Junon
c9c3371ba2
Merge pull request #3665 from anaisbetts/better-npm-advice-2
...
Even Better npm advice
2024-05-02 13:33:01 +02:00
Josh Junon
c047e8bee4
Merge pull request #3667 from gitbutlerapp/remove-rust-init
...
eliminate rust-init step in CI
2024-05-02 13:30:04 +02:00
Josh Junon
6747da6e50
simplify default target retrieval logic
2024-05-02 13:28:21 +02:00
Josh Junon
77fbe558cc
only build gitbutler-git bins if testing
2024-05-02 13:07:33 +02:00
Josh Junon
bce6e48de8
init the rust env on windows check, too
2024-05-02 13:03:29 +02:00
Josh Junon
4625189cb9
remove use of cache
2024-05-02 13:00:25 +02:00
Josh Junon
f5ef57e74d
Merge pull request #3666 from gitbutlerapp/unix-timestamp
...
eliminate redundancy in unix timestamp retrieval
2024-05-02 12:56:48 +02:00
Josh Junon
6ae4f91ecc
eliminate rust-init step in CI
2024-05-02 12:52:44 +02:00
Josh Junon
664aadcd1c
eliminate redundancy in unix timestamp retrieval
2024-05-02 12:43:35 +02:00
Ani Betts
bcadd03b44
Fix a typo in our command
2024-05-02 12:22:51 +02:00
Ani Betts
ed15283c37
More notes, come correct with line lengths
2024-05-02 12:12:36 +02:00
Kiril Videlov
80d52153ae
Merge pull request #3664 from anaisbetts/better-npm-advice
...
Improve advice for npm prefix on Windows
2024-05-02 03:08:33 -07:00
Ani Betts
bce2754525
Improve advice for npm prefix on Windows
...
Instead of trouncing the Program Files permissions, let's set an npm prefix instead
2024-05-02 12:00:27 +02:00
Kiril Videlov
1fc12f0c78
Merge pull request #3663 from gitbutlerapp/add-telemetry-sidebar-menu-item
...
add-telemetry-sidebar-menu-item
2024-05-02 02:59:55 -07:00
Kiril Videlov
3b7387a4b3
put base branch switching behind a feature flag
2024-05-02 11:58:31 +02:00
Kiril Videlov
3326ae6b81
feat: a place in the settings for feature flags
2024-05-02 11:51:06 +02:00
Scott Chacon
ac4188819a
Merge pull request #3661 from gitbutlerapp/base-branch-commit-card-fix
...
Base branch commit cards should not be editable
2024-05-02 11:36:37 +02:00
Pavel Laptev
d7d4d0fef9
Switch base branch move to project settings ( #3662 )
...
* Remove scrollIntoView from select
- It cause the whole page scroll. For now I deleted this, but it's a nice feature, so planning to fix ti later
* Return `branch` in `setTargetBranch`
Because the result of this async function was `undefined`
* Updated `TextBox` and `SelectItem` styles
* Move base branch switcher to the `Setting` page
2024-05-02 11:29:37 +02:00
Scott Chacon
5f1559aff6
Base branch commit cards should not be editable
2024-05-02 11:12:16 +02:00
Kiril Videlov
a7a37e5c91
Merge pull request #3659 from gitbutlerapp/update-windows-latest
...
revert changes to windows version in ci
2024-05-02 02:05:54 -07:00
Kiril Videlov
ab4fae2c27
revert changes to windows version in ci
2024-05-02 10:47:28 +02:00
Kiril Videlov
e115c69042
Merge pull request #3657 from DrBarnabus/fix-branch-switcher-styling
...
fix: `.branch-switcher` styling in dark mode
2024-05-02 01:31:52 -07:00
Kiril Videlov
a7ed2eb695
Merge pull request #3658 from gitbutlerapp/update-macos-and-windows-platforms
...
update CI runners
2024-05-02 01:12:16 -07:00
Kiril Videlov
59ade99566
update CI runners
...
macos-latest is no longer x86, specifying 13 in order to have x86 builds back
2024-05-02 09:59:08 +02:00
Daniel Woodward
0dfdaa5f79
fix: .branch-switcher styling in dark mode
2024-05-01 22:15:44 +01:00
Kiril Videlov
c6b05d3ffb
Merge pull request #3655 from gitbutlerapp/dependabot/cargo/tauri-plugin-window-state-5e3900e
...
Bump tauri-plugin-window-state from `773b498` to `5e3900e`
2024-05-01 10:51:13 -07:00
Kiril Videlov
31797d1f61
Merge pull request #3654 from gitbutlerapp/dependabot/cargo/tauri-plugin-single-instance-5e3900e
...
Bump tauri-plugin-single-instance from `773b498` to `5e3900e`
2024-05-01 10:51:07 -07:00
Kiril Videlov
026723eb87
Merge pull request #3653 from gitbutlerapp/dependabot/cargo/tauri-plugin-store-5e3900e
...
Bump tauri-plugin-store from `773b498` to `5e3900e`
2024-05-01 10:51:02 -07:00
Kiril Videlov
6c0f4c0946
Merge pull request #3652 from gitbutlerapp/dependabot/cargo/tauri-plugin-log-5e3900e
...
Bump tauri-plugin-log from `773b498` to `5e3900e`
2024-05-01 10:50:58 -07:00
Kiril Videlov
80050fe230
Merge pull request #3651 from gitbutlerapp/dependabot/cargo/rust-updates-fd4bde4357
...
Bump the rust-updates group with 10 updates
2024-05-01 10:50:51 -07:00
dependabot[bot]
751db87188
Bump tauri-plugin-window-state from 773b498 to 5e3900e
...
Bumps [tauri-plugin-window-state](https://github.com/tauri-apps/plugins-workspace ) from `773b498` to `5e3900e`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases )
- [Commits](773b498392...5e3900e682
2024-05-01 15:14:03 +00:00
dependabot[bot]
20a649a496
Bump tauri-plugin-single-instance from 773b498 to 5e3900e
...
Bumps [tauri-plugin-single-instance](https://github.com/tauri-apps/plugins-workspace ) from `773b498` to `5e3900e`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases )
- [Commits](773b498392...5e3900e682
2024-05-01 15:13:29 +00:00
dependabot[bot]
88e54f4358
Bump tauri-plugin-store from 773b498 to 5e3900e
...
Bumps [tauri-plugin-store](https://github.com/tauri-apps/plugins-workspace ) from `773b498` to `5e3900e`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases )
- [Commits](773b498392...5e3900e682
2024-05-01 15:13:01 +00:00
dependabot[bot]
3733772b60
Bump tauri-plugin-log from 773b498 to 5e3900e
...
Bumps [tauri-plugin-log](https://github.com/tauri-apps/plugins-workspace ) from `773b498` to `5e3900e`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases )
- [Commits](773b498392...5e3900e682
2024-05-01 15:12:27 +00:00
dependabot[bot]
a1a3abc868
Bump the rust-updates group with 10 updates
...
Bumps the rust-updates group with 10 updates:
| Package | From | To |
| --- | --- | --- |
| [serde](https://github.com/serde-rs/serde ) | `1.0.197` | `1.0.199` |
| [thiserror](https://github.com/dtolnay/thiserror ) | `1.0.58` | `1.0.59` |
| [anyhow](https://github.com/dtolnay/anyhow ) | `1.0.81` | `1.0.82` |
| [async-trait](https://github.com/dtolnay/async-trait ) | `0.1.79` | `0.1.80` |
| [chrono](https://github.com/chronotope/chrono ) | `0.4.37` | `0.4.38` |
| [reqwest](https://github.com/seanmonstar/reqwest ) | `0.12.2` | `0.12.4` |
| [serde_json](https://github.com/serde-rs/json ) | `1.0.115` | `1.0.116` |
| [ssh-key](https://github.com/RustCrypto/SSH ) | `0.6.5` | `0.6.6` |
| [tauri](https://github.com/tauri-apps/tauri ) | `1.6.1` | `1.6.2` |
| [sysinfo](https://github.com/GuillaumeGomez/sysinfo ) | `0.30.8` | `0.30.11` |
Updates `serde` from 1.0.197 to 1.0.199
- [Release notes](https://github.com/serde-rs/serde/releases )
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.197...v1.0.199 )
Updates `thiserror` from 1.0.58 to 1.0.59
- [Release notes](https://github.com/dtolnay/thiserror/releases )
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.58...1.0.59 )
Updates `anyhow` from 1.0.81 to 1.0.82
- [Release notes](https://github.com/dtolnay/anyhow/releases )
- [Commits](https://github.com/dtolnay/anyhow/compare/1.0.81...1.0.82 )
Updates `async-trait` from 0.1.79 to 0.1.80
- [Release notes](https://github.com/dtolnay/async-trait/releases )
- [Commits](https://github.com/dtolnay/async-trait/compare/0.1.79...0.1.80 )
Updates `chrono` from 0.4.37 to 0.4.38
- [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.37...v0.4.38 )
Updates `reqwest` from 0.12.2 to 0.12.4
- [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.12.2...v0.12.4 )
Updates `serde_json` from 1.0.115 to 1.0.116
- [Release notes](https://github.com/serde-rs/json/releases )
- [Commits](https://github.com/serde-rs/json/compare/v1.0.115...v1.0.116 )
Updates `ssh-key` from 0.6.5 to 0.6.6
- [Commits](https://github.com/RustCrypto/SSH/compare/ssh-key/v0.6.5...ssh-key/v0.6.6 )
Updates `tauri` from 1.6.1 to 1.6.2
- [Release notes](https://github.com/tauri-apps/tauri/releases )
- [Commits](https://github.com/tauri-apps/tauri/compare/tauri-v1.6.1...tauri-v1.6.2 )
Updates `sysinfo` from 0.30.8 to 0.30.11
- [Changelog](https://github.com/GuillaumeGomez/sysinfo/blob/master/CHANGELOG.md )
- [Commits](https://github.com/GuillaumeGomez/sysinfo/compare/v0.30.8...v0.30.11 )
---
updated-dependencies:
- dependency-name: serde
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: thiserror
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: anyhow
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: async-trait
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: chrono
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: reqwest
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: serde_json
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: ssh-key
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: tauri
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
- dependency-name: sysinfo
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: rust-updates
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-05-01 15:11:55 +00:00
Pavel Laptev
b8f689397e
Fix: setting toggle ( #3650 )
2024-05-01 02:11:22 +02:00
Pavel Laptev
c9aba85bfa
Some design updates ( #3649 )
...
* CSS: badge size update
* close modal when remove the project
2024-05-01 01:10:22 +02:00
Kiril Videlov
382e265bb5
Merge pull request #3648 from gitbutlerapp/Virtual-branch
...
fix: removing an update all projects operation on read
2024-04-30 13:55:25 -07:00
GitButler
28ca280c0d
fix: removing an update all projects operation on read
...
this is no longer needed and it is causing an issue on windows
2024-04-30 13:42:34 -07:00
Mattias Granlund
4c3ac60dda
Fix annoying inconsistency in normalizeBranchName
...
Both the rust code and typescript code have a normalization function, but the rust code doesn't lowercase the name.
2024-04-30 19:00:18 +02:00
Mattias Granlund
1255dbc2fe
Show {completed}/{total} while running checks
2024-04-30 18:55:52 +02:00
Pavel Laptev
142ba34cdf
fix: close modal on brunch delete ( #3644 )
2024-04-30 18:52:39 +02:00
