gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-14 10:35:44 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,327 Commits 155 Branches 1,057 Tags 60 MiB
1626cc7fba
Commit Graph

4327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pavel Laptev
0f9bbc9cfa File preview. Header title styles updated 2023-12-12 23:39:54 +01:00
Pavel Laptev
a72932a2a9 hunk overflow fixed 2023-12-12 22:59:46 +01:00
Pavel Laptev
40c957d9a1 hunk CSS updated 2023-12-12 22:56:26 +01:00
Pavel Laptev
05bd73da34 hunk css updated 2023-12-12 22:27:12 +01:00
Pavel Laptev
e4e0b2de53 added horizontal scroll to hunks 2023-12-12 22:23:13 +01:00
Kiril Videlov
954d51c853 🔧 fix: update tests to use correct assertions and add missing projects parameter in test setup 2023-12-12 18:56:29 +01:00
Kiril Videlov
b18980c008 🐛 fix: update type of ok_with_force_push field in Project struct to use DefaultTrue type for better serialization 2023-12-12 18:56:29 +01:00
Pavel Laptev
1034f960bd
Merge pull request #2008 from gitbutlerapp/update-modal-styles 
Update modal styles
 2023-12-12 17:34:14 +01:00
Pavel Laptev
cdccb59e33 Merged origin/master into Update modal styles 2023-12-12 17:32:17 +01:00
Pavel Laptev
75b8216918 loader hight fixed 2023-12-12 17:31:59 +01:00
Qix
dd099353ca
Merge pull request #2012 from gitbutlerapp/add-defaulttrue-type 
add `DefaultTrue` type
 2023-12-12 17:30:56 +01:00
