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 0041e8c

Browse files
committedAug 12, 2024
rebase on main
1 parent 215a3ac commit 0041e8c

File tree

5 files changed

+136
-9
lines changed

5 files changed

+136
-9
lines changed
 

‎Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ gen: \
494494
docs/admin/integrations/prometheus.md \
495495
>>>>>>> 0e1703387 (modify prometheus location)
496496
docs/reference/cli/README.md \
497-
docs/admin/audit-logs.md \
497+
docs/admin/security/audit-logs.md \
498498
coderd/apidoc/swagger.json \
499499
.prettierignore.include \
500500
.prettierignore \
@@ -530,7 +530,7 @@ gen/mark-fresh:
530530
docs/admin/integrations/prometheus.md \
531531
>>>>>>> 0e1703387 (modify prometheus location)
532532
docs/reference/cli/README.md \
533-
docs/admin/audit-logs.md \
533+
docs/admin/security/audit-logs.md \
534534
coderd/apidoc/swagger.json \
535535
.prettierignore.include \
536536
.prettierignore \
@@ -650,10 +650,10 @@ docs/reference/cli/README.md: scripts/clidocgen/main.go examples/examples.gen.js
650650
./scripts/pnpm_install.sh
651651
pnpm exec prettier --write ./docs/reference/cli/README.md ./docs/reference/cli/*.md ./docs/manifest.json
652652

653-
docs/admin/audit-logs.md: coderd/database/querier.go scripts/auditdocgen/main.go enterprise/audit/table.go coderd/rbac/object_gen.go
653+
docs/admin/security/audit-logs.md: coderd/database/querier.go scripts/auditdocgen/main.go enterprise/audit/table.go coderd/rbac/object_gen.go
654654
go run scripts/auditdocgen/main.go
655655
./scripts/pnpm_install.sh
656-
pnpm exec prettier --write ./docs/admin/audit-logs.md
656+
pnpm exec prettier --write ./docs/admin/security/audit-logs.md
657657

658658
coderd/apidoc/swagger.json: $(shell find ./scripts/apidocgen $(FIND_EXCLUSIONS) -type f) $(wildcard coderd/*.go) $(wildcard enterprise/coderd/*.go) $(wildcard codersdk/*.go) $(wildcard enterprise/wsproxy/wsproxysdk/*.go) $(DB_GEN_FILES) .swaggo docs/manifest.json coderd/rbac/object_gen.go
659659
./scripts/apidocgen/generate.sh

‎docs/admin/security/README.md

Whitespace-only changes.
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.