BlueGit

timfa bluegit

Merge branch 'cursor/mr-reviews-65da' into 'master'

Goedkeuringen, reviews en heropenen van merge requests

See merge request Timfa/bluegit!13

timfa Tim Falken · pushed by timfa

Authored 2026-10-22 · 3 weeks ago

Hash
1237d98842652dae0c196048b12be4b6646ecb46
12 files changed +934 −8
internal/i18n/catalog.go +22 −0
@@ -20,6 +20,7 @@ var en = map[string]string{
20 20 "action.remove": "Remove",
21 21 "action.open": "Open",
22 22 "action.close": "Close",
23 "action.reopen": "Reopen",
23 24 "action.merge": "Merge",
24 25 "action.start": "Start",
25 26 "action.protect": "Protect",
@@ -158,6 +159,26 @@ var en = map[string]string{
158 159 "mr.block.running": "The pipeline is still running.",
159 160 "mr.block.failed": "The pipeline failed.",
160 161 "mr.block.waiting": "This merge request is waiting for a pipeline.",
162 "appr.tab": "Approvals",
163 "appr.required": "Maintainer approval required",
164 "appr.count": "Required approvals",
165 "appr.developers": "Developers may approve",
166 "appr.on": "On",
167 "appr.off": "Off",
168 "appr.warn": "This requires %d approvals, and there are %d maintainers.",
169 "appr.locked": "These rules come from the group and cannot be changed here.",
170 "rev.title": "Reviews",
171 "rev.none": "No reviews yet.",
172 "rev.approved": "Approved",
173 "rev.changes": "Request changes",
174 "rev.rejected": "Rejected",
175 "rev.dismissed": "Invalidated",
176 "rev.dismiss": "Invalidate review",
177 "rev.summary.approvals": "%d of %d approvals.",
178 "rev.summary.changes": "%s requested changes.",
179 "rev.summary.rejected": "%s rejected this merge request.",
180 "rev.own": "You cannot approve your own merge request.",
181 "rev.bad": "This review is not valid.",
161 182
162 183 "pipe.title": "Pipelines",
163 184 "pipe.ref": "branch, empty is the default",
@@ -394,6 +415,7 @@ var en = map[string]string{
394 415 "flash.note": "Comment posted",
395 416 "flash.merged": "Merged",
396 417 "flash.closed": "Closed",
418 "flash.reopened": "Merge request reopened.",
397 419 "hook.push": "%s pushed to %s in %s",
398 420 "hook.mr": "merge request !%s opened: %s",
399 421 "hook.release": "release %s of %s published",
@@ -20,6 +20,7 @@ var en = map[string]string{
20 "action.remove": "Remove",
20 "action.remove": "Remove",
21 "action.open": "Open",
21 "action.open": "Open",
22 "action.close": "Close",
22 "action.close": "Close",
23 "action.reopen": "Reopen",
23 "action.merge": "Merge",
24 "action.merge": "Merge",
24 "action.start": "Start",
25 "action.start": "Start",
25 "action.protect": "Protect",
26 "action.protect": "Protect",
@@ -158,6 +159,26 @@ var en = map[string]string{
158 "mr.block.running": "The pipeline is still running.",
159 "mr.block.running": "The pipeline is still running.",
159 "mr.block.failed": "The pipeline failed.",
160 "mr.block.failed": "The pipeline failed.",
160 "mr.block.waiting": "This merge request is waiting for a pipeline.",
161 "mr.block.waiting": "This merge request is waiting for a pipeline.",
162 "appr.tab": "Approvals",
163 "appr.required": "Maintainer approval required",
164 "appr.count": "Required approvals",
165 "appr.developers": "Developers may approve",
166 "appr.on": "On",
167 "appr.off": "Off",
168 "appr.warn": "This requires %d approvals, and there are %d maintainers.",
169 "appr.locked": "These rules come from the group and cannot be changed here.",
170 "rev.title": "Reviews",
171 "rev.none": "No reviews yet.",
172 "rev.approved": "Approved",
173 "rev.changes": "Request changes",
174 "rev.rejected": "Rejected",
175 "rev.dismissed": "Invalidated",
176 "rev.dismiss": "Invalidate review",
177 "rev.summary.approvals": "%d of %d approvals.",
178 "rev.summary.changes": "%s requested changes.",
179 "rev.summary.rejected": "%s rejected this merge request.",
180 "rev.own": "You cannot approve your own merge request.",
181 "rev.bad": "This review is not valid.",
161
182
162 "pipe.title": "Pipelines",
183 "pipe.title": "Pipelines",
163 "pipe.ref": "branch, empty is the default",
184 "pipe.ref": "branch, empty is the default",
@@ -394,6 +415,7 @@ var en = map[string]string{
394 "flash.note": "Comment posted",
415 "flash.note": "Comment posted",
395 "flash.merged": "Merged",
416 "flash.merged": "Merged",
396 "flash.closed": "Closed",
417 "flash.closed": "Closed",
418 "flash.reopened": "Merge request reopened.",
397 "hook.push": "%s pushed to %s in %s",
419 "hook.push": "%s pushed to %s in %s",
398 "hook.mr": "merge request !%s opened: %s",
420 "hook.mr": "merge request !%s opened: %s",
399 "hook.release": "release %s of %s published",
421 "hook.release": "release %s of %s published",
internal/i18n/catalog_lang.go +66 −0
@@ -12,6 +12,7 @@ var nl = map[string]string{
12 12 "action.remove": "Weg",
13 13 "action.open": "Openen",
14 14 "action.close": "Sluiten",
15 "action.reopen": "Heropenen",
15 16 "action.merge": "Samenvoegen",
16 17 "action.start": "Starten",
17 18 "action.protect": "Beschermen",
@@ -166,6 +167,26 @@ var nl = map[string]string{
166 167 "mr.block.running": "De pipeline loopt nog.",
167 168 "mr.block.failed": "De pipeline is mislukt.",
168 169 "mr.block.waiting": "Deze merge request wacht op een pipeline.",
170 "appr.tab": "Goedkeuringen",
171 "appr.required": "Maintainer-approval vereist",
172 "appr.count": "Vereiste approvals",
173 "appr.developers": "Developers mogen goedkeuren",
174 "appr.on": "Aan",
175 "appr.off": "Uit",
176 "appr.warn": "Dit vraagt %d approvals, en er zijn %d beheerders.",
177 "appr.locked": "Deze regels komen van de groep en kunnen hier niet worden aangepast.",
178 "rev.title": "Reviews",
179 "rev.none": "Nog geen reviews.",
180 "rev.approved": "Goedgekeurd",
181 "rev.changes": "Wijzigingen vragen",
182 "rev.rejected": "Afgewezen",
183 "rev.dismissed": "Ongeldig verklaard",
184 "rev.dismiss": "Review ongeldig verklaren",
185 "rev.summary.approvals": "%d van %d approvals.",
186 "rev.summary.changes": "%s vraagt wijzigingen.",
187 "rev.summary.rejected": "%s heeft deze merge request afgewezen.",
188 "rev.own": "Je kunt je eigen merge request niet goedkeuren.",
189 "rev.bad": "Deze review is niet geldig.",
169 190 "pipe.title": "Pipelines",
170 191 "pipe.ref": "branch, leeg is de standaard",
171 192 "pipe.none": "Nog geen pipelines. Voeg blue-ci-cd.yml toe in de root.",
@@ -390,6 +411,7 @@ var nl = map[string]string{
390 411 "flash.note": "Reactie geplaatst",
391 412 "flash.merged": "Samengevoegd",
392 413 "flash.closed": "Gesloten",
414 "flash.reopened": "Merge request heropend.",
393 415 "hook.push": "%s pushte naar %s in %s",
394 416 "hook.mr": "merge request !%s geopend: %s",
395 417 "hook.release": "release %s van %s gepubliceerd",
@@ -539,6 +561,7 @@ var de = map[string]string{
539 561 "action.remove": "Entfernen",
540 562 "action.open": "Öffnen",
541 563 "action.close": "Schließen",
564 "action.reopen": "Wieder öffnen",
542 565 "action.merge": "Zusammenführen",
543 566 "action.start": "Starten",
544 567 "action.protect": "Schützen",
@@ -693,6 +716,26 @@ var de = map[string]string{
693 716 "mr.block.running": "Die Pipeline läuft noch.",
694 717 "mr.block.failed": "Die Pipeline ist fehlgeschlagen.",
695 718 "mr.block.waiting": "Dieser Merge Request wartet auf eine Pipeline.",
719 "appr.tab": "Genehmigungen",
720 "appr.required": "Maintainer-Genehmigung erforderlich",
721 "appr.count": "Erforderliche Genehmigungen",
722 "appr.developers": "Developers dürfen genehmigen",
723 "appr.on": "An",
724 "appr.off": "Aus",
725 "appr.warn": "Das verlangt %d Genehmigungen, und es gibt %d Maintainer.",
726 "appr.locked": "Diese Regeln kommen von der Gruppe und können hier nicht geändert werden.",
727 "rev.title": "Reviews",
728 "rev.none": "Noch keine Reviews.",
729 "rev.approved": "Genehmigt",
730 "rev.changes": "Änderungen verlangen",
731 "rev.rejected": "Abgelehnt",
732 "rev.dismissed": "Ungültig",
733 "rev.dismiss": "Review für ungültig erklären",
734 "rev.summary.approvals": "%d von %d Genehmigungen.",
735 "rev.summary.changes": "%s verlangt Änderungen.",
736 "rev.summary.rejected": "%s hat diesen Merge Request abgelehnt.",
737 "rev.own": "Du kannst deinen eigenen Merge Request nicht genehmigen.",
738 "rev.bad": "Dieses Review ist nicht gültig.",
696 739 "pipe.title": "Pipelines",
697 740 "pipe.ref": "Branch, leer ist der Standard",
698 741 "pipe.none": "Noch keine Pipelines. Lege blue-ci-cd.yml im Stammverzeichnis an.",
@@ -917,6 +960,7 @@ var de = map[string]string{
917 960 "flash.note": "Kommentar veröffentlicht",
918 961 "flash.merged": "Zusammengeführt",
919 962 "flash.closed": "Geschlossen",
963 "flash.reopened": "Merge Request wieder geöffnet.",
920 964 "hook.push": "%s hat nach %s in %s gepusht",
921 965 "hook.mr": "Merge-Request !%s geöffnet: %s",
922 966 "hook.release": "Release %s von %s veröffentlicht",
@@ -1066,6 +1110,7 @@ var fr = map[string]string{
1066 1110 "action.remove": "Retirer",
1067 1111 "action.open": "Ouvrir",
1068 1112 "action.close": "Fermer",
1113 "action.reopen": "Rouvrir",
1069 1114 "action.merge": "Fusionner",
1070 1115 "action.start": "Démarrer",
1071 1116 "action.protect": "Protéger",
@@ -1220,6 +1265,26 @@ var fr = map[string]string{
1220 1265 "mr.block.running": "Le pipeline est encore en cours.",
1221 1266 "mr.block.failed": "Le pipeline a échoué.",
1222 1267 "mr.block.waiting": "Cette merge request attend un pipeline.",
1268 "appr.tab": "Approbations",
1269 "appr.required": "Approbation d'un maintainer exigée",
1270 "appr.count": "Approbations exigées",
1271 "appr.developers": "Les developers peuvent approuver",
1272 "appr.on": "Activé",
1273 "appr.off": "Désactivé",
1274 "appr.warn": "Cela exige %d approbations, et il y a %d maintainers.",
1275 "appr.locked": "Ces règles viennent du groupe et ne peuvent pas être modifiées ici.",
1276 "rev.title": "Reviews",
1277 "rev.none": "Pas encore de reviews.",
1278 "rev.approved": "Approuvé",
1279 "rev.changes": "Demander des changements",
1280 "rev.rejected": "Rejeté",
1281 "rev.dismissed": "Invalidé",
1282 "rev.dismiss": "Invalider la review",
1283 "rev.summary.approvals": "%d approbations sur %d.",
1284 "rev.summary.changes": "%s demande des changements.",
1285 "rev.summary.rejected": "%s a rejeté cette merge request.",
1286 "rev.own": "Tu ne peux pas approuver ta propre merge request.",
1287 "rev.bad": "Cette review n'est pas valide.",
1223 1288 "pipe.title": "Pipelines",
1224 1289 "pipe.ref": "branche, vide pour la branche par défaut",
1225 1290 "pipe.none": "Pas encore de pipelines. Ajoute blue-ci-cd.yml à la racine.",
@@ -1444,6 +1509,7 @@ var fr = map[string]string{
1444 1509 "flash.note": "Commentaire publié",
1445 1510 "flash.merged": "Fusionné",
1446 1511 "flash.closed": "Fermé",
1512 "flash.reopened": "Merge request rouverte.",
1447 1513 "hook.push": "%s a poussé vers %s dans %s",
1448 1514 "hook.mr": "merge request !%s ouverte : %s",
1449 1515 "hook.release": "version %s de %s publiée",
@@ -12,6 +12,7 @@ var nl = map[string]string{
12 "action.remove": "Weg",
12 "action.remove": "Weg",
13 "action.open": "Openen",
13 "action.open": "Openen",
14 "action.close": "Sluiten",
14 "action.close": "Sluiten",
15 "action.reopen": "Heropenen",
15 "action.merge": "Samenvoegen",
16 "action.merge": "Samenvoegen",
16 "action.start": "Starten",
17 "action.start": "Starten",
17 "action.protect": "Beschermen",
18 "action.protect": "Beschermen",
@@ -166,6 +167,26 @@ var nl = map[string]string{
166 "mr.block.running": "De pipeline loopt nog.",
167 "mr.block.running": "De pipeline loopt nog.",
167 "mr.block.failed": "De pipeline is mislukt.",
168 "mr.block.failed": "De pipeline is mislukt.",
168 "mr.block.waiting": "Deze merge request wacht op een pipeline.",
169 "mr.block.waiting": "Deze merge request wacht op een pipeline.",
170 "appr.tab": "Goedkeuringen",
171 "appr.required": "Maintainer-approval vereist",
172 "appr.count": "Vereiste approvals",
173 "appr.developers": "Developers mogen goedkeuren",
174 "appr.on": "Aan",
175 "appr.off": "Uit",
176 "appr.warn": "Dit vraagt %d approvals, en er zijn %d beheerders.",
177 "appr.locked": "Deze regels komen van de groep en kunnen hier niet worden aangepast.",
178 "rev.title": "Reviews",
179 "rev.none": "Nog geen reviews.",
180 "rev.approved": "Goedgekeurd",
181 "rev.changes": "Wijzigingen vragen",
182 "rev.rejected": "Afgewezen",
183 "rev.dismissed": "Ongeldig verklaard",
184 "rev.dismiss": "Review ongeldig verklaren",
185 "rev.summary.approvals": "%d van %d approvals.",
186 "rev.summary.changes": "%s vraagt wijzigingen.",
187 "rev.summary.rejected": "%s heeft deze merge request afgewezen.",
188 "rev.own": "Je kunt je eigen merge request niet goedkeuren.",
189 "rev.bad": "Deze review is niet geldig.",
169 "pipe.title": "Pipelines",
190 "pipe.title": "Pipelines",
170 "pipe.ref": "branch, leeg is de standaard",
191 "pipe.ref": "branch, leeg is de standaard",
171 "pipe.none": "Nog geen pipelines. Voeg blue-ci-cd.yml toe in de root.",
192 "pipe.none": "Nog geen pipelines. Voeg blue-ci-cd.yml toe in de root.",
@@ -390,6 +411,7 @@ var nl = map[string]string{
390 "flash.note": "Reactie geplaatst",
411 "flash.note": "Reactie geplaatst",
391 "flash.merged": "Samengevoegd",
412 "flash.merged": "Samengevoegd",
392 "flash.closed": "Gesloten",
413 "flash.closed": "Gesloten",
414 "flash.reopened": "Merge request heropend.",
393 "hook.push": "%s pushte naar %s in %s",
415 "hook.push": "%s pushte naar %s in %s",
394 "hook.mr": "merge request !%s geopend: %s",
416 "hook.mr": "merge request !%s geopend: %s",
395 "hook.release": "release %s van %s gepubliceerd",
417 "hook.release": "release %s van %s gepubliceerd",
@@ -539,6 +561,7 @@ var de = map[string]string{
539 "action.remove": "Entfernen",
561 "action.remove": "Entfernen",
540 "action.open": "Öffnen",
562 "action.open": "Öffnen",
541 "action.close": "Schließen",
563 "action.close": "Schließen",
564 "action.reopen": "Wieder öffnen",
542 "action.merge": "Zusammenführen",
565 "action.merge": "Zusammenführen",
543 "action.start": "Starten",
566 "action.start": "Starten",
544 "action.protect": "Schützen",
567 "action.protect": "Schützen",
@@ -693,6 +716,26 @@ var de = map[string]string{
693 "mr.block.running": "Die Pipeline läuft noch.",
716 "mr.block.running": "Die Pipeline läuft noch.",
694 "mr.block.failed": "Die Pipeline ist fehlgeschlagen.",
717 "mr.block.failed": "Die Pipeline ist fehlgeschlagen.",
695 "mr.block.waiting": "Dieser Merge Request wartet auf eine Pipeline.",
718 "mr.block.waiting": "Dieser Merge Request wartet auf eine Pipeline.",
719 "appr.tab": "Genehmigungen",
720 "appr.required": "Maintainer-Genehmigung erforderlich",
721 "appr.count": "Erforderliche Genehmigungen",
722 "appr.developers": "Developers dürfen genehmigen",
723 "appr.on": "An",
724 "appr.off": "Aus",
725 "appr.warn": "Das verlangt %d Genehmigungen, und es gibt %d Maintainer.",
726 "appr.locked": "Diese Regeln kommen von der Gruppe und können hier nicht geändert werden.",
727 "rev.title": "Reviews",
728 "rev.none": "Noch keine Reviews.",
729 "rev.approved": "Genehmigt",
730 "rev.changes": "Änderungen verlangen",
731 "rev.rejected": "Abgelehnt",
732 "rev.dismissed": "Ungültig",
733 "rev.dismiss": "Review für ungültig erklären",
734 "rev.summary.approvals": "%d von %d Genehmigungen.",
735 "rev.summary.changes": "%s verlangt Änderungen.",
736 "rev.summary.rejected": "%s hat diesen Merge Request abgelehnt.",
737 "rev.own": "Du kannst deinen eigenen Merge Request nicht genehmigen.",
738 "rev.bad": "Dieses Review ist nicht gültig.",
696 "pipe.title": "Pipelines",
739 "pipe.title": "Pipelines",
697 "pipe.ref": "Branch, leer ist der Standard",
740 "pipe.ref": "Branch, leer ist der Standard",
698 "pipe.none": "Noch keine Pipelines. Lege blue-ci-cd.yml im Stammverzeichnis an.",
741 "pipe.none": "Noch keine Pipelines. Lege blue-ci-cd.yml im Stammverzeichnis an.",
@@ -917,6 +960,7 @@ var de = map[string]string{
917 "flash.note": "Kommentar veröffentlicht",
960 "flash.note": "Kommentar veröffentlicht",
918 "flash.merged": "Zusammengeführt",
961 "flash.merged": "Zusammengeführt",
919 "flash.closed": "Geschlossen",
962 "flash.closed": "Geschlossen",
963 "flash.reopened": "Merge Request wieder geöffnet.",
920 "hook.push": "%s hat nach %s in %s gepusht",
964 "hook.push": "%s hat nach %s in %s gepusht",
921 "hook.mr": "Merge-Request !%s geöffnet: %s",
965 "hook.mr": "Merge-Request !%s geöffnet: %s",
922 "hook.release": "Release %s von %s veröffentlicht",
966 "hook.release": "Release %s von %s veröffentlicht",
@@ -1066,6 +1110,7 @@ var fr = map[string]string{
1066 "action.remove": "Retirer",
1110 "action.remove": "Retirer",
1067 "action.open": "Ouvrir",
1111 "action.open": "Ouvrir",
1068 "action.close": "Fermer",
1112 "action.close": "Fermer",
1113 "action.reopen": "Rouvrir",
1069 "action.merge": "Fusionner",
1114 "action.merge": "Fusionner",
1070 "action.start": "Démarrer",
1115 "action.start": "Démarrer",
1071 "action.protect": "Protéger",
1116 "action.protect": "Protéger",
@@ -1220,6 +1265,26 @@ var fr = map[string]string{
1220 "mr.block.running": "Le pipeline est encore en cours.",
1265 "mr.block.running": "Le pipeline est encore en cours.",
1221 "mr.block.failed": "Le pipeline a échoué.",
1266 "mr.block.failed": "Le pipeline a échoué.",
1222 "mr.block.waiting": "Cette merge request attend un pipeline.",
1267 "mr.block.waiting": "Cette merge request attend un pipeline.",
1268 "appr.tab": "Approbations",
1269 "appr.required": "Approbation d'un maintainer exigée",
1270 "appr.count": "Approbations exigées",
1271 "appr.developers": "Les developers peuvent approuver",
1272 "appr.on": "Activé",
1273 "appr.off": "Désactivé",
1274 "appr.warn": "Cela exige %d approbations, et il y a %d maintainers.",
1275 "appr.locked": "Ces règles viennent du groupe et ne peuvent pas être modifiées ici.",
1276 "rev.title": "Reviews",
1277 "rev.none": "Pas encore de reviews.",
1278 "rev.approved": "Approuvé",
1279 "rev.changes": "Demander des changements",
1280 "rev.rejected": "Rejeté",
1281 "rev.dismissed": "Invalidé",
1282 "rev.dismiss": "Invalider la review",
1283 "rev.summary.approvals": "%d approbations sur %d.",
1284 "rev.summary.changes": "%s demande des changements.",
1285 "rev.summary.rejected": "%s a rejeté cette merge request.",
1286 "rev.own": "Tu ne peux pas approuver ta propre merge request.",
1287 "rev.bad": "Cette review n'est pas valide.",
1223 "pipe.title": "Pipelines",
1288 "pipe.title": "Pipelines",
1224 "pipe.ref": "branche, vide pour la branche par défaut",
1289 "pipe.ref": "branche, vide pour la branche par défaut",
1225 "pipe.none": "Pas encore de pipelines. Ajoute blue-ci-cd.yml à la racine.",
1290 "pipe.none": "Pas encore de pipelines. Ajoute blue-ci-cd.yml à la racine.",
@@ -1444,6 +1509,7 @@ var fr = map[string]string{
1444 "flash.note": "Commentaire publié",
1509 "flash.note": "Commentaire publié",
1445 "flash.merged": "Fusionné",
1510 "flash.merged": "Fusionné",
1446 "flash.closed": "Fermé",
1511 "flash.closed": "Fermé",
1512 "flash.reopened": "Merge request rouverte.",
1447 "hook.push": "%s a poussé vers %s dans %s",
1513 "hook.push": "%s a poussé vers %s dans %s",
1448 "hook.mr": "merge request !%s ouverte : %s",
1514 "hook.mr": "merge request !%s ouverte : %s",
1449 "hook.release": "version %s de %s publiée",
1515 "hook.release": "version %s de %s publiée",
internal/server/mr_pipeline.go +9 −1
@@ -103,9 +103,17 @@ func (s *Server) startOneMergePipeline(ctx context.Context, repo store.Repo, sha
103 103 // mergeBlocks zijn de vertaalde redenen waarom mergen nog niet mag.
104 104 // Een pipeline is verplicht zodra blue-ci-cd.yml jobs voor deze merge request kiest.
105 105 func (s *Server) mergeBlocks(r *http.Request, repo store.Repo, mr store.MergeRequest) []string {
106 if mr.Status != "open" || !s.Cfg.CI.Enabled || s.StoragePath() == "" {
106 if mr.Status != "open" {
107 107 return nil
108 108 }
109 var blocks []string
110 if s.Cfg.CI.Enabled && s.StoragePath() != "" {
111 blocks = append(blocks, s.pipelineBlocks(r, repo, mr)...)
112 }
113 return append(blocks, s.reviewBlocks(r, repo, mr)...)
114 }
115
116 func (s *Server) pipelineBlocks(r *http.Request, repo store.Repo, mr store.MergeRequest) []string {
109 117 ctx := r.Context()
110 118 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
111 119 sha := gitOne(ctx, s.Git, dir, "rev-parse", "--verify", "refs/heads/"+mr.SourceBranch)
@@ -103,9 +103,17 @@ func (s *Server) startOneMergePipeline(ctx context.Context, repo store.Repo, sha
103// mergeBlocks zijn de vertaalde redenen waarom mergen nog niet mag.
103// mergeBlocks zijn de vertaalde redenen waarom mergen nog niet mag.
104// Een pipeline is verplicht zodra blue-ci-cd.yml jobs voor deze merge request kiest.
104// Een pipeline is verplicht zodra blue-ci-cd.yml jobs voor deze merge request kiest.
105func (s *Server) mergeBlocks(r *http.Request, repo store.Repo, mr store.MergeRequest) []string {
105func (s *Server) mergeBlocks(r *http.Request, repo store.Repo, mr store.MergeRequest) []string {
106 if mr.Status != "open" || !s.Cfg.CI.Enabled || s.StoragePath() == "" {
106 if mr.Status != "open" {
107 return nil
107 return nil
108 }
108 }
109 var blocks []string
110 if s.Cfg.CI.Enabled && s.StoragePath() != "" {
111 blocks = append(blocks, s.pipelineBlocks(r, repo, mr)...)
112 }
113 return append(blocks, s.reviewBlocks(r, repo, mr)...)
114}
115
116func (s *Server) pipelineBlocks(r *http.Request, repo store.Repo, mr store.MergeRequest) []string {
109 ctx := r.Context()
117 ctx := r.Context()
110 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
118 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
111 sha := gitOne(ctx, s.Git, dir, "rev-parse", "--verify", "refs/heads/"+mr.SourceBranch)
119 sha := gitOne(ctx, s.Git, dir, "rev-parse", "--verify", "refs/heads/"+mr.SourceBranch)
internal/server/repo_handlers.go +10 −5
@@ -214,7 +214,7 @@ func (s *Server) createMR(w http.ResponseWriter, r *http.Request) {
214 214 }
215 215
216 216 func (s *Server) showMR(w http.ResponseWriter, r *http.Request) {
217 _, repo, role, ok := s.guard(w, r, access.RoleReadonly)
217 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
218 218 if !ok {
219 219 return
220 220 }
@@ -235,10 +235,14 @@ func (s *Server) showMR(w http.ResponseWriter, r *http.Request) {
235 235 v.CanComment = role.AtLeast(access.RoleReadonly)
236 236 v.CanMerge = mr.Status == "open" && role.CanMerge(access.BranchProtected(patterns, mr.TargetBranch))
237 237 v.CanApply = mr.Status == "open" && role.CanPushBranch(access.BranchProtected(patterns, mr.SourceBranch))
238 if v.CanMerge {
239 v.MergeBlocks = s.mergeBlocks(r, repo, mr)
240 }
238 v.MergeBlocks = s.mergeBlocks(r, repo, mr)
241 239 s.fillMRPipeline(r, &v, repo, mr)
240 s.fillReviews(r, &v, repo, mr, role)
241 if u.ID != 0 {
242 mine := u.ID == mr.AuthorID || role.CanManageSettings()
243 v.CanClose = mr.Status == "open" && mine
244 v.CanReopen = mr.Status == "closed" && mine
245 }
242 246 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
243 247 diff, err := gitrepo.DiffStat(r.Context(), s.Git, dir, mr.TargetBranch, mr.SourceBranch)
244 248 if err == nil {
@@ -297,6 +301,7 @@ func (s *Server) createNote(w http.ResponseWriter, r *http.Request) {
297 301 s.redirect(w, r, back, "", s.trErr(r, err))
298 302 return
299 303 }
304 s.noteRequestsChanges(r, repo, mr, u.ID, suggestion)
300 305 s.redirect(w, r, back, s.tr(r, "flash.note"), "")
301 306 }
302 307
@@ -335,7 +340,7 @@ func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {
335 340 }
336 341
337 342 func (s *Server) closeMR(w http.ResponseWriter, r *http.Request) {
338 u, repo, role, ok := s.guard(w, r, access.RoleDeveloper)
343 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
339 344 if !ok || !s.csrfOK(w, r) {
340 345 return
341 346 }
@@ -214,7 +214,7 @@ func (s *Server) createMR(w http.ResponseWriter, r *http.Request) {
214}
214}
215
215
216func (s *Server) showMR(w http.ResponseWriter, r *http.Request) {
216func (s *Server) showMR(w http.ResponseWriter, r *http.Request) {
217 _, repo, role, ok := s.guard(w, r, access.RoleReadonly)
217 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
218 if !ok {
218 if !ok {
219 return
219 return
220 }
220 }
@@ -235,10 +235,14 @@ func (s *Server) showMR(w http.ResponseWriter, r *http.Request) {
235 v.CanComment = role.AtLeast(access.RoleReadonly)
235 v.CanComment = role.AtLeast(access.RoleReadonly)
236 v.CanMerge = mr.Status == "open" && role.CanMerge(access.BranchProtected(patterns, mr.TargetBranch))
236 v.CanMerge = mr.Status == "open" && role.CanMerge(access.BranchProtected(patterns, mr.TargetBranch))
237 v.CanApply = mr.Status == "open" && role.CanPushBranch(access.BranchProtected(patterns, mr.SourceBranch))
237 v.CanApply = mr.Status == "open" && role.CanPushBranch(access.BranchProtected(patterns, mr.SourceBranch))
238 if v.CanMerge {
238 v.MergeBlocks = s.mergeBlocks(r, repo, mr)
239 v.MergeBlocks = s.mergeBlocks(r, repo, mr)
240 }
241 s.fillMRPipeline(r, &v, repo, mr)
239 s.fillMRPipeline(r, &v, repo, mr)
240 s.fillReviews(r, &v, repo, mr, role)
241 if u.ID != 0 {
242 mine := u.ID == mr.AuthorID || role.CanManageSettings()
243 v.CanClose = mr.Status == "open" && mine
244 v.CanReopen = mr.Status == "closed" && mine
245 }
242 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
246 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
243 diff, err := gitrepo.DiffStat(r.Context(), s.Git, dir, mr.TargetBranch, mr.SourceBranch)
247 diff, err := gitrepo.DiffStat(r.Context(), s.Git, dir, mr.TargetBranch, mr.SourceBranch)
244 if err == nil {
248 if err == nil {
@@ -297,6 +301,7 @@ func (s *Server) createNote(w http.ResponseWriter, r *http.Request) {
297 s.redirect(w, r, back, "", s.trErr(r, err))
301 s.redirect(w, r, back, "", s.trErr(r, err))
298 return
302 return
299 }
303 }
304 s.noteRequestsChanges(r, repo, mr, u.ID, suggestion)
300 s.redirect(w, r, back, s.tr(r, "flash.note"), "")
305 s.redirect(w, r, back, s.tr(r, "flash.note"), "")
301}
306}
302
307
@@ -335,7 +340,7 @@ func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {
335}
340}
336
341
337func (s *Server) closeMR(w http.ResponseWriter, r *http.Request) {
342func (s *Server) closeMR(w http.ResponseWriter, r *http.Request) {
338 u, repo, role, ok := s.guard(w, r, access.RoleDeveloper)
343 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
339 if !ok || !s.csrfOK(w, r) {
344 if !ok || !s.csrfOK(w, r) {
340 return
345 return
341 }
346 }
internal/server/reviews.go added +272 −0
@@ -0,0 +1,272 @@
1 package server
2
3 import (
4 "context"
5 "net/http"
6 "strconv"
7
8 "gitlab.com/Timfa/bluegit/internal/access"
9 "gitlab.com/Timfa/bluegit/internal/store"
10 )
11
12 // ApprovalView is de goedkeuringsregel zoals de instellingen hem tonen.
13 type ApprovalView struct {
14 MaintainerRequired bool
15 RequiredCount int
16 DevelopersApprove bool
17 Locked bool
18 GroupPath string
19 Maintainers int
20 Warn bool
21 }
22
23 // ReviewRow is één reviewer op de merge request.
24 type ReviewRow struct {
25 UserID int64
26 Username string
27 Status string
28 Label string
29 }
30
31 func (s *Server) fillApproval(r *http.Request, v *View, repo store.Repo) {
32 pol, groupPath, err := s.Store.EffectiveApproval(r.Context(), repo)
33 if err != nil {
34 return
35 }
36 n, _ := s.Store.ProjectMaintainerCount(r.Context(), repo)
37 v.Approval = approvalView(pol, groupPath != "", groupPath, n)
38 }
39
40 func (s *Server) fillGroupApproval(r *http.Request, v *View, g store.Group) {
41 pol, err := s.Store.GetApproval(r.Context(), "group", g.ID)
42 if err != nil {
43 return
44 }
45 n, _ := s.Store.GroupMaintainerCount(r.Context(), g.ID)
46 v.Approval = approvalView(pol, false, "", n)
47 }
48
49 func approvalView(pol store.ApprovalPolicy, locked bool, groupPath string, maintainers int) *ApprovalView {
50 if pol.RequiredCount < 1 {
51 pol.RequiredCount = 1
52 }
53 return &ApprovalView{
54 MaintainerRequired: pol.MaintainerRequired,
55 RequiredCount: pol.RequiredCount,
56 DevelopersApprove: pol.DevelopersApprove,
57 Locked: locked,
58 GroupPath: groupPath,
59 Maintainers: maintainers,
60 Warn: pol.MaintainerRequired && pol.RequiredCount > maintainers,
61 }
62 }
63
64 func (s *Server) saveRepoApproval(w http.ResponseWriter, r *http.Request) {
65 _, repo, _, ok := s.guard(w, r, access.RoleMaintainer)
66 if !ok || !s.csrfOK(w, r) {
67 return
68 }
69 _, groupPath, err := s.Store.EffectiveApproval(r.Context(), repo)
70 if err != nil {
71 s.redirect(w, r, repoURL(repo)+"/-/settings?tab=approvals", "", s.trErr(r, err))
72 return
73 }
74 if groupPath != "" {
75 s.redirect(w, r, repoURL(repo)+"/-/settings?tab=approvals", "", s.tr(r, "appr.locked"))
76 return
77 }
78 if err := s.Store.SaveApproval(r.Context(), "repo", repo.ID, approvalFromForm(r)); err != nil {
79 s.redirect(w, r, repoURL(repo)+"/-/settings?tab=approvals", "", s.trErr(r, err))
80 return
81 }
82 s.redirect(w, r, repoURL(repo)+"/-/settings?tab=approvals", s.tr(r, "flash.saved"), "")
83 }
84
85 func (s *Server) saveGroupApproval(w http.ResponseWriter, r *http.Request) {
86 g, _, ok := s.guardGroup(w, r, access.RoleMaintainer)
87 if !ok || !s.csrfOK(w, r) {
88 return
89 }
90 if err := s.Store.SaveApproval(r.Context(), "group", g.ID, approvalFromForm(r)); err != nil {
91 s.redirect(w, r, "/groups/"+g.Path+"?tab=settings", "", s.trErr(r, err))
92 return
93 }
94 s.redirect(w, r, "/groups/"+g.Path+"?tab=settings", s.tr(r, "flash.saved"), "")
95 }
96
97 func approvalFromForm(r *http.Request) store.ApprovalPolicy {
98 n, _ := strconv.Atoi(r.FormValue("required_count"))
99 return store.ApprovalPolicy{
100 MaintainerRequired: r.FormValue("maintainer_required") == "1",
101 RequiredCount: n,
102 DevelopersApprove: r.FormValue("developers_approve") == "1",
103 }
104 }
105
106 func (s *Server) reviewBlocks(r *http.Request, repo store.Repo, mr store.MergeRequest) []string {
107 if mr.Status != "open" {
108 return nil
109 }
110 pol, _, err := s.Store.EffectiveApproval(r.Context(), repo)
111 if err != nil {
112 return nil
113 }
114 var out []string
115 if pol.MaintainerRequired {
116 n := s.countApprovals(r.Context(), repo, mr, pol)
117 if n < pol.RequiredCount {
118 out = append(out, s.tr(r, "rev.summary.approvals", n, pol.RequiredCount))
119 }
120 }
121 reviews, err := s.Store.ListReviews(r.Context(), mr.ID)
122 if err != nil {
123 return out
124 }
125 for _, rev := range reviews {
126 switch rev.Status {
127 case "changes":
128 out = append(out, s.tr(r, "rev.summary.changes", rev.Username))
129 case "rejected":
130 out = append(out, s.tr(r, "rev.summary.rejected", rev.Username))
131 }
132 }
133 return out
134 }
135
136 func (s *Server) countApprovals(ctx context.Context, repo store.Repo, mr store.MergeRequest, pol store.ApprovalPolicy) int {
137 reviews, err := s.Store.ListReviews(ctx, mr.ID)
138 if err != nil {
139 return 0
140 }
141 n := 0
142 for _, rev := range reviews {
143 if rev.Status != "approved" || rev.UserID == mr.AuthorID {
144 continue
145 }
146 role, err := s.Store.EffectiveRole(ctx, rev.UserID, repo.ID)
147 if err != nil {
148 continue
149 }
150 if approvalCounts(role, pol) {
151 n++
152 }
153 }
154 return n
155 }
156
157 func approvalCounts(role access.Role, pol store.ApprovalPolicy) bool {
158 if role.CanManageSettings() {
159 return true
160 }
161 return pol.DevelopersApprove && role.CanWriteCode()
162 }
163
164 func (s *Server) fillReviews(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, role access.Role) {
165 reviews, _ := s.Store.ListReviews(r.Context(), mr.ID)
166 for _, rev := range reviews {
167 v.Reviews = append(v.Reviews, ReviewRow{
168 UserID: rev.UserID, Username: rev.Username, Status: rev.Status,
169 Label: s.tr(r, "rev."+rev.Status),
170 })
171 }
172 if v.User == nil || mr.Status != "open" {
173 return
174 }
175 v.CanReview = role.CanWriteCode()
176 pol, _, _ := s.Store.EffectiveApproval(r.Context(), repo)
177 v.CanApprove = v.CanReview && v.User.ID != mr.AuthorID && approvalCounts(role, pol)
178 v.CanDismiss = role.CanManageSettings()
179 }
180
181 func (s *Server) postReview(w http.ResponseWriter, r *http.Request) {
182 u, repo, role, ok := s.guard(w, r, access.RoleDeveloper)
183 if !ok || !s.csrfOK(w, r) {
184 return
185 }
186 mr, err := s.mrFromRequest(r, repo.ID)
187 if err != nil || mr.Status != "open" {
188 http.NotFound(w, r)
189 return
190 }
191 back := repoURL(repo) + "/-/merge-requests/" + strconv.FormatInt(mr.Number, 10)
192 if !role.CanWriteCode() {
193 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
194 return
195 }
196 status := r.FormValue("status")
197 switch status {
198 case "approved", "changes", "rejected":
199 default:
200 s.redirect(w, r, back, "", s.tr(r, "rev.bad"))
201 return
202 }
203 if status == "approved" {
204 if u.ID == mr.AuthorID {
205 s.redirect(w, r, back, "", s.tr(r, "rev.own"))
206 return
207 }
208 pol, _, err := s.Store.EffectiveApproval(r.Context(), repo)
209 if err != nil || !approvalCounts(role, pol) {
210 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
211 return
212 }
213 }
214 if err := s.Store.UpsertReview(r.Context(), repo.ID, mr.ID, u.ID, status); err != nil {
215 s.redirect(w, r, back, "", s.trErr(r, err))
216 return
217 }
218 s.redirect(w, r, back, s.tr(r, "flash.saved"), "")
219 }
220
221 func (s *Server) dismissReview(w http.ResponseWriter, r *http.Request) {
222 _, repo, role, ok := s.guard(w, r, access.RoleMaintainer)
223 if !ok || !s.csrfOK(w, r) {
224 return
225 }
226 mr, err := s.mrFromRequest(r, repo.ID)
227 if err != nil {
228 http.NotFound(w, r)
229 return
230 }
231 back := repoURL(repo) + "/-/merge-requests/" + strconv.FormatInt(mr.Number, 10)
232 if !role.CanManageSettings() {
233 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
234 return
235 }
236 userID, _ := strconv.ParseInt(r.FormValue("user_id"), 10, 64)
237 if userID == 0 {
238 s.redirect(w, r, back, "", s.tr(r, "rev.bad"))
239 return
240 }
241 if err := s.Store.UpsertReview(r.Context(), repo.ID, mr.ID, userID, "dismissed"); err != nil {
242 s.redirect(w, r, back, "", s.trErr(r, err))
243 return
244 }
245 s.redirect(w, r, back, s.tr(r, "flash.saved"), "")
246 }
247
248 func (s *Server) reopenMR(w http.ResponseWriter, r *http.Request) {
249 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
250 if !ok || !s.csrfOK(w, r) {
251 return
252 }
253 mr, err := s.mrFromRequest(r, repo.ID)
254 if err != nil || mr.Status != "closed" {
255 http.NotFound(w, r)
256 return
257 }
258 if u.ID != mr.AuthorID && !role.CanManageSettings() {
259 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
260 return
261 }
262 _ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "open")
263 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.reopened"), "")
264 }
265
266 // noteRequestsChanges zet Request changes als de reactie een suggestie bevat.
267 func (s *Server) noteRequestsChanges(r *http.Request, repo store.Repo, mr store.MergeRequest, userID int64, suggestion string) {
268 if suggestion == "" || mr.Status != "open" {
269 return
270 }
271 _ = s.Store.UpsertReview(r.Context(), repo.ID, mr.ID, userID, "changes")
272 }
@@ -0,0 +1,272 @@
1package server
2
3import (
4 "context"
5 "net/http"
6 "strconv"
7
8 "gitlab.com/Timfa/bluegit/internal/access"
9 "gitlab.com/Timfa/bluegit/internal/store"
10)
11
12// ApprovalView is de goedkeuringsregel zoals de instellingen hem tonen.
13type ApprovalView struct {
14 MaintainerRequired bool
15 RequiredCount int
16 DevelopersApprove bool
17 Locked bool
18 GroupPath string
19 Maintainers int
20 Warn bool
21}
22
23// ReviewRow is één reviewer op de merge request.
24type ReviewRow struct {
25 UserID int64
26 Username string
27 Status string
28 Label string
29}
30
31func (s *Server) fillApproval(r *http.Request, v *View, repo store.Repo) {
32 pol, groupPath, err := s.Store.EffectiveApproval(r.Context(), repo)
33 if err != nil {
34 return
35 }
36 n, _ := s.Store.ProjectMaintainerCount(r.Context(), repo)
37 v.Approval = approvalView(pol, groupPath != "", groupPath, n)
38}
39
40func (s *Server) fillGroupApproval(r *http.Request, v *View, g store.Group) {
41 pol, err := s.Store.GetApproval(r.Context(), "group", g.ID)
42 if err != nil {
43 return
44 }
45 n, _ := s.Store.GroupMaintainerCount(r.Context(), g.ID)
46 v.Approval = approvalView(pol, false, "", n)
47}
48
49func approvalView(pol store.ApprovalPolicy, locked bool, groupPath string, maintainers int) *ApprovalView {
50 if pol.RequiredCount < 1 {
51 pol.RequiredCount = 1
52 }
53 return &ApprovalView{
54 MaintainerRequired: pol.MaintainerRequired,
55 RequiredCount: pol.RequiredCount,
56 DevelopersApprove: pol.DevelopersApprove,
57 Locked: locked,
58 GroupPath: groupPath,
59 Maintainers: maintainers,
60 Warn: pol.MaintainerRequired && pol.RequiredCount > maintainers,
61 }
62}
63
64func (s *Server) saveRepoApproval(w http.ResponseWriter, r *http.Request) {
65 _, repo, _, ok := s.guard(w, r, access.RoleMaintainer)
66 if !ok || !s.csrfOK(w, r) {
67 return
68 }
69 _, groupPath, err := s.Store.EffectiveApproval(r.Context(), repo)
70 if err != nil {
71 s.redirect(w, r, repoURL(repo)+"/-/settings?tab=approvals", "", s.trErr(r, err))
72 return
73 }
74 if groupPath != "" {
75 s.redirect(w, r, repoURL(repo)+"/-/settings?tab=approvals", "", s.tr(r, "appr.locked"))
76 return
77 }
78 if err := s.Store.SaveApproval(r.Context(), "repo", repo.ID, approvalFromForm(r)); err != nil {
79 s.redirect(w, r, repoURL(repo)+"/-/settings?tab=approvals", "", s.trErr(r, err))
80 return
81 }
82 s.redirect(w, r, repoURL(repo)+"/-/settings?tab=approvals", s.tr(r, "flash.saved"), "")
83}
84
85func (s *Server) saveGroupApproval(w http.ResponseWriter, r *http.Request) {
86 g, _, ok := s.guardGroup(w, r, access.RoleMaintainer)
87 if !ok || !s.csrfOK(w, r) {
88 return
89 }
90 if err := s.Store.SaveApproval(r.Context(), "group", g.ID, approvalFromForm(r)); err != nil {
91 s.redirect(w, r, "/groups/"+g.Path+"?tab=settings", "", s.trErr(r, err))
92 return
93 }
94 s.redirect(w, r, "/groups/"+g.Path+"?tab=settings", s.tr(r, "flash.saved"), "")
95}
96
97func approvalFromForm(r *http.Request) store.ApprovalPolicy {
98 n, _ := strconv.Atoi(r.FormValue("required_count"))
99 return store.ApprovalPolicy{
100 MaintainerRequired: r.FormValue("maintainer_required") == "1",
101 RequiredCount: n,
102 DevelopersApprove: r.FormValue("developers_approve") == "1",
103 }
104}
105
106func (s *Server) reviewBlocks(r *http.Request, repo store.Repo, mr store.MergeRequest) []string {
107 if mr.Status != "open" {
108 return nil
109 }
110 pol, _, err := s.Store.EffectiveApproval(r.Context(), repo)
111 if err != nil {
112 return nil
113 }
114 var out []string
115 if pol.MaintainerRequired {
116 n := s.countApprovals(r.Context(), repo, mr, pol)
117 if n < pol.RequiredCount {
118 out = append(out, s.tr(r, "rev.summary.approvals", n, pol.RequiredCount))
119 }
120 }
121 reviews, err := s.Store.ListReviews(r.Context(), mr.ID)
122 if err != nil {
123 return out
124 }
125 for _, rev := range reviews {
126 switch rev.Status {
127 case "changes":
128 out = append(out, s.tr(r, "rev.summary.changes", rev.Username))
129 case "rejected":
130 out = append(out, s.tr(r, "rev.summary.rejected", rev.Username))
131 }
132 }
133 return out
134}
135
136func (s *Server) countApprovals(ctx context.Context, repo store.Repo, mr store.MergeRequest, pol store.ApprovalPolicy) int {
137 reviews, err := s.Store.ListReviews(ctx, mr.ID)
138 if err != nil {
139 return 0
140 }
141 n := 0
142 for _, rev := range reviews {
143 if rev.Status != "approved" || rev.UserID == mr.AuthorID {
144 continue
145 }
146 role, err := s.Store.EffectiveRole(ctx, rev.UserID, repo.ID)
147 if err != nil {
148 continue
149 }
150 if approvalCounts(role, pol) {
151 n++
152 }
153 }
154 return n
155}
156
157func approvalCounts(role access.Role, pol store.ApprovalPolicy) bool {
158 if role.CanManageSettings() {
159 return true
160 }
161 return pol.DevelopersApprove && role.CanWriteCode()
162}
163
164func (s *Server) fillReviews(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, role access.Role) {
165 reviews, _ := s.Store.ListReviews(r.Context(), mr.ID)
166 for _, rev := range reviews {
167 v.Reviews = append(v.Reviews, ReviewRow{
168 UserID: rev.UserID, Username: rev.Username, Status: rev.Status,
169 Label: s.tr(r, "rev."+rev.Status),
170 })
171 }
172 if v.User == nil || mr.Status != "open" {
173 return
174 }
175 v.CanReview = role.CanWriteCode()
176 pol, _, _ := s.Store.EffectiveApproval(r.Context(), repo)
177 v.CanApprove = v.CanReview && v.User.ID != mr.AuthorID && approvalCounts(role, pol)
178 v.CanDismiss = role.CanManageSettings()
179}
180
181func (s *Server) postReview(w http.ResponseWriter, r *http.Request) {
182 u, repo, role, ok := s.guard(w, r, access.RoleDeveloper)
183 if !ok || !s.csrfOK(w, r) {
184 return
185 }
186 mr, err := s.mrFromRequest(r, repo.ID)
187 if err != nil || mr.Status != "open" {
188 http.NotFound(w, r)
189 return
190 }
191 back := repoURL(repo) + "/-/merge-requests/" + strconv.FormatInt(mr.Number, 10)
192 if !role.CanWriteCode() {
193 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
194 return
195 }
196 status := r.FormValue("status")
197 switch status {
198 case "approved", "changes", "rejected":
199 default:
200 s.redirect(w, r, back, "", s.tr(r, "rev.bad"))
201 return
202 }
203 if status == "approved" {
204 if u.ID == mr.AuthorID {
205 s.redirect(w, r, back, "", s.tr(r, "rev.own"))
206 return
207 }
208 pol, _, err := s.Store.EffectiveApproval(r.Context(), repo)
209 if err != nil || !approvalCounts(role, pol) {
210 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
211 return
212 }
213 }
214 if err := s.Store.UpsertReview(r.Context(), repo.ID, mr.ID, u.ID, status); err != nil {
215 s.redirect(w, r, back, "", s.trErr(r, err))
216 return
217 }
218 s.redirect(w, r, back, s.tr(r, "flash.saved"), "")
219}
220
221func (s *Server) dismissReview(w http.ResponseWriter, r *http.Request) {
222 _, repo, role, ok := s.guard(w, r, access.RoleMaintainer)
223 if !ok || !s.csrfOK(w, r) {
224 return
225 }
226 mr, err := s.mrFromRequest(r, repo.ID)
227 if err != nil {
228 http.NotFound(w, r)
229 return
230 }
231 back := repoURL(repo) + "/-/merge-requests/" + strconv.FormatInt(mr.Number, 10)
232 if !role.CanManageSettings() {
233 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
234 return
235 }
236 userID, _ := strconv.ParseInt(r.FormValue("user_id"), 10, 64)
237 if userID == 0 {
238 s.redirect(w, r, back, "", s.tr(r, "rev.bad"))
239 return
240 }
241 if err := s.Store.UpsertReview(r.Context(), repo.ID, mr.ID, userID, "dismissed"); err != nil {
242 s.redirect(w, r, back, "", s.trErr(r, err))
243 return
244 }
245 s.redirect(w, r, back, s.tr(r, "flash.saved"), "")
246}
247
248func (s *Server) reopenMR(w http.ResponseWriter, r *http.Request) {
249 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
250 if !ok || !s.csrfOK(w, r) {
251 return
252 }
253 mr, err := s.mrFromRequest(r, repo.ID)
254 if err != nil || mr.Status != "closed" {
255 http.NotFound(w, r)
256 return
257 }
258 if u.ID != mr.AuthorID && !role.CanManageSettings() {
259 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
260 return
261 }
262 _ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "open")
263 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.reopened"), "")
264}
265
266// noteRequestsChanges zet Request changes als de reactie een suggestie bevat.
267func (s *Server) noteRequestsChanges(r *http.Request, repo store.Repo, mr store.MergeRequest, userID int64, suggestion string) {
268 if suggestion == "" || mr.Status != "open" {
269 return
270 }
271 _ = s.Store.UpsertReview(r.Context(), repo.ID, mr.ID, userID, "changes")
272}
internal/server/reviews_test.go added +240 −0
@@ -0,0 +1,240 @@
1 package server
2
3 import (
4 "context"
5 "net/http"
6 "net/http/cookiejar"
7 "net/http/httptest"
8 "net/url"
9 "os/exec"
10 "path/filepath"
11 "strings"
12 "testing"
13
14 "gitlab.com/Timfa/bluegit/internal/access"
15 "gitlab.com/Timfa/bluegit/internal/auth"
16 "gitlab.com/Timfa/bluegit/internal/config"
17 "gitlab.com/Timfa/bluegit/internal/store"
18 )
19
20 func TestReviewsApprovalsAndReopen(t *testing.T) {
21 if _, err := exec.LookPath("git"); err != nil {
22 t.Skip("git ontbreekt")
23 }
24 storage := t.TempDir()
25 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
26 if err != nil {
27 t.Fatal(err)
28 }
29 t.Cleanup(func() { _ = st.Close() })
30 cfg := config.Config{
31 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
32 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
33 Git: config.Git{Binary: "git", DefaultBranch: "master"},
34 }
35 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
36 ts := httptest.NewServer(srv.Handler())
37 t.Cleanup(ts.Close)
38 jar, _ := cookiejar.New(nil)
39 tim := &http.Client{Jar: jar}
40 res, err := tim.Get(ts.URL + "/login")
41 if err != nil {
42 t.Fatal(err)
43 }
44 page := read(t, res)
45 res, err = tim.PostForm(ts.URL+"/new/repo", url.Values{"csrf": {csrfOf(t, page)}, "name": {"gates"}, "visibility": {"public"}})
46 if err != nil {
47 t.Fatal(err)
48 }
49 page = read(t, res)
50 res, err = tim.PostForm(ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"laptop"}})
51 if err != nil {
52 t.Fatal(err)
53 }
54 token := between(read(t, res), `<p class="code">`, "</p>")
55 remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/gates.git"
56 work := t.TempDir()
57 git(t, work, "init", "-b", "master")
58 git(t, work, "config", "user.email", "tim@users.git.timfalken.com")
59 git(t, work, "config", "user.name", "tim")
60 writeFile(t, filepath.Join(work, "hello.txt"), "alpha\nbeta\ngamma\n")
61 git(t, work, "add", "hello.txt")
62 git(t, work, "commit", "-m", "start")
63 git(t, work, "remote", "add", "origin", remote)
64 git(t, work, "push", "-u", "origin", "master")
65 git(t, work, "checkout", "-b", "feature")
66 writeFile(t, filepath.Join(work, "hello.txt"), "alpha\nBETA\ngamma\n")
67 git(t, work, "add", "hello.txt")
68 git(t, work, "commit", "-m", "hoofdletters")
69 git(t, work, "push", "-u", "origin", "feature")
70
71 res, err = tim.Get(ts.URL + "/tim/gates/-/merge-requests")
72 if err != nil {
73 t.Fatal(err)
74 }
75 page = read(t, res)
76 res, err = tim.PostForm(ts.URL+"/tim/gates/-/merge-requests", url.Values{
77 "csrf": {csrfOf(t, page)}, "title": {"Hoofdletters"}, "source": {"feature"}, "target": {"master"},
78 })
79 if err != nil {
80 t.Fatal(err)
81 }
82 page = read(t, res)
83
84 res, err = tim.Get(ts.URL + "/tim/gates/-/settings?tab=approvals")
85 if err != nil {
86 t.Fatal(err)
87 }
88 page = read(t, res)
89 res, err = tim.PostForm(ts.URL+"/tim/gates/-/approvals", url.Values{
90 "csrf": {csrfOf(t, page)}, "maintainer_required": {"1"}, "required_count": {"3"},
91 })
92 if err != nil {
93 t.Fatal(err)
94 }
95 page = read(t, res)
96 if !strings.Contains(page, "This requires 3 approvals, and there are 1 maintainers.") {
97 t.Fatalf("waarschuwing:\n%s", page)
98 }
99
100 ctx := context.Background()
101 repo, err := st.RepoByPath(ctx, "tim", "gates")
102 if err != nil {
103 t.Fatal(err)
104 }
105 ada, err := st.UpsertUser(ctx, 2, "ada", "", false)
106 if err != nil {
107 t.Fatal(err)
108 }
109 bob, err := st.UpsertUser(ctx, 3, "bob", "", false)
110 if err != nil {
111 t.Fatal(err)
112 }
113 if err := st.SetMember(ctx, "repo", repo.ID, "ada", access.RoleMaintainer); err != nil {
114 t.Fatal(err)
115 }
116 if err := st.SetMember(ctx, "repo", repo.ID, "bob", access.RoleReadonly); err != nil {
117 t.Fatal(err)
118 }
119 if err := st.SaveApproval(ctx, "repo", repo.ID, store.ApprovalPolicy{MaintainerRequired: true, RequiredCount: 1}); err != nil {
120 t.Fatal(err)
121 }
122
123 res, err = tim.PostForm(ts.URL+"/tim/gates/-/merge-requests/1/reviews", url.Values{"csrf": {csrfOf(t, page)}, "status": {"approved"}})
124 if err != nil {
125 t.Fatal(err)
126 }
127 if body := read(t, res); !strings.Contains(body, "You cannot approve your own merge request.") {
128 t.Fatalf("eigen approval:\n%s", body)
129 }
130
131 adaC := clientAs(t, ts.URL, st, ada.ID)
132 res, err = adaC.Get(ts.URL + "/tim/gates/-/merge-requests/1")
133 if err != nil {
134 t.Fatal(err)
135 }
136 adaPage := read(t, res)
137 res, err = adaC.PostForm(ts.URL+"/tim/gates/-/merge-requests/1/reviews", url.Values{"csrf": {csrfOf(t, adaPage)}, "status": {"approved"}})
138 if err != nil {
139 t.Fatal(err)
140 }
141 if body := read(t, res); !strings.Contains(body, "1 of 1 approvals") && strings.Contains(body, "approvals.") {
142 t.Fatalf("na ada:\n%s", body)
143 }
144 body := read(t, mustGet(t, adaC, ts.URL+"/tim/gates/-/merge-requests/1"))
145 if strings.Contains(body, "of 1 approvals") {
146 t.Fatalf("ada's approval hoort te volstaan:\n%s", body)
147 }
148
149 bobC := clientAs(t, ts.URL, st, bob.ID)
150 res, err = bobC.Get(ts.URL + "/tim/gates/-/merge-requests/1")
151 if err != nil {
152 t.Fatal(err)
153 }
154 bobPage := read(t, res)
155 res, err = bobC.PostForm(ts.URL+"/tim/gates/-/merge-requests/1/notes", url.Values{
156 "csrf": {csrfOf(t, bobPage)}, "path": {"hello.txt"}, "line_start": {"2"}, "line_end": {"2"},
157 "body": {"beter\n```suggestion\nbetter\n```"},
158 })
159 if err != nil {
160 t.Fatal(err)
161 }
162 body = read(t, res)
163 if !strings.Contains(body, "bob requested changes.") {
164 t.Fatalf("suggestie blokkeert:\n%s", body)
165 }
166 res, err = tim.Get(ts.URL + "/tim/gates/-/merge-requests/1")
167 if err != nil {
168 t.Fatal(err)
169 }
170 page = read(t, res)
171 if !strings.Contains(page, "disabled") {
172 t.Fatalf("mergeknop hoort uit:\n%s", page)
173 }
174 bobID := ""
175 if i := strings.Index(page, `name="user_id" value="`); i >= 0 {
176 rest := page[i+len(`name="user_id" value="`):]
177 bobID = rest[:strings.Index(rest, `"`)]
178 }
179 if bobID == "" {
180 t.Fatalf("dismiss-knop:\n%s", page)
181 }
182 res, err = tim.PostForm(ts.URL+"/tim/gates/-/merge-requests/1/reviews/dismiss", url.Values{
183 "csrf": {csrfOf(t, page)}, "user_id": {bobID},
184 })
185 if err != nil {
186 t.Fatal(err)
187 }
188 body = read(t, res)
189 if strings.Contains(body, "bob requested changes.") || strings.Contains(body, "disabled") {
190 t.Fatalf("na ongeldig verklaren:\n%s", body)
191 }
192 if !strings.Contains(body, "Invalidated") {
193 t.Fatalf("status:\n%s", body)
194 }
195
196 res, err = adaC.PostForm(ts.URL+"/tim/gates/-/merge-requests/1/reviews", url.Values{"csrf": {csrfOf(t, body)}, "status": {"rejected"}})
197 if err != nil {
198 t.Fatal(err)
199 }
200 // ada's csrf from an old page may fail. Use a fresh page.
201 _ = read(t, res)
202 res, err = adaC.Get(ts.URL + "/tim/gates/-/merge-requests/1")
203 if err != nil {
204 t.Fatal(err)
205 }
206 adaPage = read(t, res)
207 res, err = adaC.PostForm(ts.URL+"/tim/gates/-/merge-requests/1/reviews", url.Values{"csrf": {csrfOf(t, adaPage)}, "status": {"rejected"}})
208 if err != nil {
209 t.Fatal(err)
210 }
211 body = read(t, res)
212 if !strings.Contains(body, "ada rejected this merge request.") {
213 t.Fatalf("veto:\n%s", body)
214 }
215
216 res, err = tim.PostForm(ts.URL+"/tim/gates/-/merge-requests/1/close", url.Values{"csrf": {csrfOf(t, page)}})
217 if err != nil {
218 t.Fatal(err)
219 }
220 body = read(t, res)
221 if !strings.Contains(body, ">closed<") && !strings.Contains(body, "closed") {
222 t.Fatalf("sluiten:\n%s", body)
223 }
224 if !strings.Contains(body, "Reopen") {
225 t.Fatalf("heropenen:\n%s", body)
226 }
227 res, err = tim.Get(ts.URL + "/tim/gates/-/merge-requests/1")
228 if err != nil {
229 t.Fatal(err)
230 }
231 page = read(t, res)
232 res, err = tim.PostForm(ts.URL+"/tim/gates/-/merge-requests/1/reopen", url.Values{"csrf": {csrfOf(t, page)}})
233 if err != nil {
234 t.Fatal(err)
235 }
236 body = read(t, res)
237 if !strings.Contains(body, ">open<") && !strings.Contains(body, "pill\">open") {
238 t.Fatalf("heropend:\n%s", body)
239 }
240 }
@@ -0,0 +1,240 @@
1package server
2
3import (
4 "context"
5 "net/http"
6 "net/http/cookiejar"
7 "net/http/httptest"
8 "net/url"
9 "os/exec"
10 "path/filepath"
11 "strings"
12 "testing"
13
14 "gitlab.com/Timfa/bluegit/internal/access"
15 "gitlab.com/Timfa/bluegit/internal/auth"
16 "gitlab.com/Timfa/bluegit/internal/config"
17 "gitlab.com/Timfa/bluegit/internal/store"
18)
19
20func TestReviewsApprovalsAndReopen(t *testing.T) {
21 if _, err := exec.LookPath("git"); err != nil {
22 t.Skip("git ontbreekt")
23 }
24 storage := t.TempDir()
25 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
26 if err != nil {
27 t.Fatal(err)
28 }
29 t.Cleanup(func() { _ = st.Close() })
30 cfg := config.Config{
31 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
32 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
33 Git: config.Git{Binary: "git", DefaultBranch: "master"},
34 }
35 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
36 ts := httptest.NewServer(srv.Handler())
37 t.Cleanup(ts.Close)
38 jar, _ := cookiejar.New(nil)
39 tim := &http.Client{Jar: jar}
40 res, err := tim.Get(ts.URL + "/login")
41 if err != nil {
42 t.Fatal(err)
43 }
44 page := read(t, res)
45 res, err = tim.PostForm(ts.URL+"/new/repo", url.Values{"csrf": {csrfOf(t, page)}, "name": {"gates"}, "visibility": {"public"}})
46 if err != nil {
47 t.Fatal(err)
48 }
49 page = read(t, res)
50 res, err = tim.PostForm(ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"laptop"}})
51 if err != nil {
52 t.Fatal(err)
53 }
54 token := between(read(t, res), `<p class="code">`, "</p>")
55 remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/gates.git"
56 work := t.TempDir()
57 git(t, work, "init", "-b", "master")
58 git(t, work, "config", "user.email", "tim@users.git.timfalken.com")
59 git(t, work, "config", "user.name", "tim")
60 writeFile(t, filepath.Join(work, "hello.txt"), "alpha\nbeta\ngamma\n")
61 git(t, work, "add", "hello.txt")
62 git(t, work, "commit", "-m", "start")
63 git(t, work, "remote", "add", "origin", remote)
64 git(t, work, "push", "-u", "origin", "master")
65 git(t, work, "checkout", "-b", "feature")
66 writeFile(t, filepath.Join(work, "hello.txt"), "alpha\nBETA\ngamma\n")
67 git(t, work, "add", "hello.txt")
68 git(t, work, "commit", "-m", "hoofdletters")
69 git(t, work, "push", "-u", "origin", "feature")
70
71 res, err = tim.Get(ts.URL + "/tim/gates/-/merge-requests")
72 if err != nil {
73 t.Fatal(err)
74 }
75 page = read(t, res)
76 res, err = tim.PostForm(ts.URL+"/tim/gates/-/merge-requests", url.Values{
77 "csrf": {csrfOf(t, page)}, "title": {"Hoofdletters"}, "source": {"feature"}, "target": {"master"},
78 })
79 if err != nil {
80 t.Fatal(err)
81 }
82 page = read(t, res)
83
84 res, err = tim.Get(ts.URL + "/tim/gates/-/settings?tab=approvals")
85 if err != nil {
86 t.Fatal(err)
87 }
88 page = read(t, res)
89 res, err = tim.PostForm(ts.URL+"/tim/gates/-/approvals", url.Values{
90 "csrf": {csrfOf(t, page)}, "maintainer_required": {"1"}, "required_count": {"3"},
91 })
92 if err != nil {
93 t.Fatal(err)
94 }
95 page = read(t, res)
96 if !strings.Contains(page, "This requires 3 approvals, and there are 1 maintainers.") {
97 t.Fatalf("waarschuwing:\n%s", page)
98 }
99
100 ctx := context.Background()
101 repo, err := st.RepoByPath(ctx, "tim", "gates")
102 if err != nil {
103 t.Fatal(err)
104 }
105 ada, err := st.UpsertUser(ctx, 2, "ada", "", false)
106 if err != nil {
107 t.Fatal(err)
108 }
109 bob, err := st.UpsertUser(ctx, 3, "bob", "", false)
110 if err != nil {
111 t.Fatal(err)
112 }
113 if err := st.SetMember(ctx, "repo", repo.ID, "ada", access.RoleMaintainer); err != nil {
114 t.Fatal(err)
115 }
116 if err := st.SetMember(ctx, "repo", repo.ID, "bob", access.RoleReadonly); err != nil {
117 t.Fatal(err)
118 }
119 if err := st.SaveApproval(ctx, "repo", repo.ID, store.ApprovalPolicy{MaintainerRequired: true, RequiredCount: 1}); err != nil {
120 t.Fatal(err)
121 }
122
123 res, err = tim.PostForm(ts.URL+"/tim/gates/-/merge-requests/1/reviews", url.Values{"csrf": {csrfOf(t, page)}, "status": {"approved"}})
124 if err != nil {
125 t.Fatal(err)
126 }
127 if body := read(t, res); !strings.Contains(body, "You cannot approve your own merge request.") {
128 t.Fatalf("eigen approval:\n%s", body)
129 }
130
131 adaC := clientAs(t, ts.URL, st, ada.ID)
132 res, err = adaC.Get(ts.URL + "/tim/gates/-/merge-requests/1")
133 if err != nil {
134 t.Fatal(err)
135 }
136 adaPage := read(t, res)
137 res, err = adaC.PostForm(ts.URL+"/tim/gates/-/merge-requests/1/reviews", url.Values{"csrf": {csrfOf(t, adaPage)}, "status": {"approved"}})
138 if err != nil {
139 t.Fatal(err)
140 }
141 if body := read(t, res); !strings.Contains(body, "1 of 1 approvals") && strings.Contains(body, "approvals.") {
142 t.Fatalf("na ada:\n%s", body)
143 }
144 body := read(t, mustGet(t, adaC, ts.URL+"/tim/gates/-/merge-requests/1"))
145 if strings.Contains(body, "of 1 approvals") {
146 t.Fatalf("ada's approval hoort te volstaan:\n%s", body)
147 }
148
149 bobC := clientAs(t, ts.URL, st, bob.ID)
150 res, err = bobC.Get(ts.URL + "/tim/gates/-/merge-requests/1")
151 if err != nil {
152 t.Fatal(err)
153 }
154 bobPage := read(t, res)
155 res, err = bobC.PostForm(ts.URL+"/tim/gates/-/merge-requests/1/notes", url.Values{
156 "csrf": {csrfOf(t, bobPage)}, "path": {"hello.txt"}, "line_start": {"2"}, "line_end": {"2"},
157 "body": {"beter\n```suggestion\nbetter\n```"},
158 })
159 if err != nil {
160 t.Fatal(err)
161 }
162 body = read(t, res)
163 if !strings.Contains(body, "bob requested changes.") {
164 t.Fatalf("suggestie blokkeert:\n%s", body)
165 }
166 res, err = tim.Get(ts.URL + "/tim/gates/-/merge-requests/1")
167 if err != nil {
168 t.Fatal(err)
169 }
170 page = read(t, res)
171 if !strings.Contains(page, "disabled") {
172 t.Fatalf("mergeknop hoort uit:\n%s", page)
173 }
174 bobID := ""
175 if i := strings.Index(page, `name="user_id" value="`); i >= 0 {
176 rest := page[i+len(`name="user_id" value="`):]
177 bobID = rest[:strings.Index(rest, `"`)]
178 }
179 if bobID == "" {
180 t.Fatalf("dismiss-knop:\n%s", page)
181 }
182 res, err = tim.PostForm(ts.URL+"/tim/gates/-/merge-requests/1/reviews/dismiss", url.Values{
183 "csrf": {csrfOf(t, page)}, "user_id": {bobID},
184 })
185 if err != nil {
186 t.Fatal(err)
187 }
188 body = read(t, res)
189 if strings.Contains(body, "bob requested changes.") || strings.Contains(body, "disabled") {
190 t.Fatalf("na ongeldig verklaren:\n%s", body)
191 }
192 if !strings.Contains(body, "Invalidated") {
193 t.Fatalf("status:\n%s", body)
194 }
195
196 res, err = adaC.PostForm(ts.URL+"/tim/gates/-/merge-requests/1/reviews", url.Values{"csrf": {csrfOf(t, body)}, "status": {"rejected"}})
197 if err != nil {
198 t.Fatal(err)
199 }
200 // ada's csrf from an old page may fail. Use a fresh page.
201 _ = read(t, res)
202 res, err = adaC.Get(ts.URL + "/tim/gates/-/merge-requests/1")
203 if err != nil {
204 t.Fatal(err)
205 }
206 adaPage = read(t, res)
207 res, err = adaC.PostForm(ts.URL+"/tim/gates/-/merge-requests/1/reviews", url.Values{"csrf": {csrfOf(t, adaPage)}, "status": {"rejected"}})
208 if err != nil {
209 t.Fatal(err)
210 }
211 body = read(t, res)
212 if !strings.Contains(body, "ada rejected this merge request.") {
213 t.Fatalf("veto:\n%s", body)
214 }
215
216 res, err = tim.PostForm(ts.URL+"/tim/gates/-/merge-requests/1/close", url.Values{"csrf": {csrfOf(t, page)}})
217 if err != nil {
218 t.Fatal(err)
219 }
220 body = read(t, res)
221 if !strings.Contains(body, ">closed<") && !strings.Contains(body, "closed") {
222 t.Fatalf("sluiten:\n%s", body)
223 }
224 if !strings.Contains(body, "Reopen") {
225 t.Fatalf("heropenen:\n%s", body)
226 }
227 res, err = tim.Get(ts.URL + "/tim/gates/-/merge-requests/1")
228 if err != nil {
229 t.Fatal(err)
230 }
231 page = read(t, res)
232 res, err = tim.PostForm(ts.URL+"/tim/gates/-/merge-requests/1/reopen", url.Values{"csrf": {csrfOf(t, page)}})
233 if err != nil {
234 t.Fatal(err)
235 }
236 body = read(t, res)
237 if !strings.Contains(body, ">open<") && !strings.Contains(body, "pill\">open") {
238 t.Fatalf("heropend:\n%s", body)
239 }
240}
internal/server/server.go +12 −0
@@ -90,6 +90,7 @@ func (s *Server) Handler() http.Handler {
90 90 mux.HandleFunc("GET /groups/{path}", s.groupPage)
91 91 mux.HandleFunc("GET /groups/{path}/logo", s.groupLogo)
92 92 mux.HandleFunc("POST /groups/{path}/settings", s.saveGroup)
93 mux.HandleFunc("POST /groups/{path}/approvals", s.saveGroupApproval)
93 94 mux.HandleFunc("POST /groups/{path}/logo", s.uploadGroupLogo)
94 95 mux.HandleFunc("POST /groups/{path}/members", s.groupMember)
95 96 mux.HandleFunc("POST /groups/{path}/members/remove", s.groupMemberRemove)
@@ -116,6 +117,9 @@ func (s *Server) Handler() http.Handler {
116 117 mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests/{number}", s.showMR)
117 118 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/merge", s.mergeMR)
118 119 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/close", s.closeMR)
120 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/reopen", s.reopenMR)
121 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/reviews", s.postReview)
122 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/reviews/dismiss", s.dismissReview)
119 123 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/notes", s.createNote)
120 124 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/suggestions", s.applySuggestions)
121 125 mux.HandleFunc("GET /{owner}/{repo}/-/pipelines", s.pipelines)
@@ -134,6 +138,7 @@ func (s *Server) Handler() http.Handler {
134 138 mux.HandleFunc("POST /{owner}/{repo}/-/star", s.toggleStar)
135 139 mux.HandleFunc("GET /{owner}/{repo}/-/settings", s.settings)
136 140 mux.HandleFunc("POST /{owner}/{repo}/-/settings", s.updateRepo)
141 mux.HandleFunc("POST /{owner}/{repo}/-/approvals", s.saveRepoApproval)
137 142 mux.HandleFunc("POST /{owner}/{repo}/-/members", s.repoMember)
138 143 mux.HandleFunc("POST /{owner}/{repo}/-/members/remove", s.repoMemberRemove)
139 144 mux.HandleFunc("POST /{owner}/{repo}/-/protected", s.addProtected)
@@ -440,6 +445,13 @@ type View struct {
440 445 MR *store.MergeRequest
441 446 MRPipe *PipeRow
442 447 MergeBlocks []string
448 Approval *ApprovalView
449 Reviews []ReviewRow
450 CanReview bool
451 CanApprove bool
452 CanDismiss bool
453 CanClose bool
454 CanReopen bool
443 455 Diff string
444 456 DiffFiles []DiffFileView
445 457 Pipes []store.Pipeline
@@ -90,6 +90,7 @@ func (s *Server) Handler() http.Handler {
90 mux.HandleFunc("GET /groups/{path}", s.groupPage)
90 mux.HandleFunc("GET /groups/{path}", s.groupPage)
91 mux.HandleFunc("GET /groups/{path}/logo", s.groupLogo)
91 mux.HandleFunc("GET /groups/{path}/logo", s.groupLogo)
92 mux.HandleFunc("POST /groups/{path}/settings", s.saveGroup)
92 mux.HandleFunc("POST /groups/{path}/settings", s.saveGroup)
93 mux.HandleFunc("POST /groups/{path}/approvals", s.saveGroupApproval)
93 mux.HandleFunc("POST /groups/{path}/logo", s.uploadGroupLogo)
94 mux.HandleFunc("POST /groups/{path}/logo", s.uploadGroupLogo)
94 mux.HandleFunc("POST /groups/{path}/members", s.groupMember)
95 mux.HandleFunc("POST /groups/{path}/members", s.groupMember)
95 mux.HandleFunc("POST /groups/{path}/members/remove", s.groupMemberRemove)
96 mux.HandleFunc("POST /groups/{path}/members/remove", s.groupMemberRemove)
@@ -116,6 +117,9 @@ func (s *Server) Handler() http.Handler {
116 mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests/{number}", s.showMR)
117 mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests/{number}", s.showMR)
117 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/merge", s.mergeMR)
118 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/merge", s.mergeMR)
118 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/close", s.closeMR)
119 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/close", s.closeMR)
120 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/reopen", s.reopenMR)
121 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/reviews", s.postReview)
122 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/reviews/dismiss", s.dismissReview)
119 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/notes", s.createNote)
123 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/notes", s.createNote)
120 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/suggestions", s.applySuggestions)
124 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/suggestions", s.applySuggestions)
121 mux.HandleFunc("GET /{owner}/{repo}/-/pipelines", s.pipelines)
125 mux.HandleFunc("GET /{owner}/{repo}/-/pipelines", s.pipelines)
@@ -134,6 +138,7 @@ func (s *Server) Handler() http.Handler {
134 mux.HandleFunc("POST /{owner}/{repo}/-/star", s.toggleStar)
138 mux.HandleFunc("POST /{owner}/{repo}/-/star", s.toggleStar)
135 mux.HandleFunc("GET /{owner}/{repo}/-/settings", s.settings)
139 mux.HandleFunc("GET /{owner}/{repo}/-/settings", s.settings)
136 mux.HandleFunc("POST /{owner}/{repo}/-/settings", s.updateRepo)
140 mux.HandleFunc("POST /{owner}/{repo}/-/settings", s.updateRepo)
141 mux.HandleFunc("POST /{owner}/{repo}/-/approvals", s.saveRepoApproval)
137 mux.HandleFunc("POST /{owner}/{repo}/-/members", s.repoMember)
142 mux.HandleFunc("POST /{owner}/{repo}/-/members", s.repoMember)
138 mux.HandleFunc("POST /{owner}/{repo}/-/members/remove", s.repoMemberRemove)
143 mux.HandleFunc("POST /{owner}/{repo}/-/members/remove", s.repoMemberRemove)
139 mux.HandleFunc("POST /{owner}/{repo}/-/protected", s.addProtected)
144 mux.HandleFunc("POST /{owner}/{repo}/-/protected", s.addProtected)
@@ -440,6 +445,13 @@ type View struct {
440 MR *store.MergeRequest
445 MR *store.MergeRequest
441 MRPipe *PipeRow
446 MRPipe *PipeRow
442 MergeBlocks []string
447 MergeBlocks []string
448 Approval *ApprovalView
449 Reviews []ReviewRow
450 CanReview bool
451 CanApprove bool
452 CanDismiss bool
453 CanClose bool
454 CanReopen bool
443 Diff string
455 Diff string
444 DiffFiles []DiffFileView
456 DiffFiles []DiffFileView
445 Pipes []store.Pipeline
457 Pipes []store.Pipeline
internal/server/settings_handlers.go +4 −0
@@ -32,6 +32,7 @@ func (s *Server) settings(w http.ResponseWriter, r *http.Request) {
32 32 v.Secrets, _ = s.Store.ListSecrets(r.Context(), "repo", repo.ID)
33 33 v.Patterns, _ = s.Store.ProtectedPatterns(r.Context(), repo.ID)
34 34 v.Hooks = s.hookViews(r, "repo", repo.ID)
35 s.fillApproval(r, &v, repo)
35 36 }
36 37 s.render(w, "settings", v)
37 38 }
@@ -403,6 +404,7 @@ func (s *Server) groupPage(w http.ResponseWriter, r *http.Request) {
403 404 v.Members, _ = s.Store.ListMembers(r.Context(), "group", g.ID)
404 405 v.Secrets, _ = s.Store.ListSecrets(r.Context(), "group", g.ID)
405 406 v.Hooks = s.hookViews(r, "group", g.ID)
407 s.fillGroupApproval(r, &v, g)
406 408 }
407 409 s.render(w, "group", v)
408 410 }
@@ -417,6 +419,8 @@ func settingsTab(tab string) string {
417 419 return "branches"
418 420 case "webhooks":
419 421 return "webhooks"
422 case "approvals":
423 return "approvals"
420 424 default:
421 425 return "general"
422 426 }
@@ -32,6 +32,7 @@ func (s *Server) settings(w http.ResponseWriter, r *http.Request) {
32 v.Secrets, _ = s.Store.ListSecrets(r.Context(), "repo", repo.ID)
32 v.Secrets, _ = s.Store.ListSecrets(r.Context(), "repo", repo.ID)
33 v.Patterns, _ = s.Store.ProtectedPatterns(r.Context(), repo.ID)
33 v.Patterns, _ = s.Store.ProtectedPatterns(r.Context(), repo.ID)
34 v.Hooks = s.hookViews(r, "repo", repo.ID)
34 v.Hooks = s.hookViews(r, "repo", repo.ID)
35 s.fillApproval(r, &v, repo)
35 }
36 }
36 s.render(w, "settings", v)
37 s.render(w, "settings", v)
37}
38}
@@ -403,6 +404,7 @@ func (s *Server) groupPage(w http.ResponseWriter, r *http.Request) {
403 v.Members, _ = s.Store.ListMembers(r.Context(), "group", g.ID)
404 v.Members, _ = s.Store.ListMembers(r.Context(), "group", g.ID)
404 v.Secrets, _ = s.Store.ListSecrets(r.Context(), "group", g.ID)
405 v.Secrets, _ = s.Store.ListSecrets(r.Context(), "group", g.ID)
405 v.Hooks = s.hookViews(r, "group", g.ID)
406 v.Hooks = s.hookViews(r, "group", g.ID)
407 s.fillGroupApproval(r, &v, g)
406 }
408 }
407 s.render(w, "group", v)
409 s.render(w, "group", v)
408}
410}
@@ -417,6 +419,8 @@ func settingsTab(tab string) string {
417 return "branches"
419 return "branches"
418 case "webhooks":
420 case "webhooks":
419 return "webhooks"
421 return "webhooks"
422 case "approvals":
423 return "approvals"
420 default:
424 default:
421 return "general"
425 return "general"
422 }
426 }
internal/server/templates/collab.html +53 −2
@@ -48,17 +48,41 @@
48 48 {{else}}<p class="muted">{{t "mr.noPipeline"}}</p>{{end}}
49 49 <h2>{{t "mr.commits"}}</h2>
50 50 <pre>{{if .Diff}}{{.Diff}}{{else}}{{t "mr.noDiff"}}{{end}}</pre>
51 {{if .CanMerge}}
52 51 {{range .MergeBlocks}}<p class="flash bad">{{.}}</p>{{end}}
52 {{if .CanMerge}}
53 53 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/merge">
54 54 <input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit"{{if .MergeBlocks}} disabled{{end}}>{{t "action.merge"}}</button>
55 55 </form>
56 56 {{end}}
57 {{if and .User (eq .MR.Status "open")}}
57 {{if .CanClose}}
58 58 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/close">
59 59 <input type="hidden" name="csrf" value="{{.CSRF}}"><button class="ghost" type="submit">{{t "action.close"}}</button>
60 60 </form>
61 61 {{end}}
62 {{if .CanReopen}}
63 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/reopen">
64 <input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "action.reopen"}}</button>
65 </form>
66 {{end}}
67 <h2>{{t "rev.title"}}</h2>
68 <ul class="clean">
69 {{range .Reviews}}<li><strong>{{.Username}}</strong> <span class="pill">{{.Label}}</span>
70 {{if and $.CanDismiss (or (eq .Status "changes") (eq .Status "rejected"))}}
71 <form method="post" action="/{{$.Repo.FullPath}}/-/merge-requests/{{$.MR.Number}}/reviews/dismiss">
72 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="user_id" value="{{.UserID}}">
73 <button class="ghost" type="submit">{{t "rev.dismiss"}}</button>
74 </form>
75 {{end}}
76 </li>{{else}}<li class="muted">{{t "rev.none"}}</li>{{end}}
77 </ul>
78 {{if .CanReview}}
79 <form class="row" method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/reviews">
80 <input type="hidden" name="csrf" value="{{.CSRF}}">
81 {{if .CanApprove}}<button type="submit" name="status" value="approved">{{t "rev.approved"}}</button>{{end}}
82 <button type="submit" name="status" value="changes">{{t "rev.changes"}}</button>
83 <button class="ghost" type="submit" name="status" value="rejected">{{t "rev.rejected"}}</button>
84 </form>
85 {{end}}
62 86 <h2>{{t "mr.changes"}}</h2>
63 87 {{if .CanApply}}
64 88 <div class="applybar" hidden data-apply-bar>
@@ -350,6 +374,28 @@
350 374 {{template "layout-end" .}}
351 375 {{end}}
352 376
377 {{define "approvalform"}}
378 {{if .Approval}}
379 {{if .Approval.Warn}}<p class="flash bad">{{t "appr.warn" .Approval.RequiredCount .Approval.Maintainers}}</p>{{end}}
380 {{if .Approval.Locked}}
381 <div class="panel">
382 <p>{{t "appr.locked"}} <a href="/groups/{{.Approval.GroupPath}}?tab=settings#approvals">{{.Approval.GroupPath}}</a></p>
383 <p>{{t "appr.required"}}: {{if .Approval.MaintainerRequired}}{{t "appr.on"}}{{else}}{{t "appr.off"}}{{end}}</p>
384 <p>{{t "appr.count"}}: {{.Approval.RequiredCount}}</p>
385 <p>{{t "appr.developers"}}: {{if .Approval.DevelopersApprove}}{{t "appr.on"}}{{else}}{{t "appr.off"}}{{end}}</p>
386 </div>
387 {{else}}
388 <form class="panel" method="post" action="{{if .Repo}}/{{.Repo.FullPath}}/-/approvals{{else}}/groups/{{.Group.Path}}/approvals{{end}}">
389 <input type="hidden" name="csrf" value="{{.CSRF}}">
390 <label class="row"><input type="checkbox" name="maintainer_required" value="1"{{if .Approval.MaintainerRequired}} checked{{end}}> {{t "appr.required"}}</label>
391 <label>{{t "appr.count"}} <input name="required_count" type="number" min="1" max="100" value="{{.Approval.RequiredCount}}" required></label>
392 <label class="row"><input type="checkbox" name="developers_approve" value="1"{{if .Approval.DevelopersApprove}} checked{{end}}> {{t "appr.developers"}}</label>
393 <button type="submit">{{t "action.save"}}</button>
394 </form>
395 {{end}}
396 {{end}}
397 {{end}}
398
353 399 {{define "roleselect"}}
354 400 <select name="role">
355 401 <option value="readonly" {{if eq . "readonly"}}selected{{end}}>{{t "role.readonly"}}</option>
@@ -370,6 +416,7 @@
370 416 <a href="?tab=branches"{{if eq .Tab "branches"}} class="on"{{end}}>{{t "set.branches"}}</a>
371 417 <a href="?tab=secrets"{{if eq .Tab "secrets"}} class="on"{{end}}>{{t "set.secrets"}}</a>
372 418 <a href="?tab=webhooks"{{if eq .Tab "webhooks"}} class="on"{{end}}>{{t "set.webhooks"}}</a>
419 <a href="?tab=approvals"{{if eq .Tab "approvals"}} class="on"{{end}}>{{t "appr.tab"}}</a>
373 420 </p>
374 421 {{if eq .Tab "members"}}
375 422 <form class="panel" method="post" action="/{{.Repo.FullPath}}/-/members">
@@ -408,6 +455,8 @@
408 455 <p class="muted">{{t "set.valuesHidden"}}</p>
409 456 {{else if eq .Tab "webhooks"}}
410 457 {{template "webhookform" .}}
458 {{else if eq .Tab "approvals"}}
459 {{template "approvalform" .}}
411 460 {{else}}
412 461 <form class="panel" method="post" action="/{{.Repo.FullPath}}/-/settings">
413 462 <input type="hidden" name="csrf" value="{{.CSRF}}">
@@ -549,6 +598,8 @@
549 598 <p class="muted">{{t "new.roleHint"}}</p>
550 599 <button type="submit">{{t "action.save"}}</button>
551 600 </form>
601 <h2 id="approvals">{{t "appr.tab"}}</h2>
602 {{template "approvalform" .}}
552 603 <form class="panel" method="post" action="/groups/{{.Group.Path}}/logo" enctype="multipart/form-data">
553 604 <input type="hidden" name="csrf" value="{{.CSRF}}">
554 605 <label>{{t "logo.file"}} <input type="file" name="logo" accept="image/png,image/jpeg,image/gif,image/svg+xml,.svg" required></label>
@@ -48,17 +48,41 @@
48{{else}}<p class="muted">{{t "mr.noPipeline"}}</p>{{end}}
48{{else}}<p class="muted">{{t "mr.noPipeline"}}</p>{{end}}
49<h2>{{t "mr.commits"}}</h2>
49<h2>{{t "mr.commits"}}</h2>
50<pre>{{if .Diff}}{{.Diff}}{{else}}{{t "mr.noDiff"}}{{end}}</pre>
50<pre>{{if .Diff}}{{.Diff}}{{else}}{{t "mr.noDiff"}}{{end}}</pre>
51{{if .CanMerge}}
52{{range .MergeBlocks}}<p class="flash bad">{{.}}</p>{{end}}
51{{range .MergeBlocks}}<p class="flash bad">{{.}}</p>{{end}}
52{{if .CanMerge}}
53<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/merge">
53<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/merge">
54 <input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit"{{if .MergeBlocks}} disabled{{end}}>{{t "action.merge"}}</button>
54 <input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit"{{if .MergeBlocks}} disabled{{end}}>{{t "action.merge"}}</button>
55</form>
55</form>
56{{end}}
56{{end}}
57{{if and .User (eq .MR.Status "open")}}
57{{if .CanClose}}
58<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/close">
58<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/close">
59 <input type="hidden" name="csrf" value="{{.CSRF}}"><button class="ghost" type="submit">{{t "action.close"}}</button>
59 <input type="hidden" name="csrf" value="{{.CSRF}}"><button class="ghost" type="submit">{{t "action.close"}}</button>
60</form>
60</form>
61{{end}}
61{{end}}
62{{if .CanReopen}}
63<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/reopen">
64 <input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "action.reopen"}}</button>
65</form>
66{{end}}
67<h2>{{t "rev.title"}}</h2>
68<ul class="clean">
69 {{range .Reviews}}<li><strong>{{.Username}}</strong> <span class="pill">{{.Label}}</span>
70 {{if and $.CanDismiss (or (eq .Status "changes") (eq .Status "rejected"))}}
71 <form method="post" action="/{{$.Repo.FullPath}}/-/merge-requests/{{$.MR.Number}}/reviews/dismiss">
72 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="user_id" value="{{.UserID}}">
73 <button class="ghost" type="submit">{{t "rev.dismiss"}}</button>
74 </form>
75 {{end}}
76 </li>{{else}}<li class="muted">{{t "rev.none"}}</li>{{end}}
77</ul>
78{{if .CanReview}}
79<form class="row" method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/reviews">
80 <input type="hidden" name="csrf" value="{{.CSRF}}">
81 {{if .CanApprove}}<button type="submit" name="status" value="approved">{{t "rev.approved"}}</button>{{end}}
82 <button type="submit" name="status" value="changes">{{t "rev.changes"}}</button>
83 <button class="ghost" type="submit" name="status" value="rejected">{{t "rev.rejected"}}</button>
84</form>
85{{end}}
62<h2>{{t "mr.changes"}}</h2>
86<h2>{{t "mr.changes"}}</h2>
63{{if .CanApply}}
87{{if .CanApply}}
64<div class="applybar" hidden data-apply-bar>
88<div class="applybar" hidden data-apply-bar>
@@ -350,6 +374,28 @@
350{{template "layout-end" .}}
374{{template "layout-end" .}}
351{{end}}
375{{end}}
352
376
377{{define "approvalform"}}
378{{if .Approval}}
379{{if .Approval.Warn}}<p class="flash bad">{{t "appr.warn" .Approval.RequiredCount .Approval.Maintainers}}</p>{{end}}
380{{if .Approval.Locked}}
381<div class="panel">
382 <p>{{t "appr.locked"}} <a href="/groups/{{.Approval.GroupPath}}?tab=settings#approvals">{{.Approval.GroupPath}}</a></p>
383 <p>{{t "appr.required"}}: {{if .Approval.MaintainerRequired}}{{t "appr.on"}}{{else}}{{t "appr.off"}}{{end}}</p>
384 <p>{{t "appr.count"}}: {{.Approval.RequiredCount}}</p>
385 <p>{{t "appr.developers"}}: {{if .Approval.DevelopersApprove}}{{t "appr.on"}}{{else}}{{t "appr.off"}}{{end}}</p>
386</div>
387{{else}}
388<form class="panel" method="post" action="{{if .Repo}}/{{.Repo.FullPath}}/-/approvals{{else}}/groups/{{.Group.Path}}/approvals{{end}}">
389 <input type="hidden" name="csrf" value="{{.CSRF}}">
390 <label class="row"><input type="checkbox" name="maintainer_required" value="1"{{if .Approval.MaintainerRequired}} checked{{end}}> {{t "appr.required"}}</label>
391 <label>{{t "appr.count"}} <input name="required_count" type="number" min="1" max="100" value="{{.Approval.RequiredCount}}" required></label>
392 <label class="row"><input type="checkbox" name="developers_approve" value="1"{{if .Approval.DevelopersApprove}} checked{{end}}> {{t "appr.developers"}}</label>
393 <button type="submit">{{t "action.save"}}</button>
394</form>
395{{end}}
396{{end}}
397{{end}}
398
353{{define "roleselect"}}
399{{define "roleselect"}}
354<select name="role">
400<select name="role">
355 <option value="readonly" {{if eq . "readonly"}}selected{{end}}>{{t "role.readonly"}}</option>
401 <option value="readonly" {{if eq . "readonly"}}selected{{end}}>{{t "role.readonly"}}</option>
@@ -370,6 +416,7 @@
370 <a href="?tab=branches"{{if eq .Tab "branches"}} class="on"{{end}}>{{t "set.branches"}}</a>
416 <a href="?tab=branches"{{if eq .Tab "branches"}} class="on"{{end}}>{{t "set.branches"}}</a>
371 <a href="?tab=secrets"{{if eq .Tab "secrets"}} class="on"{{end}}>{{t "set.secrets"}}</a>
417 <a href="?tab=secrets"{{if eq .Tab "secrets"}} class="on"{{end}}>{{t "set.secrets"}}</a>
372 <a href="?tab=webhooks"{{if eq .Tab "webhooks"}} class="on"{{end}}>{{t "set.webhooks"}}</a>
418 <a href="?tab=webhooks"{{if eq .Tab "webhooks"}} class="on"{{end}}>{{t "set.webhooks"}}</a>
419 <a href="?tab=approvals"{{if eq .Tab "approvals"}} class="on"{{end}}>{{t "appr.tab"}}</a>
373</p>
420</p>
374{{if eq .Tab "members"}}
421{{if eq .Tab "members"}}
375<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/members">
422<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/members">
@@ -408,6 +455,8 @@
408<p class="muted">{{t "set.valuesHidden"}}</p>
455<p class="muted">{{t "set.valuesHidden"}}</p>
409{{else if eq .Tab "webhooks"}}
456{{else if eq .Tab "webhooks"}}
410{{template "webhookform" .}}
457{{template "webhookform" .}}
458{{else if eq .Tab "approvals"}}
459{{template "approvalform" .}}
411{{else}}
460{{else}}
412<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/settings">
461<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/settings">
413 <input type="hidden" name="csrf" value="{{.CSRF}}">
462 <input type="hidden" name="csrf" value="{{.CSRF}}">
@@ -549,6 +598,8 @@
549 <p class="muted">{{t "new.roleHint"}}</p>
598 <p class="muted">{{t "new.roleHint"}}</p>
550 <button type="submit">{{t "action.save"}}</button>
599 <button type="submit">{{t "action.save"}}</button>
551</form>
600</form>
601<h2 id="approvals">{{t "appr.tab"}}</h2>
602{{template "approvalform" .}}
552<form class="panel" method="post" action="/groups/{{.Group.Path}}/logo" enctype="multipart/form-data">
603<form class="panel" method="post" action="/groups/{{.Group.Path}}/logo" enctype="multipart/form-data">
553 <input type="hidden" name="csrf" value="{{.CSRF}}">
604 <input type="hidden" name="csrf" value="{{.CSRF}}">
554 <label>{{t "logo.file"}} <input type="file" name="logo" accept="image/png,image/jpeg,image/gif,image/svg+xml,.svg" required></label>
605 <label>{{t "logo.file"}} <input type="file" name="logo" accept="image/png,image/jpeg,image/gif,image/svg+xml,.svg" required></label>
internal/store/reviews.go added +167 −0
@@ -0,0 +1,167 @@
1 package store
2
3 import (
4 "context"
5 "database/sql"
6 "errors"
7 "time"
8
9 "gitlab.com/Timfa/bluegit/internal/access"
10 )
11
12 // ApprovalPolicy is de instelling voor verplichte goedkeuringen.
13 // Configured onderscheidt "nooit bewaard" van een bewuste keuze,
14 // ook als die keuze de eis uitzet. Een bewaarde groepsregel wint
15 // van de projectregel.
16 type ApprovalPolicy struct {
17 Configured bool
18 MaintainerRequired bool
19 RequiredCount int
20 DevelopersApprove bool
21 }
22
23 // GetApproval leest de regel. Zonder rij is hij niet ingesteld en is het aantal 1.
24 func (s *Store) GetApproval(ctx context.Context, scopeKind string, scopeID int64) (ApprovalPolicy, error) {
25 var configured, required, developers int
26 var count int
27 err := s.db.QueryRowContext(ctx, `SELECT configured, maintainer_required, required_count, developers_approve FROM approval_rules WHERE scope_kind = ? AND scope_id = ?`, scopeKind, scopeID).Scan(&configured, &required, &count, &developers)
28 if errors.Is(err, sql.ErrNoRows) {
29 return ApprovalPolicy{RequiredCount: 1}, nil
30 }
31 if err != nil {
32 return ApprovalPolicy{}, err
33 }
34 if count < 1 {
35 count = 1
36 }
37 return ApprovalPolicy{
38 Configured: configured == 1, MaintainerRequired: required == 1,
39 RequiredCount: count, DevelopersApprove: developers == 1,
40 }, nil
41 }
42
43 // SaveApproval bewaart de regel en markeert hem als ingesteld.
44 func (s *Store) SaveApproval(ctx context.Context, scopeKind string, scopeID int64, p ApprovalPolicy) error {
45 if p.RequiredCount < 1 {
46 p.RequiredCount = 1
47 }
48 if p.RequiredCount > 100 {
49 p.RequiredCount = 100
50 }
51 _, err := s.db.ExecContext(ctx, `INSERT INTO approval_rules (scope_kind, scope_id, configured, maintainer_required, required_count, developers_approve)
52 VALUES (?, ?, 1, ?, ?, ?)
53 ON CONFLICT(scope_kind, scope_id) DO UPDATE SET configured = 1, maintainer_required = excluded.maintainer_required, required_count = excluded.required_count, developers_approve = excluded.developers_approve`,
54 scopeKind, scopeID, boolInt(p.MaintainerRequired), p.RequiredCount, boolInt(p.DevelopersApprove))
55 return err
56 }
57
58 // EffectiveApproval is de regel die voor een repository geldt.
59 // Een ingestelde groepsregel vervangt de projectregel.
60 func (s *Store) EffectiveApproval(ctx context.Context, repo Repo) (ApprovalPolicy, string, error) {
61 if repo.OwnerKind == "group" {
62 p, err := s.GetApproval(ctx, "group", repo.OwnerID)
63 if err != nil {
64 return ApprovalPolicy{}, "", err
65 }
66 if p.Configured {
67 g, err := s.GroupByID(ctx, repo.OwnerID)
68 if err != nil {
69 return ApprovalPolicy{}, "", err
70 }
71 return p, g.Path, nil
72 }
73 }
74 p, err := s.GetApproval(ctx, "repo", repo.ID)
75 return p, "", err
76 }
77
78 // GroupMaintainerCount telt beheerders, inclusief de maker van de groep.
79 func (s *Store) GroupMaintainerCount(ctx context.Context, groupID int64) (int, error) {
80 g, err := s.GroupByID(ctx, groupID)
81 if err != nil {
82 return 0, err
83 }
84 ids := map[int64]bool{g.CreatedBy: true}
85 members, err := s.ListMembers(ctx, "group", groupID)
86 if err != nil {
87 return 0, err
88 }
89 for _, m := range members {
90 if !m.Pending && m.Role == access.RoleMaintainer && m.UserID != 0 {
91 ids[m.UserID] = true
92 }
93 }
94 return len(ids), nil
95 }
96
97 // ProjectMaintainerCount telt wie op dit project beheerder is.
98 // Bij een groep horen de groepsbeheerders en de maker daar ook bij.
99 func (s *Store) ProjectMaintainerCount(ctx context.Context, repo Repo) (int, error) {
100 ids := map[int64]bool{}
101 if repo.OwnerKind == "user" {
102 ids[repo.OwnerID] = true
103 }
104 if repo.OwnerKind == "group" {
105 g, err := s.GroupByID(ctx, repo.OwnerID)
106 if err != nil {
107 return 0, err
108 }
109 ids[g.CreatedBy] = true
110 members, err := s.ListMembers(ctx, "group", g.ID)
111 if err != nil {
112 return 0, err
113 }
114 for _, m := range members {
115 if !m.Pending && m.Role == access.RoleMaintainer && m.UserID != 0 {
116 ids[m.UserID] = true
117 }
118 }
119 }
120 members, err := s.ListMembers(ctx, "repo", repo.ID)
121 if err != nil {
122 return 0, err
123 }
124 for _, m := range members {
125 if !m.Pending && m.Role == access.RoleMaintainer && m.UserID != 0 {
126 ids[m.UserID] = true
127 }
128 }
129 return len(ids), nil
130 }
131
132 // Review is de huidige review van één persoon op een merge request.
133 type Review struct {
134 UserID int64
135 Username string
136 Status string
137 UpdatedAt time.Time
138 }
139
140 // UpsertReview zet de review van deze gebruiker.
141 // status is approved, changes, rejected of dismissed.
142 func (s *Store) UpsertReview(ctx context.Context, repoID, mrID, userID int64, status string) error {
143 _, err := s.db.ExecContext(ctx, `INSERT INTO reviews (repo_id, mr_id, user_id, status, updated_at) VALUES (?, ?, ?, ?, ?)
144 ON CONFLICT(mr_id, user_id) DO UPDATE SET status = excluded.status, updated_at = excluded.updated_at`,
145 repoID, mrID, userID, status, now())
146 return err
147 }
148
149 // ListReviews geeft elke reviewer, oudste bijwerking eerst.
150 func (s *Store) ListReviews(ctx context.Context, mrID int64) ([]Review, error) {
151 rows, err := s.db.QueryContext(ctx, `SELECT r.user_id, u.username, r.status, r.updated_at FROM reviews r JOIN users u ON u.id = r.user_id WHERE r.mr_id = ? ORDER BY r.updated_at, r.user_id`, mrID)
152 if err != nil {
153 return nil, err
154 }
155 defer rows.Close()
156 var out []Review
157 for rows.Next() {
158 var rev Review
159 var updated string
160 if err := rows.Scan(&rev.UserID, &rev.Username, &rev.Status, &updated); err != nil {
161 return nil, err
162 }
163 rev.UpdatedAt = parseTime(updated)
164 out = append(out, rev)
165 }
166 return out, rows.Err()
167 }
@@ -0,0 +1,167 @@
1package store
2
3import (
4 "context"
5 "database/sql"
6 "errors"
7 "time"
8
9 "gitlab.com/Timfa/bluegit/internal/access"
10)
11
12// ApprovalPolicy is de instelling voor verplichte goedkeuringen.
13// Configured onderscheidt "nooit bewaard" van een bewuste keuze,
14// ook als die keuze de eis uitzet. Een bewaarde groepsregel wint
15// van de projectregel.
16type ApprovalPolicy struct {
17 Configured bool
18 MaintainerRequired bool
19 RequiredCount int
20 DevelopersApprove bool
21}
22
23// GetApproval leest de regel. Zonder rij is hij niet ingesteld en is het aantal 1.
24func (s *Store) GetApproval(ctx context.Context, scopeKind string, scopeID int64) (ApprovalPolicy, error) {
25 var configured, required, developers int
26 var count int
27 err := s.db.QueryRowContext(ctx, `SELECT configured, maintainer_required, required_count, developers_approve FROM approval_rules WHERE scope_kind = ? AND scope_id = ?`, scopeKind, scopeID).Scan(&configured, &required, &count, &developers)
28 if errors.Is(err, sql.ErrNoRows) {
29 return ApprovalPolicy{RequiredCount: 1}, nil
30 }
31 if err != nil {
32 return ApprovalPolicy{}, err
33 }
34 if count < 1 {
35 count = 1
36 }
37 return ApprovalPolicy{
38 Configured: configured == 1, MaintainerRequired: required == 1,
39 RequiredCount: count, DevelopersApprove: developers == 1,
40 }, nil
41}
42
43// SaveApproval bewaart de regel en markeert hem als ingesteld.
44func (s *Store) SaveApproval(ctx context.Context, scopeKind string, scopeID int64, p ApprovalPolicy) error {
45 if p.RequiredCount < 1 {
46 p.RequiredCount = 1
47 }
48 if p.RequiredCount > 100 {
49 p.RequiredCount = 100
50 }
51 _, err := s.db.ExecContext(ctx, `INSERT INTO approval_rules (scope_kind, scope_id, configured, maintainer_required, required_count, developers_approve)
52 VALUES (?, ?, 1, ?, ?, ?)
53 ON CONFLICT(scope_kind, scope_id) DO UPDATE SET configured = 1, maintainer_required = excluded.maintainer_required, required_count = excluded.required_count, developers_approve = excluded.developers_approve`,
54 scopeKind, scopeID, boolInt(p.MaintainerRequired), p.RequiredCount, boolInt(p.DevelopersApprove))
55 return err
56}
57
58// EffectiveApproval is de regel die voor een repository geldt.
59// Een ingestelde groepsregel vervangt de projectregel.
60func (s *Store) EffectiveApproval(ctx context.Context, repo Repo) (ApprovalPolicy, string, error) {
61 if repo.OwnerKind == "group" {
62 p, err := s.GetApproval(ctx, "group", repo.OwnerID)
63 if err != nil {
64 return ApprovalPolicy{}, "", err
65 }
66 if p.Configured {
67 g, err := s.GroupByID(ctx, repo.OwnerID)
68 if err != nil {
69 return ApprovalPolicy{}, "", err
70 }
71 return p, g.Path, nil
72 }
73 }
74 p, err := s.GetApproval(ctx, "repo", repo.ID)
75 return p, "", err
76}
77
78// GroupMaintainerCount telt beheerders, inclusief de maker van de groep.
79func (s *Store) GroupMaintainerCount(ctx context.Context, groupID int64) (int, error) {
80 g, err := s.GroupByID(ctx, groupID)
81 if err != nil {
82 return 0, err
83 }
84 ids := map[int64]bool{g.CreatedBy: true}
85 members, err := s.ListMembers(ctx, "group", groupID)
86 if err != nil {
87 return 0, err
88 }
89 for _, m := range members {
90 if !m.Pending && m.Role == access.RoleMaintainer && m.UserID != 0 {
91 ids[m.UserID] = true
92 }
93 }
94 return len(ids), nil
95}
96
97// ProjectMaintainerCount telt wie op dit project beheerder is.
98// Bij een groep horen de groepsbeheerders en de maker daar ook bij.
99func (s *Store) ProjectMaintainerCount(ctx context.Context, repo Repo) (int, error) {
100 ids := map[int64]bool{}
101 if repo.OwnerKind == "user" {
102 ids[repo.OwnerID] = true
103 }
104 if repo.OwnerKind == "group" {
105 g, err := s.GroupByID(ctx, repo.OwnerID)
106 if err != nil {
107 return 0, err
108 }
109 ids[g.CreatedBy] = true
110 members, err := s.ListMembers(ctx, "group", g.ID)
111 if err != nil {
112 return 0, err
113 }
114 for _, m := range members {
115 if !m.Pending && m.Role == access.RoleMaintainer && m.UserID != 0 {
116 ids[m.UserID] = true
117 }
118 }
119 }
120 members, err := s.ListMembers(ctx, "repo", repo.ID)
121 if err != nil {
122 return 0, err
123 }
124 for _, m := range members {
125 if !m.Pending && m.Role == access.RoleMaintainer && m.UserID != 0 {
126 ids[m.UserID] = true
127 }
128 }
129 return len(ids), nil
130}
131
132// Review is de huidige review van één persoon op een merge request.
133type Review struct {
134 UserID int64
135 Username string
136 Status string
137 UpdatedAt time.Time
138}
139
140// UpsertReview zet de review van deze gebruiker.
141// status is approved, changes, rejected of dismissed.
142func (s *Store) UpsertReview(ctx context.Context, repoID, mrID, userID int64, status string) error {
143 _, err := s.db.ExecContext(ctx, `INSERT INTO reviews (repo_id, mr_id, user_id, status, updated_at) VALUES (?, ?, ?, ?, ?)
144 ON CONFLICT(mr_id, user_id) DO UPDATE SET status = excluded.status, updated_at = excluded.updated_at`,
145 repoID, mrID, userID, status, now())
146 return err
147}
148
149// ListReviews geeft elke reviewer, oudste bijwerking eerst.
150func (s *Store) ListReviews(ctx context.Context, mrID int64) ([]Review, error) {
151 rows, err := s.db.QueryContext(ctx, `SELECT r.user_id, u.username, r.status, r.updated_at FROM reviews r JOIN users u ON u.id = r.user_id WHERE r.mr_id = ? ORDER BY r.updated_at, r.user_id`, mrID)
152 if err != nil {
153 return nil, err
154 }
155 defer rows.Close()
156 var out []Review
157 for rows.Next() {
158 var rev Review
159 var updated string
160 if err := rows.Scan(&rev.UserID, &rev.Username, &rev.Status, &updated); err != nil {
161 return nil, err
162 }
163 rev.UpdatedAt = parseTime(updated)
164 out = append(out, rev)
165 }
166 return out, rows.Err()
167}
internal/store/reviews_test.go added +61 −0
@@ -0,0 +1,61 @@
1 package store
2
3 import (
4 "context"
5 "path/filepath"
6 "testing"
7
8 "gitlab.com/Timfa/bluegit/internal/access"
9 )
10
11 func TestGroupApprovalOverridesProject(t *testing.T) {
12 s := openStore(t)
13 ctx := context.Background()
14 tim, err := s.UpsertUser(ctx, 1, "tim", "", false)
15 if err != nil {
16 t.Fatal(err)
17 }
18 g, err := s.CreateGroup(ctx, tim.ID, "Team", "team", "", access.RoleDeveloper)
19 if err != nil {
20 t.Fatal(err)
21 }
22 repo, err := s.CreateRepo(ctx, "group", g.ID, "app", "", "master", "private")
23 if err != nil {
24 t.Fatal(err)
25 }
26 if err := s.SaveApproval(ctx, "repo", repo.ID, ApprovalPolicy{MaintainerRequired: true, RequiredCount: 1, DevelopersApprove: true}); err != nil {
27 t.Fatal(err)
28 }
29 pol, path, err := s.EffectiveApproval(ctx, repo)
30 if err != nil || path != "" || !pol.DevelopersApprove {
31 t.Fatalf("projectregel: %+v %s %v", pol, path, err)
32 }
33 if err := s.SaveApproval(ctx, "group", g.ID, ApprovalPolicy{MaintainerRequired: true, RequiredCount: 2}); err != nil {
34 t.Fatal(err)
35 }
36 pol, path, err = s.EffectiveApproval(ctx, repo)
37 if err != nil || path != "team" || pol.RequiredCount != 2 || pol.DevelopersApprove {
38 t.Fatalf("groepsregel wint: %+v %s %v", pol, path, err)
39 }
40 if err := s.SetMember(ctx, "group", g.ID, "tim", access.RoleDeveloper); err != nil {
41 t.Fatal(err)
42 }
43 n, err := s.GroupMaintainerCount(ctx, g.ID)
44 if err != nil || n != 1 {
45 t.Fatalf("maker telt mee: %d %v", n, err)
46 }
47 pn, err := s.ProjectMaintainerCount(ctx, repo)
48 if err != nil || pn != 1 {
49 t.Fatalf("project telt de maker: %d %v", pn, err)
50 }
51 }
52
53 func openStore(t *testing.T) *Store {
54 t.Helper()
55 s, err := Open(filepath.Join(t.TempDir(), "bluegit.db"), make([]byte, 32))
56 if err != nil {
57 t.Fatal(err)
58 }
59 t.Cleanup(func() { _ = s.Close() })
60 return s
61 }
@@ -0,0 +1,61 @@
1package store
2
3import (
4 "context"
5 "path/filepath"
6 "testing"
7
8 "gitlab.com/Timfa/bluegit/internal/access"
9)
10
11func TestGroupApprovalOverridesProject(t *testing.T) {
12 s := openStore(t)
13 ctx := context.Background()
14 tim, err := s.UpsertUser(ctx, 1, "tim", "", false)
15 if err != nil {
16 t.Fatal(err)
17 }
18 g, err := s.CreateGroup(ctx, tim.ID, "Team", "team", "", access.RoleDeveloper)
19 if err != nil {
20 t.Fatal(err)
21 }
22 repo, err := s.CreateRepo(ctx, "group", g.ID, "app", "", "master", "private")
23 if err != nil {
24 t.Fatal(err)
25 }
26 if err := s.SaveApproval(ctx, "repo", repo.ID, ApprovalPolicy{MaintainerRequired: true, RequiredCount: 1, DevelopersApprove: true}); err != nil {
27 t.Fatal(err)
28 }
29 pol, path, err := s.EffectiveApproval(ctx, repo)
30 if err != nil || path != "" || !pol.DevelopersApprove {
31 t.Fatalf("projectregel: %+v %s %v", pol, path, err)
32 }
33 if err := s.SaveApproval(ctx, "group", g.ID, ApprovalPolicy{MaintainerRequired: true, RequiredCount: 2}); err != nil {
34 t.Fatal(err)
35 }
36 pol, path, err = s.EffectiveApproval(ctx, repo)
37 if err != nil || path != "team" || pol.RequiredCount != 2 || pol.DevelopersApprove {
38 t.Fatalf("groepsregel wint: %+v %s %v", pol, path, err)
39 }
40 if err := s.SetMember(ctx, "group", g.ID, "tim", access.RoleDeveloper); err != nil {
41 t.Fatal(err)
42 }
43 n, err := s.GroupMaintainerCount(ctx, g.ID)
44 if err != nil || n != 1 {
45 t.Fatalf("maker telt mee: %d %v", n, err)
46 }
47 pn, err := s.ProjectMaintainerCount(ctx, repo)
48 if err != nil || pn != 1 {
49 t.Fatalf("project telt de maker: %d %v", pn, err)
50 }
51}
52
53func openStore(t *testing.T) *Store {
54 t.Helper()
55 s, err := Open(filepath.Join(t.TempDir(), "bluegit.db"), make([]byte, 32))
56 if err != nil {
57 t.Fatal(err)
58 }
59 t.Cleanup(func() { _ = s.Close() })
60 return s
61}
internal/store/store.go +18 −0
@@ -345,6 +345,24 @@ CREATE TABLE IF NOT EXISTS commit_pushers (
345 345 created_at TEXT NOT NULL,
346 346 PRIMARY KEY (repo_id, sha)
347 347 );
348 CREATE TABLE IF NOT EXISTS approval_rules (
349 scope_kind TEXT NOT NULL,
350 scope_id INTEGER NOT NULL,
351 configured INTEGER NOT NULL DEFAULT 0,
352 maintainer_required INTEGER NOT NULL DEFAULT 0,
353 required_count INTEGER NOT NULL DEFAULT 1,
354 developers_approve INTEGER NOT NULL DEFAULT 0,
355 PRIMARY KEY (scope_kind, scope_id)
356 );
357 CREATE TABLE IF NOT EXISTS reviews (
358 id INTEGER PRIMARY KEY,
359 repo_id INTEGER NOT NULL,
360 mr_id INTEGER NOT NULL REFERENCES merge_requests(id) ON DELETE CASCADE,
361 user_id INTEGER NOT NULL,
362 status TEXT NOT NULL,
363 updated_at TEXT NOT NULL,
364 UNIQUE(mr_id, user_id)
365 );
348 366 `
349 367
350 368 func now() string { return time.Now().UTC().Format(time.RFC3339) }
@@ -345,6 +345,24 @@ CREATE TABLE IF NOT EXISTS commit_pushers (
345 created_at TEXT NOT NULL,
345 created_at TEXT NOT NULL,
346 PRIMARY KEY (repo_id, sha)
346 PRIMARY KEY (repo_id, sha)
347);
347);
348CREATE TABLE IF NOT EXISTS approval_rules (
349 scope_kind TEXT NOT NULL,
350 scope_id INTEGER NOT NULL,
351 configured INTEGER NOT NULL DEFAULT 0,
352 maintainer_required INTEGER NOT NULL DEFAULT 0,
353 required_count INTEGER NOT NULL DEFAULT 1,
354 developers_approve INTEGER NOT NULL DEFAULT 0,
355 PRIMARY KEY (scope_kind, scope_id)
356);
357CREATE TABLE IF NOT EXISTS reviews (
358 id INTEGER PRIMARY KEY,
359 repo_id INTEGER NOT NULL,
360 mr_id INTEGER NOT NULL REFERENCES merge_requests(id) ON DELETE CASCADE,
361 user_id INTEGER NOT NULL,
362 status TEXT NOT NULL,
363 updated_at TEXT NOT NULL,
364 UNIQUE(mr_id, user_id)
365);
348`
366`
349
367
350func now() string { return time.Now().UTC().Format(time.RFC3339) }
368func now() string { return time.Now().UTC().Format(time.RFC3339) }