gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-11-30 01:17:37 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,099 Commits 148 Branches 1,027 Tags 65 MiB
669c481bf6
Commit Graph

4099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mattias Granlund
669c481bf6 Enable app drag from board background 2023-12-12 15:05:03 +00: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
Nikita Galaiko
768bde4f27 disallow amending if force pushing is not ok 2023-12-11 15:49:43 +01:00
Pavel Laptev
3cb80305e6
Merge pull request #1986 from gitbutlerapp/virtual-branch-2 
Virtual branch
 2023-12-11 15:14:39 +01:00
Pavel Laptev
680cf192db wip 2023-12-11 15:12:31 +01:00
Nikita Galaiko
937749d886
Merge pull request #1983 from gitbutlerapp/add-ok-with-force-push-to-project 
Add ok with force push to project
 2023-12-11 14:16:15 +01:00
Nikita Galaiko
d0603c5643 fix test 2023-12-11 14:03:34 +01:00
Nikita Galaiko
9c157ae0af do not show create pr button for pushed branches 2023-12-11 14:00:51 +01:00
Nikita Galaiko
e5f7a71f7c docs: add documentation for ok_with_force_push field in Project struct 2023-12-11 14:00:26 +01:00
Nikita Galaiko
c2b8eb6a71 test force push setting 2023-12-11 13:01:17 +01:00
Nikita Galaiko
0a311f14b5 Merged origin/master into Add ok with force push to project 2023-12-11 11:25:27 +01:00
Qix
763a4138a3
Merge pull request #1982 from gitbutlerapp/add-rust-toolchain-file 
add rust toolchain file
 2023-12-11 11:23:48 +01:00
josh@gitbutler.com
6cd7e60343 sort dependencies 2023-12-11 11:19:17 +01:00
Nikita Galaiko
a1e4e651cc ui for ok with force pushing 2023-12-11 11:17:20 +01:00
Nikita Galaiko
0840e69db8 configurable "ok with force pushing" 2023-12-11 11:17:08 +01:00
josh@gitbutler.com
333ded9534 fix clippy lints in nightly 2023-12-11 11:09:27 +01:00
josh@gitbutler.com
dc06dadb10 add rust-toolchain.toml file 2023-12-11 11:09:19 +01:00
Nikita Galaiko
911bb88f3f
Merge pull request #1980 from gitbutlerapp/add-unit-tests-for-helper 
Add unit tests for helper
 2023-12-11 09:39:02 +01:00
Nikita Galaiko
fdfe34b21b add credentials tests 2023-12-11 09:33:11 +01:00
Mattias Granlund
e7990b41ba Fix bug in hunk context menu 
- it wasn't always referring to the right file
 2023-12-10 23:56:56 +00:00
Mattias Granlund
ebbc71a0bc Go back on flex container in scrollable 
- using block is more ergonomic for its contents
- undo the decision on using flex I made earlier today
 2023-12-10 23:54:43 +00:00
Pavel Laptev
419d9c5924
Merge pull request #1977 from gitbutlerapp/segmented-control-hover-updated 
Segmented control - hover updated
 2023-12-11 00:10:25 +01:00
Pavel Laptev
57ee23bf77 hover updated 2023-12-11 00:08:39 +01:00
Mattias Granlund
5dc93d932d Fix a couple of scrollable glitches 2023-12-10 21:38:52 +00:00
Kiril Videlov
2aaeac1f80 🐛 fix: correctly handle user authentication status for enabling branch name and commit message generation 
🔨 chore: remove unused userSettings variable from login page
 2023-12-10 21:42:16 +01:00
Kiril Videlov
10165be6ac 🐛 fix: correct typo in error message for failed pull request creation 2023-12-10 21:36:31 +01:00
Kiril Videlov
136eb65225 fix a nasty auth bug — incorrect url conversion 2023-12-10 21:27:38 +01:00
Pavel Laptev
9dd441887d
Merge pull request #1972 from gitbutlerapp/small-css-fix 
Small CSS fix
 2023-12-10 20:28:05 +01:00
Pavel Laptev
ce9ffdf3bd small css fix 2023-12-10 20:26:24 +01:00