Commit graph

32315 commits

Author SHA1 Message Date
tidy-dev d8f5174f0b Release 3.0.0 🎉 2022-04-25 16:30:51 -04:00
tidy-dev 05e1021045
Merge pull request #14452 from desktop/releases/2.9.16-beta2
Release 2.9.16-beta2
2022-04-25 16:25:52 -04:00
tidy-dev 092e9b96d0 Release 2.9.16-beta2 2022-04-25 15:18:57 -04:00
tidy-dev 0bb7f44d85
Merge pull request #14439 from desktop/handle-divergent-paths
Add default option for pulling divergent paths
2022-04-25 15:15:30 -04:00
tidy-dev a0e69810b2 Only need ff check and handle failure
Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com>
2022-04-25 12:32:08 -04:00
tidy-dev 69548b616f
Merge pull request #14419 from desktop/releases/2.9.16-beta1
Release 2.9.16-beta1
2022-04-25 11:40:01 -04:00
tidy-dev 2ef68123f4 Revert "More useful test pull request checks failed"
This reverts commit 2972b77667.
2022-04-25 07:22:00 -04:00
tidy-dev 6ffab6bde2 Revert "Some helpful errors"
This reverts commit 0ef487360a.
2022-04-25 07:21:57 -04:00
tidy-dev 0ef487360a Some helpful errors 2022-04-25 07:20:56 -04:00
tidy-dev 2972b77667 More useful test pull request checks failed 2022-04-25 07:20:56 -04:00
tidy-dev 88dd1d2002 Revert "More useful test pull request checks failed"
This reverts commit 25af9843db.
2022-04-25 07:20:01 -04:00
tidy-dev 6637b84783 Revert "Some helpful errors"
This reverts commit 34015dbbc1.
2022-04-25 07:19:56 -04:00
tidy-dev 34015dbbc1 Some helpful errors 2022-04-25 07:17:47 -04:00
tidy-dev 25af9843db More useful test pull request checks failed 2022-04-25 06:59:04 -04:00
tidy-dev 9a1e0ed5ab Add default option for pulling divergent paths 2022-04-22 11:10:57 -04:00
tidy-dev d300972f80 Release 2.9.16-beta1 2022-04-20 07:41:11 -04:00
tidy-dev fbe8a6b161
Merge pull request #14418 from desktop/releases/2.9.15
Release 2.9.15
2022-04-20 07:36:24 -04:00
Markus Olsson 55730bca39 Bump version and add changelog for 2.9.15 2022-04-20 10:31:08 +02:00
Markus Olsson aab0eb808e
Merge pull request #14417 from desktop/releases/2.9.15-beta2
Release 2.9.15-beta2
2022-04-20 10:19:35 +02:00
Markus Olsson f84ec33caf Changelog and version bump 2022-04-20 09:24:57 +02:00
Markus Olsson ba150f46d4
Merge pull request #14415 from desktop/dugite-1.109.0
Bump dugite to 1.109.0 to get Git LFS 3.1.4
2022-04-20 09:19:02 +02:00
Markus Olsson 360880a76a Bump dugite to 1.109.0 to get Git LFS 3.1.4 2022-04-20 08:56:09 +02:00
Markus Olsson 8828ab2229
Merge pull request #14410 from desktop/trust-progress-indicator
Show progress indicator when adding directory to `safe.directory`
2022-04-20 08:55:14 +02:00
Markus Olsson 305fc021e8
Merge pull request #14322 from desktop/update-re-run-dialog
Update re run dialog
2022-04-19 15:06:55 +02:00
Markus Olsson 39b1c97af1 Prettify 2022-04-19 14:44:21 +02:00
tidy-dev 26dfeaa460
Update app/src/ui/check-runs/ci-check-run-rerun-dialog.tsx
Co-authored-by: Markus Olsson <j.markus.olsson@gmail.com>
2022-04-19 07:24:52 -04:00
tidy-dev 858428676e
Update app/src/ui/check-runs/ci-check-run-rerun-dialog.tsx
Co-authored-by: Markus Olsson <j.markus.olsson@gmail.com>
2022-04-19 07:24:43 -04:00
Markus Olsson eb9aa9dd2a Merge branch 'development' into trust-progress-indicator 2022-04-19 12:07:25 +02:00
Markus Olsson 249cf2e265 Don't show unsafe path unless it differs from entered path 2022-04-19 10:41:33 +02:00
Markus Olsson 173b8c47bb
Merge pull request #14381 from desktop/releases/2.9.15-beta1
Release 2.9.15-beta1
2022-04-19 10:04:10 +02:00
Markus Olsson 349004e06b Show progress spinner while setting safe.directory 2022-04-19 09:58:02 +02:00
Markus Olsson ef418db4fe Show spinner when adding path to safe.directory 2022-04-19 09:52:36 +02:00
Markus Olsson adfee67792
Merge pull request #14389 from shiftkey/point-disturl
Update `disturl` to point to new location to access Electron's NodeJS headers
2022-04-19 09:20:53 +02:00
Steve Ward 029fa13207
Merge pull request #14392 from devnll/patch-1
Fix reference to GitLab in Bitbucket doc
2022-04-18 08:43:19 -04:00
Steve Ward fa9c130f56
Merge pull request #14394 from devnll/patch-2
Fix incorrect menu item in Bitbucket doc
2022-04-18 08:43:07 -04:00
devnll 6d77a0a760
Fix incorrect menu item in Bitbucket doc 2022-04-16 09:44:19 -06:00
devnll 6936cfd488
Fix reference to GitLab 2022-04-16 09:42:11 -06:00
Brendan Forster 3ea10f86f9 update disturl to point to new location to access Electron's NodeJS headers 2022-04-15 14:53:51 -03:00
tidy-dev d4054a378d Release 2.9.15-beta1 2022-04-14 23:23:50 -04:00
tidy-dev 9f932fdea3 Bump dugite -> Bumps Git to 2.35.3 2022-04-14 23:16:24 -04:00
Markus Olsson 8b0871ad20
Merge pull request #14380 from desktop/the-waiting-game
Await the results of adGlobalConfigValueIfMissing
2022-04-15 00:27:03 +02:00
Markus Olsson c0f215c4ab Await the results of adGlobalConfigValueIfMissing 2022-04-14 23:38:52 +02:00
Markus Olsson f0b8a5e025
Merge pull request #14376 from desktop/detect-repository-in-unsafe-dir
Update create repository dialog to understand unsafe paths
2022-04-14 22:30:15 +02:00
Markus Olsson c42a51271b Merge branch 'development' into detect-repository-in-unsafe-dir 2022-04-14 20:13:31 +02:00
Markus Olsson ff21ba7fd3
Merge pull request #14374 from desktop/unsafe-after-clone
Cloning into, and adding multiple, unsafe locations
2022-04-14 20:12:55 +02:00
Markus Olsson 82b45b9f7a Unify logic for detecting whether a path contains a repository
This changes the logic where earlier we would only check if the path, not the path + name was a Git repository
2022-04-14 20:10:41 +02:00
Markus Olsson e2e88b6252 Use getRepositoryType instead of deprecated isGitRepository 2022-04-14 20:09:46 +02:00
Markus Olsson b551f73448 Use combined path when opening Add local repodialog 2022-04-14 20:09:19 +02:00
Markus Olsson dac424de2a
Merge pull request #14368 from desktop/unc-path-allow-list
Add UNC path prefix before adding to safe directory list
2022-04-14 18:58:11 +02:00
Markus Olsson d05d55cc96 Use an approximation in create-repository to detect repositories inside of unsafe paths 2022-04-14 18:57:55 +02:00