Merge branch 'master' into dependabot/npm_and_yarn/http-cache-semanti…

…cs-4.1.1
redpwn · Jun 11, 2023 · df0e702 · df0e702
2 parents f4d5476 + 0a0b17e
commit df0e702
Show file tree

Hide file tree

Showing 3 changed files with 178 additions and 131 deletions.
diff --git a/docs/content/providers/uploads/gcs.md b/docs/content/providers/uploads/gcs.md
@@ -10,7 +10,7 @@ Option|Description
 -|-
 `credentials.private_key`|The PEM-encoded private key for the service account with access to the GCS bucket.
 `credentials.client_email`|The email of the service account with access to the GCS bucket.
-`bucket`|The name of the GCS bucket.
+`bucketName`|The name of the GCS bucket.
 
 ## Configuration Example
 

diff --git a/test/conf-test.yaml b/test/conf-test.yaml
@@ -9,7 +9,7 @@ ctfName: rCTF
 origin: http://127.0.0.1:8080
 
 startTime: 1591500500000
-endTime: 1623358000000
+endTime: 5000000000000
 
 divisions:
   hs: High School