gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-28 03:55:02 +03:00
Code Issues Packages Projects Releases Wiki Activity
9,705 Commits 157 Branches 1,070 Tags 61 MiB
56a4a4ac0d
Commit Graph

1474 Commits

Author SHA1 Message Date
Pavel Laptev
735cab3ef2 chore: update SVG icons 
The SVG icons in the code have been updated to match the latest design specifications.
 2023-12-22 11:38:37 +01:00
Pavel Laptev
50dcefdbd1 chore: update color variables 2023-12-22 11:35:00 +01:00
Mattias Granlund
5dfcf6182a Add apdding to empty branch messages 
- also refactors how to display border when scrollable container is scrolled
 2023-12-22 10:53:20 +01:00
Pavel Laptev
071044fd4d chore: update styling for indeterminate checkbox and remove unused test code 2023-12-22 10:41:39 +01:00
Nikita Galaiko
c290a294a8
Merge pull request #2119 from gitbutlerapp/update-dev-dependencies 
Update dev dependencies
 2023-12-22 08:46:24 +01:00
Nikita Galaiko
624451edc3 rm extra lock file 2023-12-22 08:44:59 +01:00
Mattias Granlund
4005f6d06f Add timeouts to prevent createPr() taking forever 2023-12-21 18:38:31 +01:00
Mattias Granlund
96c3696281 Retry creating PR when it fails 
- happens if request comes too qucikly after pushing
 2023-12-20 17:13:38 +01:00
Pavel Laptev
83726040c1 chore: remove unused code for info-message 2023-12-20 11:22:14 +01:00
Kiril Videlov
e055bd9d25 🔨 chore: update file title in header to be reactive 2023-12-19 21:38:04 +01:00
Kiril Videlov
31ffb73270 🔨 chore: update handling in fetch project function to emit git_fetch event 2023-12-19 16:22:35 +01:00
Mattias Granlund
6eebffabd2 Fix tree list partial commit checkboxes 2023-12-19 15:49:05 +01:00
Mattias Granlund
8e2f2d331f refactor: rename subscribe function to subscribeToFetches for clarity and consistency 2023-12-19 15:36:22 +01:00
Mattias Granlund
b73ccf8251 Style indeterminate checkboxes 2023-12-19 15:28:53 +01:00
Nikita Galaiko
037f04fca5 fix applying remote stale branches 2023-12-19 14:05:56 +01:00
Nikita Galaiko
4da16e1bac
Merge pull request #2101 from gitbutlerapp/fix-session-exists-check 
GB-614: disconnect upstream for fully integrated branches
 2023-12-19 12:20:07 +01:00
Nikita Galaiko
ea73322fff detach upstream based on trees, not commit ids 2023-12-19 12:11:33 +01:00
Nikita Galaiko
ac51651568 disconnect upstream when fully integrated 2023-12-19 12:11:33 +01:00
Nikita Galaiko
184aed0b61 branch writer to handle update to None 2023-12-19 12:11:33 +01:00
josh@gitbutler.com
e4bcab90a7 truncate instead of i32::try_from() when building index entry 2023-12-19 12:05:38 +01:00
Mattias Granlund
c0b56655ee feat: add overflow-x hidden and text-overflow ellipsis to name in btn class to prevent text overflow 2023-12-19 12:00:08 +01:00
Mattias Granlund
ca0689557c Bring back partial commits 
- functional but needs refactor and design
 2023-12-19 11:18:55 +01:00
josh@gitbutler.com
9c4f7a2d32 fix builds on windows 2023-12-19 11:11:23 +01:00
josh@gitbutler.com
d7aebc509d add windows metadata shim 2023-12-19 10:43:26 +01:00
josh@gitbutler.com
81d0eca50f remove osstring usage in favor of utf-8 standardization 2023-12-19 10:17:39 +01:00
Qix
1af90c8449
Merge pull request #2096 from gitbutlerapp/switch-from-rustix-to-fslock-1 
Switch from rustix to fslock for file locking
 2023-12-19 10:04:05 +01:00
josh@gitbutler.com
a7c58fd716 Switch from rustix to fslock for file locking 2023-12-19 09:53:51 +01:00
Mattias Granlund
2cb56b97bb fix observable mistake that leads to mutiple loads 2023-12-18 20:41:58 +01:00
Mattias Granlund
03362851d7 Fix more text clipping problems 
- in some places we need to use e.g. text-base-body-11 instead of text-base-11
 2023-12-18 20:29:18 +01:00
