Nikita Galaiko
|
5bd549f22c
|
detect conflict resolution while comitting
|
2023-10-12 15:07:14 +02:00 |
|
Nikita Galaiko
|
2700be6b50
|
virtual branches conflict test
|
2023-10-12 14:25:01 +02:00 |
|
Nikita Galaiko
|
0847685527
|
Merge pull request #1353 from gitbutlerapp/Virtual-branch-2
update integrated separator copy
|
2023-10-12 13:59:03 +02:00 |
|
Nikita Galaiko
|
90124acd1d
|
update integrated separator copy
|
2023-10-12 13:57:30 +02:00 |
|
Mattias Granlund
|
b1008356ab
|
Fix lang/punctuation in delete dialog
- should have done this in the last commit
|
2023-10-12 11:51:59 +02:00 |
|
Mattias Granlund
|
5501509671
|
Use right font-color for project name when deleting data
|
2023-10-12 11:23:53 +02:00 |
|
extrawurst
|
fe64ae9db7
|
fix tests
|
2023-10-12 11:23:19 +02:00 |
|
extrawurst
|
dd8977a588
|
write objects path to gb repos alternates file
|
2023-10-12 11:09:39 +02:00 |
|
Nikita Galaiko
|
3366f24384
|
Merge pull request #1348 from gitbutlerapp/init-integrations-tests
assert error types instead of messages
|
2023-10-12 11:05:45 +02:00 |
|
Nikita Galaiko
|
3a397c110f
|
assert error types instead of messages
|
2023-10-12 10:59:52 +02:00 |
|
Nikita Galaiko
|
8dd6c74e00
|
Merge pull request #1347 from gitbutlerapp/Virtual-branch-2
move tempfile to dev-dependencies
|
2023-10-12 10:56:20 +02:00 |
|
Nikita Galaiko
|
cc912997d6
|
sort deps
|
2023-10-12 10:48:57 +02:00 |
|
Nikita Galaiko
|
4a2db963b4
|
Merge pull request #1346 from gitbutlerapp/init-integrations-tests
init integration tests
|
2023-10-12 10:45:00 +02:00 |
|
Nikita Galaiko
|
92e28f7588
|
move tempfile to dev-dependencies
|
2023-10-12 10:44:49 +02:00 |
|
Nikita Galaiko
|
a71baaacb0
|
init integration tests
|
2023-10-12 10:36:48 +02:00 |
|
Nikita Galaiko
|
796a8930f8
|
Merge pull request #1345 from gitbutlerapp/Fix-reset-head-commit-function
resetHeadCommit to handle single commit reset
|
2023-10-12 08:39:49 +02:00 |
|
Nikita Galaiko
|
f65c5cad21
|
resetHeadCommit to handle single commit reset
|
2023-10-12 08:38:22 +02:00 |
|
Nikita Galaiko
|
cafff126f2
|
Merge pull request #1344 from gitbutlerapp/fix-remote-before-push
handle remote is set but not pushed
|
2023-10-12 08:22:23 +02:00 |
|
Nikita Galaiko
|
bf65ec2d98
|
handle remote is set but not pushed
|
2023-10-12 08:16:43 +02:00 |
|
Nikita Galaiko
|
a5d898182a
|
Merge pull request #1342 from gitbutlerapp/force-pushing
|
2023-10-11 16:01:07 +02:00 |
|
Nikita Galaiko
|
17f83c5c0c
|
add a warning tooltip
|
2023-10-11 15:16:00 +02:00 |
|
extrawurst
|
5e186b580c
|
add and fix clippy::restrictions lints (#1341)
left a few as TODO which make sense but pose too much refactoring right now
|
2023-10-11 15:14:54 +02:00 |
|
Nikita Galaiko
|
ce3bd1521c
|
use force push when needed
|
2023-10-11 15:09:04 +02:00 |
|
Nikita Galaiko
|
b834a6ef01
|
say force push if it's going to happen
|
2023-10-11 14:46:00 +02:00 |
|
Nikita Galaiko
|
3b5005c865
|
ui for resetting remote commits
|
2023-10-11 14:41:33 +02:00 |
|
Nikita Galaiko
|
f7916c7907
|
add requires_force calculation for vbranch
|
2023-10-11 14:33:01 +02:00 |
|
Nikita Galaiko
|
be86302d6b
|
merged upstream (head only)
|
2023-10-11 14:14:44 +02:00 |
|
Nikita Galaiko
|
e6c5ddfbb4
|
Merge pull request #1340 from gitbutlerapp/Add-empty-bare-repository-function
use a real (though local) remote repository for tests
|
2023-10-11 14:14:32 +02:00 |
|
Nikita Galaiko
|
36e3a120d6
|
add missing import
|
2023-10-11 14:08:59 +02:00 |
|
Nikita Galaiko
|
7bf0252269
|
add init_bare to repository
|
2023-10-11 14:02:18 +02:00 |
|
Nikita Galaiko
|
5209ee05a2
|
fixup
|
2023-10-11 13:57:48 +02:00 |
|
Nikita Galaiko
|
e3d43eb874
|
use a real (though local) remote repository for tests
|
2023-10-11 13:56:46 +02:00 |
|
extrawurst
|
856f9b73c1
|
Merge pull request #1337 from gitbutlerapp/go-full-on-clippy
enable more clippy lints and allow a few that would make our life muc…
|
2023-10-11 13:27:19 +02:00 |
|
Nikita Galaiko
|
73fa6e9c90
|
correctly return git fetch errors
|
2023-10-11 12:47:52 +02:00 |
|
Nikita Galaiko
|
0e1be9d25f
|
correctly return git push errors
|
2023-10-11 12:47:52 +02:00 |
|
Nikita Galaiko
|
bf6b7361ed
|
Merge pull request #1339 from gitbutlerapp/Filter-commits-by-type
fix integrated not remote commits display
|
2023-10-11 12:41:47 +02:00 |
|
Nikita Galaiko
|
8d9145738b
|
fix integrated not remote commits display
|
2023-10-11 12:40:17 +02:00 |
|
Nikita Galaiko
|
491eaa09fe
|
Merge pull request #1338 from gitbutlerapp/Handle-conflicting-commits
revert check for conflicts before commit creation
|
2023-10-11 12:13:28 +02:00 |
|
Nikita Galaiko
|
4c62849906
|
revert check for conflicts before commit creation
|
2023-10-11 12:05:48 +02:00 |
|
extrawurst
|
2ecf57e75a
|
enable more clippy lints and allow a few that would make our life much harder, allow also some that need more careful review (number casts)
|
2023-10-11 11:29:41 +02:00 |
|
extrawurst
|
91303d9bf4
|
Merge pull request #1330 from gitbutlerapp/deny-unsafe-code
make sure clippy does not allow us to use unsafe
|
2023-10-11 10:38:43 +02:00 |
|
Nikita Galaiko
|
058b8bc70e
|
Merge pull request #1333 from gitbutlerapp/Refactor-init-device-oauth
fix: handle errors properly in init_device_oauth and check_auth_statu…
|
2023-10-11 10:38:14 +02:00 |
|
Kiril Videlov
|
b968c2cedd
|
fix incorrect csp list
|
2023-10-11 10:37:07 +02:00 |
|
extrawurst
|
b480902bf5
|
remove all unsafe usage and forbid it moving forward
|
2023-10-11 10:34:49 +02:00 |
|
Nikita Galaiko
|
2b47ed10bb
|
Merge branch 'master' into Refactor-init-device-oauth
|
2023-10-11 10:32:39 +02:00 |
|
Nikita Galaiko
|
3ecad2aa6e
|
Merge pull request #1335 from gitbutlerapp/Remove-conflict-check
should be possible to commit during conflict
|
2023-10-11 10:31:55 +02:00 |
|
Nikita Galaiko
|
7a145d2450
|
should be possible to commit during conflict
|
2023-10-11 10:26:16 +02:00 |
|
extrawurst
|
6fdb42f593
|
merged from upstream
|
2023-10-11 10:18:35 +02:00 |
|
extrawurst
|
f69029247e
|
fix conflicts
|
2023-10-11 10:18:28 +02:00 |
|
extrawurst
|
543cef22a1
|
Merge branch 'master' into deny-unsafe-code
|
2023-10-11 10:08:45 +02:00 |
|