Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit eb4ba48

Browse files
mtojekmtojek
committed
Merge
1 parent 596cdbd commit eb4ba48

File tree

7 files changed

+50
-211
lines changed

7 files changed

+50
-211
lines changed

‎coderd/apidoc/docs.go

Lines changed: 2 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -310,11 +310,7 @@ const docTemplate = `{
310310
"CoderSessionToken": []
311311
}
312312
],
313-
<<<<<<< HEAD
314-
"description": "Notice: Swagger 2.0 doesn't support file upload with a ` + "`" + `content-type` + "`" + ` different than ` + "`" + `application/x-www-form-urlencoded` + "`" + `.",
315-
=======
316313
"description": "Swagger notice: Swagger 2.0 doesn't support file upload with a ` + "`" + `content-type` + "`" + ` different than ` + "`" + `application/x-www-form-urlencoded` + "`" + `.",
317-
>>>>>>> main
318314
"consumes": [
319315
"application/x-tar"
320316
],
@@ -1852,7 +1848,6 @@ const docTemplate = `{
18521848
}
18531849
}
18541850
},
1855-
<<<<<<< HEAD
18561851
"codersdk.AWSInstanceIdentityToken": {
18571852
"type": "object",
18581853
"required": [
@@ -1920,8 +1915,6 @@ const docTemplate = `{
19201915
}
19211916
}
19221917
},
1923-
=======
1924-
>>>>>>> main
19251918
"codersdk.AuditDiff": {
19261919
"type": "object",
19271920
"additionalProperties": {
@@ -2217,7 +2210,6 @@ const docTemplate = `{
22172210
}
22182211
}
22192212
},
2220-
<<<<<<< HEAD
22212213
"codersdk.CreateWorkspaceBuildRequest": {
22222214
"type": "object",
22232215
"required": [
@@ -2258,8 +2250,6 @@ const docTemplate = `{
22582250
}
22592251
}
22602252
},
2261-
=======
2262-
>>>>>>> main
22632253
"codersdk.DERP": {
22642254
"type": "object",
22652255
"properties": {
@@ -2666,7 +2656,6 @@ const docTemplate = `{
26662656
}
26672657
}
26682658
},
2669-
<<<<<<< HEAD
26702659
"codersdk.GoogleInstanceIdentityToken": {
26712660
"type": "object",
26722661
"required": [
@@ -2678,8 +2667,6 @@ const docTemplate = `{
26782667
}
26792668
}
26802669
},
2681-
=======
2682-
>>>>>>> main
26832670
"codersdk.Healthcheck": {
26842671
"type": "object",
26852672
"properties": {
@@ -2762,25 +2749,6 @@ const docTemplate = `{
27622749
"type": "object",
27632750
"properties": {
27642751
"created_at": {
2765-
<<<<<<< HEAD
2766-
"type": "string"
2767-
},
2768-
"destination_scheme": {
2769-
"type": "string",
2770-
"enum": [
2771-
"none",
2772-
"environment_variable",
2773-
"provisioner_variable"
2774-
]
2775-
},
2776-
"id": {
2777-
"type": "string",
2778-
"format": "uuid"
2779-
},
2780-
"name": {
2781-
"type": "string"
2782-
},
2783-
=======
27842752
"type": "string",
27852753
"format": "date-time"
27862754
},
@@ -2799,7 +2767,6 @@ const docTemplate = `{
27992767
"name": {
28002768
"type": "string"
28012769
},
2802-
>>>>>>> main
28032770
"scope": {
28042771
"type": "string",
28052772
"enum": [
@@ -2820,8 +2787,8 @@ const docTemplate = `{
28202787
]
28212788
},
28222789
"updated_at": {
2823-
<<<<<<< HEAD
2824-
"type": "string"
2790+
"type": "string",
2791+
"format": "date-time"
28252792
}
28262793
}
28272794
},
@@ -2842,10 +2809,6 @@ const docTemplate = `{
28422809
"additionalProperties": {
28432810
"type": "string"
28442811
}
2845-
=======
2846-
"type": "string",
2847-
"format": "date-time"
2848-
>>>>>>> main
28492812
}
28502813
}
28512814
},
@@ -3211,12 +3174,8 @@ const docTemplate = `{
32113174
"type": "object",
32123175
"properties": {
32133176
"hash": {
3214-
<<<<<<< HEAD
3215-
"type": "string"
3216-
=======
32173177
"type": "string",
32183178
"format": "uuid"
3219-
>>>>>>> main
32203179
}
32213180
}
32223181
},
@@ -3712,7 +3671,6 @@ const docTemplate = `{
37123671
},
37133672
"netip.Addr": {
37143673
"type": "object"
3715-
<<<<<<< HEAD
37163674
},
37173675
"tailcfg.DERPMap": {
37183676
"type": "object",
@@ -3814,8 +3772,6 @@ const docTemplate = `{
38143772
"type": "string"
38153773
}
38163774
}
3817-
=======
3818-
>>>>>>> main
38193775
}
38203776
},
38213777
"securityDefinitions": {

‎coderd/apidoc/swagger.json

Lines changed: 2 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -264,11 +264,7 @@
264264
"CoderSessionToken": []
265265
}
266266
],
267-
<<<<<<< HEAD
268-
"description": "Notice: Swagger 2.0 doesn't support file upload with a `content-type` different than `application/x-www-form-urlencoded`.",
269-
=======
270267
"description": "Swagger notice: Swagger 2.0 doesn't support file upload with a `content-type` different than `application/x-www-form-urlencoded`.",
271-
>>>>>>> main
272268
"consumes": ["application/x-tar"],
273269
"produces": ["application/json"],
274270
"tags": ["Files"],
@@ -1619,7 +1615,6 @@
16191615
}
16201616
}
16211617
},
1622-
<<<<<<< HEAD
16231618
"codersdk.AWSInstanceIdentityToken": {
16241619
"type": "object",
16251620
"required": ["document", "signature"],
@@ -1684,8 +1679,6 @@
16841679
}
16851680
}
16861681
},
1687-
=======
1688-
>>>>>>> main
16891682
"codersdk.AuditDiff": {
16901683
"type": "object",
16911684
"additionalProperties": {
@@ -1957,7 +1950,6 @@
19571950
}
19581951
}
19591952
},
1960-
<<<<<<< HEAD
19611953
"codersdk.CreateWorkspaceBuildRequest": {
19621954
"type": "object",
19631955
"required": ["transition"],
@@ -1991,8 +1983,6 @@
19911983
}
19921984
}
19931985
},
1994-
=======
1995-
>>>>>>> main
19961986
"codersdk.DERP": {
19971987
"type": "object",
19981988
"properties": {
@@ -2399,7 +2389,6 @@
23992389
}
24002390
}
24012391
},
2402-
<<<<<<< HEAD
24032392
"codersdk.GoogleInstanceIdentityToken": {
24042393
"type": "object",
24052394
"required": ["json_web_token"],
@@ -2409,8 +2398,6 @@
24092398
}
24102399
}
24112400
},
2412-
=======
2413-
>>>>>>> main
24142401
"codersdk.Healthcheck": {
24152402
"type": "object",
24162403
"properties": {
@@ -2493,21 +2480,6 @@
24932480
"type": "object",
24942481
"properties": {
24952482
"created_at": {
2496-
<<<<<<< HEAD
2497-
"type": "string"
2498-
},
2499-
"destination_scheme": {
2500-
"type": "string",
2501-
"enum": ["none", "environment_variable", "provisioner_variable"]
2502-
},
2503-
"id": {
2504-
"type": "string",
2505-
"format": "uuid"
2506-
},
2507-
"name": {
2508-
"type": "string"
2509-
},
2510-
=======
25112483
"type": "string",
25122484
"format": "date-time"
25132485
},
@@ -2522,7 +2494,6 @@
25222494
"name": {
25232495
"type": "string"
25242496
},
2525-
>>>>>>> main
25262497
"scope": {
25272498
"type": "string",
25282499
"enum": ["template", "workspace", "import_job"]
@@ -2536,8 +2507,8 @@
25362507
"enum": ["none", "data"]
25372508
},
25382509
"updated_at": {
2539-
<<<<<<< HEAD
2540-
"type": "string"
2510+
"type": "string",
2511+
"format": "date-time"
25412512
}
25422513
}
25432514
},
@@ -2558,10 +2529,6 @@
25582529
"additionalProperties": {
25592530
"type": "string"
25602531
}
2561-
=======
2562-
"type": "string",
2563-
"format": "date-time"
2564-
>>>>>>> main
25652532
}
25662533
}
25672534
},
@@ -2919,12 +2886,8 @@
29192886
"type": "object",
29202887
"properties": {
29212888
"hash": {
2922-
<<<<<<< HEAD
2923-
"type": "string"
2924-
=======
29252889
"type": "string",
29262890
"format": "uuid"
2927-
>>>>>>> main
29282891
}
29292892
}
29302893
},
@@ -3391,7 +3354,6 @@
33913354
},
33923355
"netip.Addr": {
33933356
"type": "object"
3394-
<<<<<<< HEAD
33953357
},
33963358
"tailcfg.DERPMap": {
33973359
"type": "object",
@@ -3493,8 +3455,6 @@
34933455
"type": "string"
34943456
}
34953457
}
3496-
=======
3497-
>>>>>>> main
34983458
}
34993459
},
35003460
"securityDefinitions": {

0 commit comments

Comments
 (0)