gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-24 10:02:26 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,562 Commits 157 Branches 1,067 Tags 61 MiB
52887a96bd
Commit Graph

4562 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Galaiko
3eb3a40097 do not lock project directory 2024-01-10 09:49:37 +01:00
Nikita Galaiko
e351b5873d
Merge pull request #2213 from gitbutlerapp/refactor-tree-walk 
Refactor tree walk
 2024-01-10 09:38:47 +01:00
Nikita Galaiko
fb858fa936 refactor: simplify tree walk callback and use custom TreeWalkResult 2024-01-10 09:32:43 +01:00
Kiril Videlov
462815c0af Revert "chore: add SENTRY_AUTH_TOKEN environment variable to script" 
This reverts commit 9f6833a48b.
 2024-01-10 02:18:03 +01:00
Kiril Videlov
500af57829 Revert "Revert "Fix branch change detection"" 
This reverts commit 151d2df4f6.
 2024-01-10 02:04:32 +01:00
Kiril Videlov
72e6df813f Revert "remove sentry api key from source code" 
This reverts commit 4417510d55.
Seems broken
 2024-01-10 02:03:24 +01:00
Kiril Videlov
151d2df4f6 Revert "Fix branch change detection" 
This reverts commit 527ccddba6.
Breaks nightly
 2024-01-10 01:14:48 +01:00
Mattias Granlund
527ccddba6 Fix branch change detection 
- used to detect error response to listing
- now just observes wether or not branch is gitbutler/integration
 2024-01-09 23:33:52 +01:00
Mattias Granlund
412b7c738b Fix file list text clipping 
- line height often needs to be 120% to prevent clipping
 2024-01-09 23:33:10 +01:00
