gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-04 03:42:38 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,871 Commits 147 Branches 1,034 Tags 51 MiB
04afdc47e0
Commit Graph

3871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Galaiko
229745b721 rename branch to refname 2023-11-22 10:33:31 +01:00
Nikita Galaiko
743289dc2d
Merge pull request #1665 from gitbutlerapp/handle-git-errors 
Handle git errors
 2023-11-22 09:51:07 +01:00
Nikita Galaiko
af9b9c465b categorize git network error 2023-11-22 09:29:12 +01:00
Scott Chacon
65928d78b8 just push all refs 2023-11-21 15:18:10 -08:00
Nikita Galaiko
372f60189b
Merge pull request #1663 from gitbutlerapp/delete-empty-branches 
delete empty branches
 2023-11-21 14:36:43 +01:00
Nikita Galaiko
43fda60c25 on unapply, delete empty branches 2023-11-21 14:29:58 +01:00
dependabot[bot]
0760d602e9 chore(deps-dev): bump nanoid from 5.0.1 to 5.0.3 
Bumps [nanoid](https://github.com/ai/nanoid) from 5.0.1 to 5.0.3.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/5.0.1...5.0.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-21 13:28:00 +00:00
dependabot[bot]
60fc4981a7 chore(deps-dev): bump eslint from 8.53.0 to 8.54.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.53.0 to 8.54.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.53.0...v8.54.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-21 13:27:51 +00:00
dependabot[bot]
6446d7819e chore(deps-dev): bump marked from 9.1.4 to 10.0.0 
Bumps [marked](https://github.com/markedjs/marked) from 9.1.4 to 10.0.0.
- [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.4...v10.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-21 13:27:43 +00:00
Nikita Galaiko
6b14c71ed2
Merge pull request #1660 from gitbutlerapp/fix-repo-usage 
fix repo usage
 2023-11-21 14:00:05 +01:00
Nikita Galaiko
8b730cc267 always call odb create 2023-11-21 13:51:37 +01:00
Nikita Galaiko
0eac6f96be make sure to use project repo 2023-11-21 13:51:18 +01:00
Nikita Galaiko
7c4af4e86a
Merge pull request #1647 from gitbutlerapp/dependabot/cargo/tracing-0.1.40 
chore(deps): bump tracing from 0.1.37 to 0.1.40
 2023-11-21 13:16:44 +01:00
Nikita Galaiko
fe1b12b3f7
Merge pull request #1648 from gitbutlerapp/dependabot/cargo/bstr-1.8.0 
chore(deps): bump bstr from 1.7.0 to 1.8.0
 2023-11-21 13:16:38 +01:00
Nikita Galaiko
242945094f
Merge pull request #1649 from gitbutlerapp/dependabot/cargo/rustix-0.38.25 
chore(deps): bump rustix from 0.38.13 to 0.38.25
 2023-11-21 13:16:21 +01:00
dependabot[bot]
07b9189b8c
chore(deps): bump tracing from 0.1.37 to 0.1.40 
Bumps [tracing](https://github.com/tokio-rs/tracing) from 0.1.37 to 0.1.40.
- [Release notes](https://github.com/tokio-rs/tracing/releases)
- [Commits](https://github.com/tokio-rs/tracing/compare/tracing-0.1.37...tracing-0.1.40)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-21 12:01:09 +00:00
Nikita Galaiko
21a22ed4a4
Merge pull request #1650 from gitbutlerapp/dependabot/cargo/slug-0.1.5 
chore(deps): bump slug from 0.1.4 to 0.1.5
 2023-11-21 13:00:28 +01:00
Nikita Galaiko
145a6cc12b
Merge pull request #1646 from gitbutlerapp/dependabot/cargo/uuid-1.6.1 
chore(deps): bump uuid from 1.5.0 to 1.6.1
 2023-11-21 13:00:15 +01:00
Nikita Galaiko
c900f18496
Merge pull request #1659 from gitbutlerapp/remove-git-wd-diff-function 
Remove git wd diff function
 2023-11-21 12:59:33 +01:00
Nikita Galaiko
fb469d411b rm dead code 2023-11-21 12:42:15 +01:00
dependabot[bot]
6ff68603d2 chore(deps-dev): bump vitest from 0.34.3 to 0.34.6 
Bumps [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) from 0.34.3 to 0.34.6.
- [Release notes](https://github.com/vitest-dev/vitest/releases)
- [Commits](https://github.com/vitest-dev/vitest/commits/v0.34.6/packages/vitest)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-21 11:03:31 +00:00
Nikita Galaiko
b889bbc560
Merge pull request #1658 from gitbutlerapp/fix-vbranch-limit 
fix vbranch limit
 2023-11-21 10:21:02 +01:00
Nikita Galaiko
643a6ca98f
Merge pull request #1657 from gitbutlerapp/add-test-for-twice-function 
Add test for twice function
 2023-11-21 10:17:03 +01:00
Nikita Galaiko
6ffb711710 fix: allow to send vbranches more often 2023-11-21 10:16:50 +01:00
Nikita Galaiko
282d5517db do not import gitbutler/integration 2023-11-21 10:09:21 +01:00
Nikita Galaiko
0f05a3e252
Merge pull request #1656 from gitbutlerapp/refactor-handler-handle-function 
Refactor handler handle function
 2023-11-21 09:40:48 +01:00
Nikita Galaiko
47a7c93dad make wathcher handlers async 2023-11-21 09:30:49 +01:00
Nikita Galaiko
aa5011264d
Merge pull request #1645 from gitbutlerapp/remove-app-wide-lock 
remove app wide lock
 2023-11-20 16:35:43 +01:00
dependabot[bot]
5c84add6df
chore(deps): bump slug from 0.1.4 to 0.1.5 
Bumps [slug](https://github.com/Stebalien/slug-rs) from 0.1.4 to 0.1.5.
- [Commits](https://github.com/Stebalien/slug-rs/compare/v0.1.4...v0.1.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-20 15:27:52 +00:00
dependabot[bot]
d2fbaa74bd
chore(deps): bump rustix from 0.38.13 to 0.38.25 
Bumps [rustix](https://github.com/bytecodealliance/rustix) from 0.38.13 to 0.38.25.
- [Release notes](https://github.com/bytecodealliance/rustix/releases)
- [Commits](https://github.com/bytecodealliance/rustix/compare/v0.38.13...v0.38.25)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-20 15:27:29 +00:00
dependabot[bot]
c27735d9a0
chore(deps): bump bstr from 1.7.0 to 1.8.0 
Bumps [bstr](https://github.com/BurntSushi/bstr) from 1.7.0 to 1.8.0.
- [Commits](https://github.com/BurntSushi/bstr/compare/1.7.0...1.8.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-20 15:26:57 +00:00
dependabot[bot]
2ca649fe3d
chore(deps): bump uuid from 1.5.0 to 1.6.1 
Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.5.0 to 1.6.1.
- [Release notes](https://github.com/uuid-rs/uuid/releases)
- [Commits](https://github.com/uuid-rs/uuid/compare/1.5.0...1.6.1)

---
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-20 15:26:07 +00:00
Nikita Galaiko
22104885b0 fix virtual branches lock 
separating controllers by project_id allows to avoid app-wide lock
 2023-11-20 16:17:22 +01:00
Nikita Galaiko
26f6aee05b
Merge pull request #1643 from gitbutlerapp/add-handler-inner 
Add handler inner
 2023-11-20 15:31:09 +01:00
Nikita Galaiko
52d34afe3f allow only one flush handler 2023-11-20 15:18:13 +01:00
Mattias Granlund
c2e6c89819 Replace a few icons with new JSON version 
Testing out icons provided in JSON format by pavel.
 2023-11-20 13:42:08 +00:00
Mattias Granlund
fef8c0fce8 Align push button a bit better 2023-11-20 12:54:28 +00:00
Mattias Granlund
692e69941c Make commit card truncate commit message correctly 2023-11-20 12:54:28 +00:00
Mattias Granlund
a364fc9341 Use reactive variables for page data 
We need to use reactive variables for page data, otherwise they
do not trigger recalculation on navigation.
 2023-11-20 10:32:04 +00:00
Nikita Galaiko
7f633e59f5
Merge pull request #1638 from gitbutlerapp/add-log-level-environment-variable 
Add log level environment variable
 2023-11-20 09:40:58 +01:00
Nikita Galaiko
383d5a3bb5 feat: update logging configuration to use LOG_LEVEL environment variable instead of debug feature flag 2023-11-20 09:29:45 +01:00
Kiril Videlov
6abf22089b chore: remove unused import and simplify code in project_flush_and_push function 2023-11-17 19:10:39 +01:00
Kiril Videlov
6728116d2c feat: add event posting for session and push project to Gitbutler 2023-11-17 19:10:39 +01:00
Mattias Granlund
74a28e166a Move settings and change vbranch label 2023-11-17 14:33:38 +00:00
Mattias Granlund
bbcb5c12ca Prevent default on update and refresh 2023-11-17 14:16:29 +00:00
Nikita Galaiko
78494dd6e6
Merge pull request #1633 from gitbutlerapp/submodules 
submodules
 2023-11-17 15:14:10 +01:00
Mattias Granlund
6fb83315a6 Moving a bit towards Pavel's unfinished nav design 2023-11-17 14:11:47 +00:00
Nikita Galaiko
007d3783b8 ignore submodules when diffing 2023-11-17 15:09:43 +01:00
Nikita Galaiko
25fd709b9d
Merge pull request #1632 from gitbutlerapp/virtual-branch 
Virtual branch
 2023-11-17 14:58:40 +01:00
Nikita Galaiko
12ca8f9abd fix add project 2023-11-17 14:57:01 +01:00