chore: Merge remote-tracking branch 'origin/v1' into v2 #760
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* [stronghold] return null if there is no record * Return value * return statement * prettier * fix function signature * fix if condition * simplify condition --------- Co-authored-by: Fabian-Lars <fabianlars@fabianlars.de>
* fix(window-state): manual default implentation, closes #421 * Update lib.rs
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* fix: use correct functions to allow/forbid Without changing the data structure * fix: wrong type passed when passing path by ref * fix: remove '**' before allowing pattern to no trash the scope * fmt: run fmt * fix: Remove trailling '*' for non-recursive directories * fix: remove superfluous asteriks recursively * info: add changefile * fix: remove unwated yarn.lock * fix: simplify directories' fix and apply it to forbid_path too. * fix: simplify path to str in fix_directory * don't convert path back to str * Update persisted-scope-fix-handle-glob-directories.md --------- Co-authored-by: FabianLars <fabianlars@fabianlars.de>
Co-authored-by: FabianLars <fabianlars@fabianlars.de>
Co-authored-by: FabianLars <FabianLars@users.noreply.github.com>
… to v36 (#458) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…#464) * fix(deps): update rust crate sqlx to 0.7 * Update sql's msrv in workflow to 1.65 * Update README.md * Update Cargo.toml * Update Cargo.toml --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Fabian-Lars <fabianlars@fabianlars.de>
* chore(deps): update dependency prettier to v3 * fmt * semver override * update example deps --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: FabianLars <fabianlars@fabianlars.de>
* publish new versions * Update Cargo.toml --------- Co-authored-by: FabianLars <FabianLars@users.noreply.github.com> Co-authored-by: Fabian-Lars <fabianlars@fabianlars.de>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* chore: Lock npm deps versions * lock ws example too * override optionator
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…479) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
… to v40 (#740) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* chore(deps): update dependency rollup to v4.5.1 * pnpm dedupe --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: FabianLars <fabianlars@fabianlars.de>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* chore: Add sponsors section to readme * which link style works in nested folders? * add sponsors to plugin readmes * use https links as src * double test it with the pr branch * revert last commit * fmt
|
New and updated dependencies detected. Learn more about Socket for GitHub ↗︎
|
|
please no squashing this time 🙏 (i hope that was the issue...) |
FabianLars
force-pushed
the
v1-into-v2-again
branch
from
3546d7e
to
058d5dd
Compare
amrbashir
approved these changes
Nov 23, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
does this only work if you do a normal commit? I had to resolve the same conflicts like last time which i think was squash merged? Anyway, if this PR doesn't fix that i won't merge v1 into v2 again.