Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 63133cf

Browse files
EmyrkEmyrk
committedJan 5, 2024
Merge remote-tracking branch 'origin/main' into stevenmasley/relax_csrf
2 parents a4bbc80 + f0132b5 commit 63133cf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+801
-1759
lines changed
 

‎coderd/apidoc/swagger.json

Lines changed: 1 addition & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/dbauthz/setup_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import (
99
"strings"
1010
"testing"
1111

12-
"github.com/golang/mock/gomock"
1312
"github.com/google/uuid"
1413
"github.com/open-policy-agent/opa/topdown"
1514
"github.com/stretchr/testify/require"
1615
"github.com/stretchr/testify/suite"
16+
"go.uber.org/mock/gomock"
1717
"golang.org/x/xerrors"
1818

1919
"cdr.dev/slog"
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.