Pavel Laptev
930b06a0eb deleted unnesesery import 2023-12-12 17:28:18 +01:00
Pavel Laptev
26f826413f coderefactoring 2023-12-12 17:25:44 +01:00
josh@gitbutler.com
9133ef3607 add DefaultTrue type 2023-12-12 17:25:15 +01:00
extrawurst
8d917494ed
GB-700: support user triggered pre commit hook (#1960) 
* run pre commit hook
* unittest
* support custom search path: `.husky`
 2023-12-12 17:15:35 +01:00
Pavel Laptev
db037960a8 Codereview: header and icon to props 2023-12-12 17:12:25 +01:00
Pavel Laptev
d32f08153c Merged origin/master into Update modal styles 2023-12-12 16:05:41 +01:00
Mattias Granlund
043e0de45b Use main app background for dragging window 
- this doesn't yet enable dragging for e.g. settings, but we'll get there
 2023-12-12 15:05:32 +00:00
Pavel Laptev
66bc0303c4 removed unused import 2023-12-12 16:05:28 +01:00
Mattias Granlund
669c481bf6 Enable app drag from board background 2023-12-12 15:05:03 +00:00
Pavel Laptev
20d150cac1 removed unnesessery css 2023-12-12 16:02:54 +01:00
Pavel Laptev
5d805513c1 modal title replaced 2023-12-12 16:01:31 +01:00
Pavel Laptev
697b1fa3bb fixed code line width 2023-12-12 15:56:42 +01:00
Pavel Laptev
1182161c70 Merged origin/master into Update modal styles 2023-12-12 15:54:31 +01:00
Pavel Laptev
388d645a2b changed modals and some styles 2023-12-12 15:53:49 +01:00
Mattias Granlund
867d82efde Always go to the board when switching projects 2023-12-12 14:48:39 +00:00
Nikita Galaiko
838150c7a4
Merge pull request #2006 from gitbutlerapp/handle-branch-read-error 
Handle branch read error
 2023-12-12 14:48:59 +01:00
Nikita Galaiko
f5331b4c1e fix: handle case when branch is not found in delete_branch function 2023-12-12 14:43:37 +01:00
Nikita Galaiko
1864105915
Merge pull request #2005 from gitbutlerapp/refactor-ssh-key-path 
Refactor ssh key path
 2023-12-12 14:27:30 +01:00
Nikita Galaiko
8ec307bfbc fix file keypath resolution 2023-12-12 14:23:28 +01:00
Nikita Galaiko
0d667c1fa3
Merge pull request #2004 from gitbutlerapp/add-test-for-integrated-with-locked-hunks 
Add test for integrated with locked hunks
 2023-12-12 13:38:42 +01:00
Nikita Galaiko
7794e8778b chore: update From trait implementation for ForcePushNotAllowedError to ignore the value parameter 2023-12-12 13:33:20 +01:00
Nikita Galaiko
4c2ff38bc9 test: add integration tests for integrated commits with locked and non-locked hunks 2023-12-12 13:32:48 +01:00
Nikita Galaiko
472c2cac21
Merge pull request #2003 from gitbutlerapp/update-force-push-error-message 
Update force push error message
 2023-12-12 12:25:23 +01:00
Nikita Galaiko
1cd6220dda do not include id into user facing error message 2023-12-12 12:20:17 +01:00
Nikita Galaiko
a5c351342e
Merge pull request #2002 from gitbutlerapp/update-allow-force-pushing-and-contact-us 
Update allow force pushing and contact us
 2023-12-12 12:17:24 +01:00
Nikita Galaiko
9be36ef6af add descritpion to force pushing preference 2023-12-12 12:15:19 +01:00
Nikita Galaiko
0dffa7e9f5
Merge pull request #2001 from gitbutlerapp/check-for-squash-force-push 
Check for squash force push
 2023-12-12 10:55:25 +01:00
Nikita Galaiko
0bb1b786ff consider force push preference when updating commit message 2023-12-12 10:47:00 +01:00
Nikita Galaiko
dae28410c0
Merge pull request #2000 from gitbutlerapp/fix-squash-upstream-head 
Fix squash upstream head
 2023-12-12 10:23:25 +01:00
Nikita Galaiko
08e41f46d1 reflect squashing rules in ui 2023-12-12 10:18:34 +01:00
Nikita Galaiko
a98ea8ccc3 consider force push preference while squashing 2023-12-12 09:45:16 +01:00
Nikita Galaiko
8027727ab6
Merge pull request #1999 from gitbutlerapp/test-forcepush-allowed 
Test forcepush allowed
 2023-12-12 09:31:34 +01:00
Nikita Galaiko
a1516e24ff test amend with force 2023-12-12 09:26:48 +01:00
dependabot[bot]
ee90793b0d chore(deps-dev): bump svelte-floating-ui from 1.5.3 to 1.5.8 
Bumps [svelte-floating-ui](https://github.com/fedorovvvv/svelte-floating-ui) from 1.5.3 to 1.5.8.
- [Release notes](https://github.com/fedorovvvv/svelte-floating-ui/releases)
- [Commits](https://github.com/fedorovvvv/svelte-floating-ui/compare/1.5.3...1.5.8)

---
updated-dependencies:
- dependency-name: svelte-floating-ui
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-11 19:41:13 +00:00
dependabot[bot]
feed4b3df6 chore(deps-dev): bump eslint-plugin-svelte from 2.35.0 to 2.35.1 
Bumps [eslint-plugin-svelte](https://github.com/sveltejs/eslint-plugin-svelte) from 2.35.0 to 2.35.1.
- [Release notes](https://github.com/sveltejs/eslint-plugin-svelte/releases)
- [Changelog](https://github.com/sveltejs/eslint-plugin-svelte/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sveltejs/eslint-plugin-svelte/compare/v2.35.0...v2.35.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-svelte
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-11 19:39:44 +00:00
Nikita Galaiko
8b3d8e42d0
Merge pull request #1988 from gitbutlerapp/add-force-pushing-error 
disallow amending if force pushing is not ok
 2023-12-11 16:54:04 +01:00
dependabot[bot]
03e95d1e00
chore(deps): bump similar from 2.2.1 to 2.3.0 
Bumps [similar](https://github.com/mitsuhiko/similar) from 2.2.1 to 2.3.0.
- [Changelog](https://github.com/mitsuhiko/similar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mitsuhiko/similar/compare/2.2.1...2.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-11 15:48:08 +00:00
dependabot[bot]
2862696df6
chore(deps): bump tauri-plugin-single-instance 
Bumps [tauri-plugin-single-instance](https://github.com/tauri-apps/plugins-workspace) from `899c626` to `65ea3d9`.
- [Release notes](https://github.com/tauri-apps/plugins-workspace/releases)
- [Commits](899c6262f8...65ea3d9adf)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-11 15:47:56 +00:00
dependabot[bot]
0bc86f20e9
chore(deps): bump rustix from 0.38.25 to 0.38.28 
Bumps [rustix](https://github.com/bytecodealliance/rustix) from 0.38.25 to 0.38.28.
- [Release notes](https://github.com/bytecodealliance/rustix/releases)
- [Commits](https://github.com/bytecodealliance/rustix/compare/v0.38.25...v0.38.28)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-11 15:47:33 +00:00