Skip to content

chore: upgrade tailscale to v1.46.1 #8913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Aug 9, 2023
Merged

chore: upgrade tailscale to v1.46.1 #8913

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
98b6ecb
t
coadler Aug 3, 2023
1fb0a1b
chore: update `golang.org/x/exp/slices`
coadler Aug 4, 2023
3eaec11
fixup! chore: update `golang.org/x/exp/slices`
coadler Aug 4, 2023
2fd96f1
fixup! chore: update `golang.org/x/exp/slices`
coadler Aug 4, 2023
8cedf7a
fixup! chore: update `golang.org/x/exp/slices`
coadler Aug 4, 2023
ccac703
fixup! chore: update `golang.org/x/exp/slices`
coadler Aug 4, 2023
ea37bc6
fixup! chore: update `golang.org/x/exp/slices`
coadler Aug 4, 2023
3c345e8
fixup! chore: update `golang.org/x/exp/slices`
coadler Aug 4, 2023
db5931f
fixup! chore: update `golang.org/x/exp/slices`
coadler Aug 4, 2023
1992d1f
fixup! chore: update `golang.org/x/exp/slices`
coadler Aug 4, 2023
dc935d0
fixup! chore: update `golang.org/x/exp/slices`
coadler Aug 4, 2023
faf4189
Merge branch 'main' into colin/ts-1.46
coadler Aug 7, 2023
58cc6ee
fixup! Merge branch 'main' into colin/ts-1.46
coadler Aug 7, 2023
00c2b66
fix batcher maybe
coadler Aug 7, 2023
6c7f012
use wireguard-go fork
coadler Aug 7, 2023
9a08790
try to fix batcher flake again
coadler Aug 8, 2023
f50b31f
Merge branch 'main' into colin/ts-1.46
coadler Aug 8, 2023
72681f0
fixup! Merge branch 'main' into colin/ts-1.46
coadler Aug 8, 2023
2e5e08d
Merge branch 'main' into colin/ts-1.46
coadler Aug 9, 2023
0feac85
fixup! Merge branch 'main' into colin/ts-1.46
coadler Aug 9, 2023
243e26a
fixup! Merge branch 'main' into colin/ts-1.46
coadler Aug 9, 2023
d231f46
fixup! Merge branch 'main' into colin/ts-1.46
coadler Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup! chore: update golang.org/x/exp/slices
  • Loading branch information
@coadler
coadler committed Aug 4, 2023
commit 3c345e8b57e34e62a68ea7fc17ddce061d5c9c07
7 changes: 4 additions & 3 deletions coderd/users_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import (
"context"
"fmt"
"net/http"
"sort"
"strings"
"testing"
"time"

"github.com/google/uuid"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"golang.org/x/exp/slices"
"golang.org/x/sync/errgroup"

"github.com/coder/coder/cli/clibase"
Expand All @@ -20,6 +20,7 @@ import (
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/database/dbauthz"
"github.com/coder/coder/coderd/rbac"
"github.com/coder/coder/coderd/util/slice"
"github.com/coder/coder/codersdk"
"github.com/coder/coder/testutil"
)
Expand Down Expand Up @@ -1804,8 +1805,8 @@ func assertPagination(ctx context.Context, t *testing.T, client *codersdk.Client

// sortUsers sorts by (created_at, id)
func sortUsers(users []codersdk.User) {
sort.Slice(users, func(i, j int) bool {
return strings.ToLower(users[i].Username) < strings.ToLower(users[j].Username)
slices.SortFunc(users, func(a, b codersdk.User) int {
return slice.Ascending(strings.ToLower(a.Username), strings.ToLower(b.Username))
})
}

Expand Down