development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-08-28 12:40:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
35616 commits 300 branches 689 tags 357 MiB
Commit graph

35616 commits

This branch
This branch
All branches
Author SHA1 Message Date
tidy-dev 48bb70598e Release 3.3.8 
Update changelog.json
 2024-01-18 07:22:01 -05:00
Markus Olsson 204e125bc9 Merge pull request #18036 from desktop/ghes-avatar-url 2024-01-18 07:22:01 -05:00
tidy-dev 0f60cccfb9 Fix merge button availability regression 2024-01-18 07:19:00 -05:00
tidy-dev 2723e61b4a Or... the other one .. 2024-01-16 10:51:15 -05:00
tidy-dev fb8a5543f1 Consolidate tooltip notes 2024-01-16 10:49:19 -05:00
tidy-dev 42a1c90f46 Release 3.3.7 2024-01-16 09:37:57 -05:00
tidy-dev 0533ff3db3 Release 3.3.7-beta3 2024-01-10 14:01:18 -05:00
tidy-dev 67b09decf0
Merge pull request #17934 from desktop/Fix-race-condition-in-mergability-check 
Fix merge branch dialog preview message check for slow merge check
 2024-01-10 13:57:04 -05:00
Markus Olsson 789563ae39
Merge pull request #17992 from desktop/how-do-domains-even-work 
Fix hostname detection
 2024-01-10 14:18:28 +01:00
Markus Olsson 37f02e3b65 fooghe.com isn't the same as foo.ghe.com 2024-01-10 13:34:21 +01:00
Markus Olsson 2e36a33bc2
Merge pull request #17991 from desktop/ghe-avatars 
Resolve token for avatars when necessary
 2024-01-10 13:31:30 +01:00
Markus Olsson d3cee28135 Get rid of null 2024-01-10 12:57:08 +01:00
Markus Olsson 3b2c1553bd Be explicit about null meaning 2024-01-10 11:55:16 +01:00
Markus Olsson ba5ada9cb0 Remove duplicated logic 2024-01-10 11:52:45 +01:00
Markus Olsson 672515d62e Simplify 2024-01-10 11:43:41 +01:00
Markus Olsson 822fc49a80 Merge branch 'development' into ghe-avatars 2024-01-09 14:57:00 +01:00
tidy-dev 8d88edc18f Don't update this.mergeStatus until ready to update preview 2024-01-09 08:05:45 -05:00
Sergio Padrino 805e439b7a
Merge pull request #17879 from desktop/amend-with-coauthors 
Restore co-authors trying to amend a commit
 2024-01-09 13:21:05 +01:00
tidy-dev 473d3939b2
Merge pull request #17954 from desktop/read-tags-with-commas 
Comma is a valid character in tags
 2024-01-09 07:20:40 -05:00
tidy-dev c0b1505cae Use flatmap 
Co-Authored-By: Sergio Padrino <1083228+sergiou87@users.noreply.github.com>
 2024-01-09 07:03:22 -05:00
tidy-dev 566ecb642a
Merge pull request #17936 from desktop/fix-reveal-in-finder-crashing-finder 
Fix "Reveal in Finder" in conflicts resolution dialog
 2024-01-09 06:44:57 -05:00
Sergio Padrino 5a75257c63
Merge pull request #17987 from desktop/bulb-button-not-submit 
Explicit use of type=button for ToggletippedContent
 2024-01-09 12:39:53 +01:00
Sergio Padrino d13f7bfd58 Explicit use of type=button for ToggletippedContent 
Since we're not using our `Button` component here, using this `ToggletippedContent` component in forms will result in the containing button to adopt the `type=submit` by default, causing undesired behaviors when clicked.
 2024-01-09 12:21:48 +01:00
Markus Olsson 460651389f Disable alive for ghe for now 2024-01-08 16:12:36 +01:00
tidy-dev e5641a12d1
Merge pull request #17930 from desktop/invalid-selected-rows-error 
Use empty array for selectedRows on autocompleting text input list
 2024-01-08 06:11:56 -05:00
tidy-dev 0d35d23610
Merge pull request #17940 from JannesMeyer/patch-1 
Fix Alacritty bundle ID on macOS
 2024-01-03 10:08:56 -05:00
tidy-dev 932d008633 Merge branch 'development' into Fix-race-condition-in-mergability-check 2024-01-03 09:56:44 -05:00
tidy-dev 32e3525ae2
Merge pull request #17950 from GengShengJia/Fix-redundant-merge-status-updates 
Fix redundant merge status updates
 2024-01-03 09:54:41 -05:00
GengShengJia 931b8265b8 Improve merge status updates 2024-01-03 09:12:55 +08:00
tidy-dev dd770ad210 Don't use regex 2024-01-02 14:07:39 -05:00
tidy-dev 752949e819 comma is a valid character in tags 2024-01-02 09:44:57 -05:00
GengShengJia 60fd1d8e55 Fix redundant merge status updates 2024-01-02 11:26:22 +08:00
Jannes Meyer 16a98faf53
Fix Alacritty bundle ID 2023-12-29 18:04:39 +01:00
tidy-dev ca02c52a95 Fix reveal in finder for merge check 2023-12-28 10:55:58 -05:00
tidy-dev 9cc5910f7c Fix mergeability check race condition 2023-12-28 10:25:42 -05:00
tidy-dev 4a60eedd61
Merge pull request #17931 from desktop/remove-unneeded-disables 
Remove unneeded a11y linter disables
 2023-12-27 12:36:37 -05:00
tidy-dev 30ebefcec3 Remove unneeded disables 2023-12-27 12:14:14 -05:00
tidy-dev 5dee0efa46 Use empty array for selectedRows 2023-12-27 12:13:35 -05:00
Markus Olsson 9c6707d5c1
Merge pull request #17886 from desktop/dependabot/github_actions/actions/upload-artifact-4 
Bump actions/upload-artifact from 3 to 4
 2023-12-21 14:35:17 +01:00
Markus Olsson 3db2afd077
Merge pull request #17887 from desktop/dependabot/github_actions/github/codeql-action-3 
Bump github/codeql-action from 2 to 3
 2023-12-21 14:34:16 +01:00
Markus Olsson a70f38df94 Treat it as if it got added but then insta-deleted 2023-12-20 13:11:02 +01:00
Markus Olsson 6d105e6fd0 🎨 2023-12-20 13:09:05 +01:00
Markus Olsson e6bf1e9d9f 📖 2023-12-20 13:04:52 +01:00
Markus Olsson d830d9c179 Unused imports 2023-12-20 13:04:49 +01:00
Markus Olsson f866f1c6a1 Use exported endpoint test utilities 2023-12-20 13:03:43 +01:00
Markus Olsson e927688603 Use exported isGHE 2023-12-20 12:54:05 +01:00
Markus Olsson 25020cfbdb Export and unify GHE host detection 2023-12-20 12:53:27 +01:00
Markus Olsson f5e191c96f Better typing 2023-12-20 12:51:52 +01:00
Markus Olsson b8f5b4ff04 📖 2023-12-20 12:49:02 +01:00
Markus Olsson c271e02d41 Leverage expiring operations cache 2023-12-20 12:36:21 +01:00