dependabot[bot]
cc42b4f0bd Bump @typescript-eslint/parser from 6.9.0 to 6.14.0 
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.9.0 to 6.14.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.14.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-18 20:13:34 +01:00
dependabot[bot]
f20729a8c2 chore(deps-dev): bump @codemirror/lang-markdown from 6.2.1 to 6.2.3 
Bumps [@codemirror/lang-markdown](https://github.com/codemirror/lang-markdown) from 6.2.1 to 6.2.3.
- [Changelog](https://github.com/codemirror/lang-markdown/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/lang-markdown/compare/6.2.1...6.2.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-18 20:13:20 +01:00
dependabot[bot]
5f8ad2c1c5 chore(deps-dev): bump @lezer/highlight from 1.1.6 to 1.2.0 
Bumps [@lezer/highlight](https://github.com/lezer-parser/highlight) from 1.1.6 to 1.2.0.
- [Changelog](https://github.com/lezer-parser/highlight/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lezer-parser/highlight/compare/1.1.6...1.2.0)

---
updated-dependencies:
- dependency-name: "@lezer/highlight"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-18 20:13:11 +01:00
Mattias Granlund
2dad3f2593 chore: update interval for checking updates to every 6 hours instead of every 12 hours 2023-12-18 20:11:11 +01:00
Mattias Granlund
a3c3141782 fix: set explicit branches sidebar height when none found in storage 
- to prevent content shifting when filters are applied/unapplied
 2023-12-18 17:26:59 +01:00
Nikita Galaiko
6bb4842cfe
Merge pull request #2082 from gitbutlerapp/fix-session-exists-check 
Fix session exists check
 2023-12-18 13:45:03 +01:00
Nikita Galaiko
15c090a114 infer session existance from reading required files 2023-12-18 13:41:00 +01:00
Nikita Galaiko
3fce307a4d
Merge pull request #2081 from gitbutlerapp/gb-684-allow-stashing-conflicts 
GB-684 allow stashing conflicts
 2023-12-18 13:28:17 +01:00
Nikita Galaiko
56dae673cc allow to stash conflicting branches 2023-12-18 12:59:51 +01:00
Pavel Laptev
f8a8a2f262 feat: improve commit message generation and focus textarea on mount and on focus 2023-12-18 12:38:05 +01:00
Pavel Laptev
c36033feb8 removed unused import 2023-12-17 11:46:23 +01:00
Pavel Laptev
7cf61d7cf4 updated commit box css and animation 2023-12-17 11:44:17 +01:00
Pavel Laptev
5f4b47182e Updated event type 2023-12-17 02:44:38 +01:00
Pavel Laptev
b547bbf4ef UX updates 
- removed full label select on double click
- text area styling changes
- text area auto height hook added
 2023-12-17 02:39:22 +01:00
Pavel Laptev
17eb806354 updated commit box animation speed 2023-12-17 01:03:01 +01:00
Pavel Laptev
33f9e54b74 Commit box animation updated 2023-12-17 00:23:16 +01:00
Mattias Granlund
8f0c393ceb Fix variable declaration mistake in github service 2023-12-16 21:00:35 +00:00
Mattias Granlund
8b4d3c9791 Add busy indicator while waiting for addProject 
- the plus icon turns into a spinner
 2023-12-16 20:59:53 +00:00
Mattias Granlund
55a3bd1951 Refactor and remove use of GitHubIntegrationContext 2023-12-16 19:48:51 +00:00
Mattias Granlund
a99694e670 Rename PrService -> GitHubService 2023-12-16 19:48:51 +00:00
Mattias Granlund
6d9b8828d0 Integrate github context object into PrService 2023-12-16 19:48:51 +00:00
Mattias Granlund
5d404c937b Rename pullrequests.ts -> service.ts 2023-12-16 19:48:51 +00:00
Pavel Laptev
403c255dde minor css updates 2023-12-16 16:40:58 +01:00
Pavel Laptev
dbb6154a76 Titles styles updated. Badge style updated 2023-12-16 16:27:50 +01:00
Pavel Laptev
76b26a27bb branch remote name styles 2023-12-16 15:56:06 +01:00
Mattias Granlund
34239d7097 Fix background color of commit box in dark mode 2023-12-16 12:46:37 +00:00
Mattias Granlund
ac46104ca0 Implement new commit box design 2023-12-16 12:37:14 +00:00
Mattias Granlund
eada859f6f Bundle css into js for posthog 
- should fix rendering of navbar in session recordings
- tested using Dev build, let's see what happens
 2023-12-16 10:43:39 +00:00
Kiril Videlov
884420e618 🔧 fix: refactor commit function to allow running hooks conditionally 2023-12-15 16:11:08 +01:00
Nikita Galaiko
a6b6a79268
Merge pull request #2064 from gitbutlerapp/handle-git2-http-error 
Handle git2 http error
 2023-12-15 15:42:39 +01:00
Pavel Laptev
9779a8d970
Merge pull request #2066 from gitbutlerapp/hunk-focus-state-update 
Hunk focus state update
 2023-12-15 15:41:33 +01:00
Mattias Granlund
1f5dfd4c68 Fix commit card connecting line when resizing 2023-12-15 14:40:50 +00:00
Pavel Laptev
f55ab7451b style: update hunk scrollbar styling and add transition for border color 2023-12-15 15:39:38 +01:00
Nikita Galaiko
1cb49179d2 handle http error when pushing/pulling project 2023-12-15 15:37:28 +01:00
Mattias Granlund
42d747e058 Require focus before horizontal hunk scroll 2023-12-15 14:33:34 +00:00
Pavel Laptev
257d61bec8
Merge pull request #2062 from gitbutlerapp/new-icon-ai-small 
new icon "ai-small"
 2023-12-15 14:08:16 +01:00
Mattias Granlund
cd0e209f12 feat: add remote branch display in branch card header 
The changes in this commit add the ability to display the name of the remote branch in the branch card header. This provides better visibility and context for users when working with branches.
 2023-12-15 12:58:53 +00:00
Pavel Laptev
73d171eafd chore: new ai icon 2023-12-15 13:56:42 +01:00
Pavel Laptev
52fa3e3a62
Merge pull request #2060 from gitbutlerapp/space-between-branches 
Space between branches
 2023-12-15 13:08:33 +01:00
Pavel Laptev
c955f1f417 updated space between branches 2023-12-15 13:06:51 +01:00
Nikita Galaiko
2b1c7d21c1
Merge pull request #2059 from gitbutlerapp/virtual-branch-3 
Virtual branch
 2023-12-15 13:00:20 +01:00
Nikita Galaiko
7874e60bbd only verify ssh url hosts 2023-12-15 12:55:13 +01:00
Nikita Galaiko
587826ef7f handle fetch errors in the watcher 2023-12-15 12:31:11 +01:00
Kiril Videlov
94f476eeb7 🔧 fix: improve UI text and options for Git authentication configuration 2023-12-15 12:02:27 +01:00
Mattias Granlund
eb6f224949 Fix generate message button 
- regressed when removing square/svelte-store
 2023-12-15 10:58:51 +00:00
Nikita Galaiko
2544e48216 consider force push preference when applying branches 2023-12-15 10:56:38 +01:00
Nikita Galaiko
5646580183
Merge pull request #2052 from gitbutlerapp/create-virtual-branch-from-branch 
Create virtual branch from branch
 2023-12-15 10:54:55 +01:00
Nikita Galaiko
135b78a2bf use vbranch time over remote branch time 2023-12-15 10:46:36 +01:00
Kiril Videlov
0938c82793 🐛 fix: prevent duplicate authors from being added when remoteBranch is present but pr is not 2023-12-15 10:43:52 +01:00
Mattias Granlund
0d008ff74b Prevent branch list item overflow 
- truncate long name field with ellipsis
 2023-12-15 09:43:38 +00:00
Nikita Galaiko
b2430a6f15 add tests and fix implementation for creating virtual branch from branch 2023-12-15 10:27:39 +01:00
extrawurst
f645077c6f
GB-727: Add commit msg hook (#2045) 2023-12-14 19:03:49 +01:00
Nikita Galaiko
6287021f9a
Merge pull request #2050 from gitbutlerapp/handle-default-authentication-flows 
Handle default authentication flows
 2023-12-14 18:28:39 +01:00
Nikita Galaiko
5006cd2e05 fallback to default after generated 2023-12-14 18:24:22 +01:00
Mattias Granlund
183e044700 Fix lint errors required by new version of prettier 2023-12-14 17:02:11 +00:00
Mattias Granlund
19a27b0712 chore: update posthog-js to version 1.95.1 and prettier to version 3.1.1 2023-12-14 17:02:11 +00:00
josh@gitbutler.com
686189f9ee Feature-gate unix imports 2023-12-14 17:08:11 +01:00
Qix
81e2989b75
Merge pull request #1987 from gitbutlerapp/errors-v2 
add new error types
 2023-12-14 16:25:54 +01:00
Mattias Granlund
53dba74be8 Filter out remote branches that aren't ahead 2023-12-14 15:24:51 +00:00
josh@gitbutler.com
4dcbcf5540 add new error types 2023-12-14 16:20:04 +01:00
Mattias Granlund
0503c803e8 style: add padding to empty message in project list 2023-12-14 15:19:30 +00:00
Nikita Galaiko
4ddc970747 feat: add support for default and git credentials helper as preferred SSH key options in the UI 2023-12-14 15:22:00 +01:00
extrawurst
9b00b5fe7d
GB-728: run post commit hook (#2042) 2023-12-14 13:47:45 +01:00
Mattias Granlund
31802477eb Fix project selection bug 
- branches in branch list were not being updated
 2023-12-14 12:04:34 +00:00
Mattias Granlund
072721c034 style: update width and min-width of .hunk__inner_inner class to ensure proper layout on different screen sizes 2023-12-14 11:20:08 +00:00
Mattias Granlund
35b02d7e5f Hide pr filter if not signed into github 2023-12-14 10:51:52 +00:00
Mattias Granlund
b031c50989 Fix hunk dragging style bug 
- draggable elements need unstyeld containers
 2023-12-14 10:41:06 +00:00
Mattias Granlund
bd2beac459 Fix hunk menu by using new context menu 2023-12-14 10:01:08 +00:00
Nikita Galaiko
9e8a3e57c9
Merge pull request #2037 from gitbutlerapp/fix-merge-tree-index-variable 
Fix merge tree index variable
 2023-12-14 10:12:27 +01:00
Nikita Galaiko
bfb264f93f more tests 2023-12-14 10:07:27 +01:00
Nikita Galaiko
845f9c3862
Merge pull request #2036 from gitbutlerapp/update-modifiedat-and-updated-at 
Update modifiedat and updated_at
 2023-12-14 09:43:35 +01:00
Nikita Galaiko
3b86f4cf05 updatedTimestampMs => updatedAt 2023-12-14 09:38:53 +01:00
Mattias Granlund
d320beec33 Allow row click in branch filter 2023-12-13 23:38:55 +00:00
Mattias Granlund
2ef023d4f6 Fix branch deletion 
- modal disappeared after menu auto closes
 2023-12-13 23:28:17 +00:00
Mattias Granlund
0df859366c Show filtered branch count in sidebar rather than total 2023-12-13 23:23:27 +00:00
Mattias Granlund
ecf229a018 Get rid of square/svelte-store 
- rewrite simplified version of persisted store
- replace all usages with new version
- convert updater store to AppUpdate
 2023-12-13 23:08:55 +00:00
Pavel Laptev
522e0546f5 Filter popup menu checkbox and toggle size updated 2023-12-13 20:59:01 +01:00
Kiril Videlov
e3c257cb26 🔧 fix: disable action button when branch has no files or is not active 2023-12-13 20:41:32 +01:00
Kiril Videlov
69e15844d9 🔨 chore: add check to prevent reloading when inactive 2023-12-13 19:25:57 +01:00
Mattias Granlund
26eafe27ae Move spacer component to $lib 2023-12-13 16:10:16 +00:00
Mattias Granlund
c3257691b9
Fix branch filtering 2023-12-13 16:09:58 +00:00
Mattias Granlund
be94eb6350 fix: update condition for hiding bots in branch filtering 2023-12-13 15:49:03 +00:00
Nikita Galaiko
38a733f1ca use backend branch update time 2023-12-13 16:42:28 +01:00
Nikita Galaiko
0cdf187115 ensure branch updated time is always up to date 2023-12-13 16:14:23 +01:00
Mattias Granlund
82b861758c Fix branch lane context menu 
- made it unclickable by mistake
 2023-12-13 15:10:42 +00:00
Mattias Granlund
dc6f23ccd3 Fix default state for filters 
- do not show little dot when checkboxes are checked, toggles are off
 2023-12-13 14:18:01 +00:00
Mattias Granlund
81c008c6e2 chore: remove console.log statement 2023-12-13 14:14:38 +00:00
Mattias Granlund
d60860267d feat: optimize update checking by reloading update store every 12 hours 2023-12-13 14:14:15 +00:00
Mattias Granlund
c23d1eb7e3 Refactor branch filter and apply new design 
- add toggle for hiding inactive
- choices persisted in localStorage
 2023-12-13 13:33:10 +00:00
Nikita Galaiko
483230b5c1
Merge pull request #2018 from gitbutlerapp/add-test-for-diff-correct-after-update 
Add test for diff correct after update
 2023-12-13 14:04:44 +01:00
Nikita Galaiko
fe1662d58a use target fetchedat time from backend 2023-12-13 13:50:29 +01:00
Nikita Galaiko
063e77c672 store last_fetched on target, not project 2023-12-13 13:40:41 +01:00
Nikita Galaiko
a93ac7a822
Merge pull request #2016 from gitbutlerapp/add-is-local-method 
do not shot "Open" for local commits
 2023-12-13 13:40:23 +01:00
Kiril Videlov
c8e63f24ba 🐛 fix: handle truncation when converting file metadata to u32 in git index entry 2023-12-13 12:45:24 +01:00
dependabot[bot]
e3796a1484
chore(deps): bump sentry from 0.31.8 to 0.32.0 
Bumps [sentry](https://github.com/getsentry/sentry-rust) from 0.31.8 to 0.32.0.
- [Release notes](https://github.com/getsentry/sentry-rust/releases)
- [Changelog](https://github.com/getsentry/sentry-rust/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-rust/compare/0.31.8...0.32.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-13 08:46:43 +00:00
Nikita Galaiko
f34f7ae20e
Merge pull request #1995 from gitbutlerapp/dependabot/cargo/sentry-tracing-0.32.0 
chore(deps): bump sentry-tracing from 0.31.8 to 0.32.0
 2023-12-13 09:42:24 +01:00
Nikita Galaiko
3a227df7b0
Merge pull request #1998 from gitbutlerapp/dependabot/cargo/similar-2.3.0 
chore(deps): bump similar from 2.2.1 to 2.3.0
 2023-12-13 09:41:56 +01:00
Nikita Galaiko
8d6827d784 do not show "Open" link for remote commits 2023-12-13 09:33:11 +01:00
Pavel Laptev
e40886efb8 Merged origin/master into Update hunk styles 2023-12-12 23:44:27 +01:00
Pavel Laptev
fa7f2f8b27 Space between the hunk title and details updated 2023-12-12 23:43:22 +01:00
Mattias Granlund
70d7347ae3 Refactor context menus and popups 
- add dividers (sections)
- stop using overlay for branch popup
- click outside to dismiss (without canceling click)
 2023-12-12 22:43:07 +00:00
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
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
8ec307bfbc fix file keypath resolution 2023-12-12 14:23:28 +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
1cd6220dda do not include id into user facing error message 2023-12-12 12:20:17 +01:00
Nikita Galaiko
9be36ef6af add descritpion to force pushing preference 2023-12-12 12:15:19 +01:00
Nikita Galaiko
0bb1b786ff consider force push preference when updating commit message 2023-12-12 10:47:00 +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
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]
04bc52a7e7
chore(deps): bump sentry-tracing from 0.31.8 to 0.32.0 
Bumps [sentry-tracing](https://github.com/getsentry/sentry-rust) from 0.31.8 to 0.32.0.
- [Release notes](https://github.com/getsentry/sentry-rust/releases)
- [Changelog](https://github.com/getsentry/sentry-rust/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-rust/compare/0.31.8...0.32.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-11 15:47:20 +00:00
Nikita Galaiko
768bde4f27 disallow amending if force pushing is not ok 2023-12-11 15:49:43 +01:00
Pavel Laptev
680cf192db wip 2023-12-11 15:12:31 +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
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
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
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
ce9ffdf3bd small css fix 2023-12-10 20:26:24 +01:00
Pavel Laptev
ef096fa480 default branch width updated 2023-12-10 16:52:29 +01:00
Pavel Laptev
fd42da0774 New branch dragzone updated 2023-12-10 16:42:02 +01:00
Pavel Laptev
b72f2e4b1f Wip 2023-12-09 21:54:12 +01:00
Pavel Laptev
8fa960cdee Wip 2023-12-09 21:07:59 +01:00
Pavel Laptev
8e196b1274 Fixed files list gap and added bottom padding 2023-12-09 21:03:04 +01:00
Pavel Laptev
433db0cd32 Sync button, new icons, tag updated 2023-12-09 20:53:13 +01:00
Pavel Laptev
961df0852e padding updates 2023-12-09 14:59:06 +01:00
Pavel Laptev
5cbc98fca0 new icon “commit" 2023-12-09 14:56:51 +01:00
Pavel Laptev
1b48cd40ac merged from upstream 2023-12-09 14:47:32 +01:00
Pavel Laptev
2727312b77 Added new overlay color 2023-12-09 10:23:18 +01:00
Pavel Laptev
48ad2c4e99 Updated tokens 2023-12-08 17:27:04 +01:00
Pavel Laptev
7dc40b0c1f Css fix 2023-12-08 17:18:14 +01:00
Pavel Laptev
ae4a13450d codereview fixes from https://github.com/gitbutlerapp/gitbutler-client/pull/1961 2023-12-08 17:14:05 +01:00
Pavel Laptev
478f672acb hover color updated 2023-12-08 17:09:07 +01:00
Pavel Laptev
6089678198 Merged origin/master into Update gravatar icons and branch item 2023-12-08 17:03:39 +01:00
Pavel Laptev
0e98acd370 Wip 2023-12-08 17:03:22 +01:00
Nikita Galaiko
29b6430fb4
Merge pull request #1964 from gitbutlerapp/update-dependencies-1 
Update dependencies 1
 2023-12-08 16:26:40 +01:00
Pavel Laptev
07b501f6a5 Codereview fixes 2023-12-08 15:07:49 +01:00
Pavel Laptev
9dcf5b49aa Merged origin/master into Improve label editing using keyboard 2023-12-08 14:54:41 +01:00
Nikita Galaiko
14254fe23c fix: ensure known_hosts is up to date 2023-12-08 14:51:16 +01:00
Nikita Galaiko
9e57b90f7d
Merge pull request #1957 from gitbutlerapp/smarter-credentials-helper 
smarter credentials helper
 2023-12-08 12:28:45 +01:00
Nikita Galaiko
f1fd6e6a59 hint absolute path 2023-12-08 11:13:35 +01:00
Mattias Granlund
56537d428c Create ScrollableContainer component 
- use it for all scrollable containers other than board
- commit got too big, includes github PR stuff (not active)
 2023-12-08 10:04:11 +00:00
Nikita Galaiko
a1d8b8cb8c test all the keys 2023-12-08 11:02:17 +01:00
Pavel Laptev
2d12e953ea Fixes 2023-12-07 17:29:56 +01:00
Pavel Laptev
6dfc9203fa Fix 2023-12-07 17:24:56 +01:00
Pavel Laptev
39d4b5f861 Wip 2023-12-07 17:22:19 +01:00
Pavel Laptev
f6f9d57520 Update 2023-12-07 14:03:22 +01:00
Pavel Laptev
935376ed8c Wip 2023-12-07 13:14:37 +01:00
Nikita Galaiko
346685cc64 if we know which auth to use, only use that 2023-12-07 11:13:49 +01:00
Nikita Galaiko
287fe9d3db smarter credentials helper 2023-12-06 17:24:48 +01:00
Pavel Laptev
0cc4e089a8 new icons 2023-12-06 17:20:18 +01:00
Pavel Laptev
f53c3ca66d Merged origin/master into Add new components 2023-12-06 16:37:53 +01:00
Pavel Laptev
daa2187ca3 radio and toggle added 2023-12-06 16:37:46 +01:00
Nikita Galaiko
177a5f9772 retry posthog 2023-12-06 14:20:20 +01:00
Pavel Laptev
6ba0982e56 Merged origin/master into Add new components 2023-12-06 13:16:57 +01:00
Pavel Laptev
a0952810c4 checkbox added 2023-12-06 13:16:44 +01:00
extrawurst
70ea19745a
GB-587: add credential helper support (#1946) 2023-12-06 11:00:50 +01:00
Mattias Granlund
4ffad7a466 Use textbox components in settings page 2023-12-05 23:09:15 +00:00
Nikita Galaiko
5c739aa88e
Merge pull request #1944 from gitbutlerapp/remove-unused-modules 
Remove unused modules
 2023-12-05 17:00:12 +01:00
Mattias Granlund
8f67de5cbe Some small nits 
- remove app drag region from branch lane
- remove unused variable
- remove unused css class
 2023-12-05 15:53:33 +00:00
Pavel Laptev
89f03a6701 Merged origin/master into Margin fix 2023-12-05 16:49:30 +01:00
Pavel Laptev
16b3545c12 fixed ListItem height for the dropdown menu 2023-12-05 16:49:22 +01:00
Nikita Galaiko
d434b8d6d4 remove butler leftovers 2023-12-05 16:48:27 +01:00
Mattias Granlund
49f2cfd63d Fix resizing while zoomed in 
- take into account zoom factor when converting to rem units
 2023-12-05 15:47:16 +00:00
Nikita Galaiko
0e047c33d2
Merge pull request #1941 from gitbutlerapp/refactor-repo-open-error-handling 
Refactor repo open error handling
 2023-12-05 16:45:27 +01:00
Pavel Laptev
8d83a9279c Merged origin/master into Margin fix 2023-12-05 16:44:06 +01:00
Pavel Laptev
a035e9a4fa fix 2023-12-05 16:43:08 +01:00
Nikita Galaiko
85143e0848 rm id from error title 2023-12-05 16:41:10 +01:00
Nikita Galaiko
4696fcf492 retry for file watcher start 2023-12-05 16:38:37 +01:00
Mattias Granlund
95449584f9 Rename /user to /settings in frontend 2023-12-05 15:34:02 +00:00
Nikita Galaiko
0810b3b69b
Merge pull request #1921 from gitbutlerapp/dependabot/cargo/byteorder-1.5.0 
chore(deps): bump byteorder from 1.4.3 to 1.5.0
 2023-12-05 16:15:28 +01:00
Nikita Galaiko
df1e2250c2
Merge pull request #1918 from gitbutlerapp/dependabot/cargo/ssh-key-0.6.3 
chore(deps): bump ssh-key from 0.6.2 to 0.6.3
 2023-12-05 16:15:05 +01:00
Nikita Galaiko
2bbcef7653
Merge pull request #1937 from gitbutlerapp/add-rate-limiter 
Add rate limiter
 2023-12-05 16:14:26 +01:00
dependabot[bot]
1a5f2567d8 chore(deps-dev): bump eslint-config-prettier from 9.0.0 to 9.1.0 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 9.0.0 to 9.1.0.
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v9.0.0...v9.1.0)

---
updated-dependencies:
- dependency-name: eslint-config-prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-05 15:14:03 +00:00
dependabot[bot]
7e76cc148d chore(deps-dev): bump @typescript-eslint/eslint-plugin 
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.7.3 to 6.13.2.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.13.2/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-05 15:13:27 +00:00
dependabot[bot]
805792f276 chore(deps-dev): bump @codemirror/language from 6.9.0 to 6.9.3 
Bumps [@codemirror/language](https://github.com/codemirror/language) from 6.9.0 to 6.9.3.
- [Changelog](https://github.com/codemirror/language/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/language/compare/6.9.0...6.9.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-05 15:11:14 +00:00
dependabot[bot]
0501ef6646 chore(deps-dev): bump eslint from 8.54.0 to 8.55.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.54.0 to 8.55.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.54.0...v8.55.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-12-05 15:10:42 +00:00
dependabot[bot]
a7dbc68288 chore(deps-dev): bump nanoevents from 8.0.0 to 9.0.0 
Bumps [nanoevents](https://github.com/ai/nanoevents) from 8.0.0 to 9.0.0.
- [Changelog](https://github.com/ai/nanoevents/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoevents/compare/8.0.0...9.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-05 15:10:34 +00:00
Nikita Galaiko
ff4e236038 Merged origin/master into Add rate limiter 2023-12-05 16:08:53 +01:00