dependabot[bot]
8eeadb1da0 chore(deps-dev): bump @codemirror/lang-vue from 0.1.2 to 0.1.3 
Bumps [@codemirror/lang-vue](https://github.com/codemirror/lang-vue) from 0.1.2 to 0.1.3.
- [Changelog](https://github.com/codemirror/lang-vue/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/lang-vue/compare/0.1.2...0.1.3)

---
updated-dependencies:
- dependency-name: "@codemirror/lang-vue"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-09 23:31:12 +01:00
dependabot[bot]
8d4a41892b chore(deps-dev): bump @codemirror/lang-html from 6.4.6 to 6.4.7 
Bumps [@codemirror/lang-html](https://github.com/codemirror/lang-html) from 6.4.6 to 6.4.7.
- [Changelog](https://github.com/codemirror/lang-html/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/lang-html/compare/6.4.6...6.4.7)

---
updated-dependencies:
- dependency-name: "@codemirror/lang-html"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-09 23:31:01 +01:00
dependabot[bot]
2dbb52128d chore(deps-dev): bump posthog-js from 1.95.1 to 1.96.1 
Bumps [posthog-js](https://github.com/PostHog/posthog-js) from 1.95.1 to 1.96.1.
- [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.95.1...v1.96.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-09 23:30:43 +01:00
Pavel Laptev
ef5d6f42c6
Merge pull request #2206 from gitbutlerapp/update-infomessage-styles 
update info message styles
 2024-01-09 21:49:25 +01:00
Pavel Laptev
19f32249ee removed unused code 2024-01-09 21:47:04 +01:00
Pavel Laptev
451d9da8ed update info message styles 2024-01-09 21:44:26 +01:00
Mattias Granlund
f5042ceada Rename DropDown -> DropDownButton 2024-01-09 15:29:05 +01:00
Pavel Laptev
713b98f064
Merge pull request #2204 from gitbutlerapp/color-tokens-updated 
- removed unused tokens
 2024-01-09 15:17:11 +01:00
Pavel Laptev
f2b6222e7e merged from upstream 2024-01-09 15:14:47 +01:00
Pavel Laptev
6e35a9fa71 tag non existing color removed 2024-01-09 15:14:29 +01:00
Pavel Laptev
273f189709 - removed unused tokens 
- some tokens renamed
 2024-01-09 15:14:29 +01:00
Pavel Laptev
ed06a0027f tag non existing color removed 2024-01-09 15:14:09 +01:00
Nikita Galaiko
ffa40422d9
Merge pull request #2203 from gitbutlerapp/fix-draggable-file-function 
Fix draggable file function
 2024-01-09 15:12:04 +01:00
Pavel Laptev
e38e531f3c - removed unused tokens 
- some tokens renamed
 2024-01-09 15:10:23 +01:00
Nikita Galaiko
8ab6b09a32 fix: amend file ownership calculation 2024-01-09 15:02:33 +01:00
Kiril Videlov
f3d93c79b6 🔨 chore: add test case for locking disjointed hunks in virtual branches 
🔧 fix: update line range to use i32 type in create_commit test
 2024-01-09 14:58:45 +01:00
Nikita Galaiko
7eb52eebc4
Merge pull request #2114 from gitbutlerapp/refactor-reader-writer 
refactor reader / writer
 2024-01-09 14:37:57 +01:00
Nikita Galaiko
0779243272 Merged origin/master into refactor-reader-writer 2024-01-09 12:57:54 +01:00
Nikita Galaiko
4e92b95708
Merge pull request #2194 from gitbutlerapp/dependabot/cargo/anyhow-1.0.79 
chore(deps): bump anyhow from 1.0.75 to 1.0.79
 2024-01-09 12:57:09 +01:00
dependabot[bot]
8ded38eae1
chore(deps): bump anyhow from 1.0.75 to 1.0.79 
Bumps [anyhow](https://github.com/dtolnay/anyhow) from 1.0.75 to 1.0.79.
- [Release notes](https://github.com/dtolnay/anyhow/releases)
- [Commits](https://github.com/dtolnay/anyhow/compare/1.0.75...1.0.79)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-09 11:41:40 +00:00
Nikita Galaiko
16d4c85988
Merge pull request #2193 from gitbutlerapp/dependabot/cargo/tempfile-3.9.0 
chore(deps): bump tempfile from 3.8.1 to 3.9.0
 2024-01-09 12:40:23 +01:00
Nikita Galaiko
143c1ad207
Merge pull request #2195 from gitbutlerapp/dependabot/cargo/async-trait-0.1.77 
chore(deps): bump async-trait from 0.1.74 to 0.1.77
 2024-01-09 12:40:06 +01:00
Nikita Galaiko
ffb7351593
Merge pull request #2196 from gitbutlerapp/dependabot/cargo/thiserror-1.0.56 
chore(deps): bump thiserror from 1.0.53 to 1.0.56
 2024-01-09 12:39:59 +01:00
Nikita Galaiko
ff30894a11
Merge pull request #2197 from gitbutlerapp/dependabot/cargo/similar-2.4.0 
chore(deps): bump similar from 2.3.0 to 2.4.0
 2024-01-09 12:39:42 +01:00
Nikita Galaiko
3b92c18608 Merged origin/master into refactor-reader-writer 2024-01-09 10:27:02 +01:00
Nikita Galaiko
ec801c39ac
Merge pull request #2202 from gitbutlerapp/add-sentry-auth-token 
Add sentry auth token
 2024-01-09 10:26:16 +01:00
Nikita Galaiko
9f6833a48b chore: add SENTRY_AUTH_TOKEN environment variable to script 2024-01-09 10:17:27 +01:00
Nikita Galaiko
f2514ef4c2 Merged origin/master into refactor-reader-writer 2024-01-09 10:17:19 +01:00
Nikita Galaiko
728e57ba7f
Merge pull request #2201 from gitbutlerapp/use-env-var-for-sentry-auth-token 
Use env var for sentry auth token
 2024-01-09 10:03:51 +01:00
Nikita Galaiko
4417510d55 remove sentry api key from source code 2024-01-09 09:59:19 +01:00
Mattias Granlund
392bc45383 Fix UI recovery when switching back to gitbutler branch 2024-01-08 17:17:48 +01:00
Mattias Granlund
f481ba5311 Increase line-height of new/empty branch message 2024-01-08 17:16:45 +01:00
dependabot[bot]
ccf702c9ab
chore(deps): bump similar from 2.3.0 to 2.4.0 
Bumps [similar](https://github.com/mitsuhiko/similar) from 2.3.0 to 2.4.0.
- [Changelog](https://github.com/mitsuhiko/similar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mitsuhiko/similar/compare/2.3.0...2.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-08 15:37:51 +00:00
dependabot[bot]
274b3e7ce1
chore(deps): bump thiserror from 1.0.53 to 1.0.56 
Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.53 to 1.0.56.
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.53...1.0.56)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-08 15:37:36 +00:00
dependabot[bot]
fc01c451a6
chore(deps): bump async-trait from 0.1.74 to 0.1.77 
Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.74 to 0.1.77.
- [Release notes](https://github.com/dtolnay/async-trait/releases)
- [Commits](https://github.com/dtolnay/async-trait/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-08 15:37:15 +00:00
dependabot[bot]
58fdc447a6
chore(deps): bump tempfile from 3.8.1 to 3.9.0 
Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.8.1 to 3.9.0.
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Stebalien/tempfile/compare/v3.8.1...v3.9.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-08 15:36:35 +00:00
Nikita Galaiko
4a92abdd9e
Merge pull request #2191 from gitbutlerapp/unapply-ownership-hunks 
GB-776: Unapply ownership hunks
 2024-01-08 16:02:20 +01:00
Nikita Galaiko
a68064723d allow unapplying locked ownerships 2024-01-08 15:39:31 +01:00
Nikita Galaiko
aefeba8c7c support unapplying locked ownerships 2024-01-08 15:39:22 +01:00
Mattias Granlund
2fcc03e939 Fix branch change copy 
- shoud say you've switched _away_ from gitbutler/integration
 2024-01-08 14:19:56 +01:00
Nikita Galaiko
7ad9caa5bd
Merge pull request #2189 from gitbutlerapp/update-notify-version 
chore: update notify dependency to version 6.1.1
 2024-01-08 12:29:02 +01:00