BlueGit

timfa bluegit

fix: open een ontbrekend blue-ci-cd.yml in de pipeline-editor

Een branch zonder dat bestand opent een uitgecommentarieerd voorbeeld.
Opslaan maakt het bestand aan. Een developer op een beschermde branch
kan in plaats daarvan een nieuwe branch en een merge request kiezen.

Co-authored-by: tim <tim@timfalken.com>

timfa tim · pushed by timfa

Authored 2026-10-22 · 3 weeks ago

Hash
02cab8995e0dddc2bf22a520db0937a4dce17f78
Parent
009271a1
8 files changed +290 −8
docs/CI.md +1 −1
@@ -84,7 +84,7 @@ Een merge-request-pipeline start bij het openen van de merge request, bij elke p
84 84
85 85 ## Editor
86 86
87 `/-/ci/editor` opent `blue-ci-cd.yml` van een branch. De pagina kleurt YAML en zet fouten en waarschuwingen op het regelnummer. Opslaan maakt één commit op de gekozen branch. Bestaat die branch nog niet, dan wordt hij vanaf de geopende branch gemaakt. Een beschermde branch accepteert alleen een beheerder, dezelfde regel als een gewone push.
87 `/-/ci/editor` opent `blue-ci-cd.yml` van een branch. De pagina kleurt YAML en zet fouten en waarschuwingen op het regelnummer. Ontbreekt het bestand, dan opent de editor een uitgecommentarieerd voorbeeld. Opslaan maakt het bestand aan met één commit op de gekozen branch. Bestaat die branch nog niet, dan wordt hij vanaf de geopende branch gemaakt. Een beschermde branch accepteert alleen een beheerder voor een directe commit, dezelfde regel als een gewone push. Een ontwikkelaar krijgt dan de keuze om op een nieuwe branch te committen en een merge request te openen.
88 88
89 89 ## Mail bij een mislukte pipeline
90 90
@@ -84,7 +84,7 @@ Een merge-request-pipeline start bij het openen van de merge request, bij elke p
84
84
85## Editor
85## Editor
86
86
87`/-/ci/editor` opent `blue-ci-cd.yml` van een branch. De pagina kleurt YAML en zet fouten en waarschuwingen op het regelnummer. Opslaan maakt één commit op de gekozen branch. Bestaat die branch nog niet, dan wordt hij vanaf de geopende branch gemaakt. Een beschermde branch accepteert alleen een beheerder, dezelfde regel als een gewone push.
87`/-/ci/editor` opent `blue-ci-cd.yml` van een branch. De pagina kleurt YAML en zet fouten en waarschuwingen op het regelnummer. Ontbreekt het bestand, dan opent de editor een uitgecommentarieerd voorbeeld. Opslaan maakt het bestand aan met één commit op de gekozen branch. Bestaat die branch nog niet, dan wordt hij vanaf de geopende branch gemaakt. Een beschermde branch accepteert alleen een beheerder voor een directe commit, dezelfde regel als een gewone push. Een ontwikkelaar krijgt dan de keuze om op een nieuwe branch te committen en een merge request te openen.
88
88
89## Mail bij een mislukte pipeline
89## Mail bij een mislukte pipeline
90
90
internal/ci/parse.go +5 −0
@@ -80,6 +80,11 @@ func parseBytes(data []byte, read func(string) ([]byte, error), stack []string)
80 80 if err := yaml.Unmarshal(data, &root); err != nil {
81 81 return Pipeline{}, nil, i18n.E("ci.err.yaml", err.Error())
82 82 }
83 // Een leeg document of alleen commentaar is een pipeline zonder jobs.
84 // Een echte mapping, ook een lege zoals {}, blijft door validate gaan.
85 if root.Kind == 0 || len(root.Content) == 0 {
86 return Pipeline{Variables: map[string]string{}}, nil, nil
87 }
83 88 if root.Kind != yaml.DocumentNode || len(root.Content) != 1 || root.Content[0].Kind != yaml.MappingNode {
84 89 return Pipeline{}, []Issue{{Line: 1, Key: "ci.err.mapping"}}, nil
85 90 }
@@ -80,6 +80,11 @@ func parseBytes(data []byte, read func(string) ([]byte, error), stack []string)
80 if err := yaml.Unmarshal(data, &root); err != nil {
80 if err := yaml.Unmarshal(data, &root); err != nil {
81 return Pipeline{}, nil, i18n.E("ci.err.yaml", err.Error())
81 return Pipeline{}, nil, i18n.E("ci.err.yaml", err.Error())
82 }
82 }
83 // Een leeg document of alleen commentaar is een pipeline zonder jobs.
84 // Een echte mapping, ook een lege zoals {}, blijft door validate gaan.
85 if root.Kind == 0 || len(root.Content) == 0 {
86 return Pipeline{Variables: map[string]string{}}, nil, nil
87 }
83 if root.Kind != yaml.DocumentNode || len(root.Content) != 1 || root.Content[0].Kind != yaml.MappingNode {
88 if root.Kind != yaml.DocumentNode || len(root.Content) != 1 || root.Content[0].Kind != yaml.MappingNode {
84 return Pipeline{}, []Issue{{Line: 1, Key: "ci.err.mapping"}}, nil
89 return Pipeline{}, []Issue{{Line: 1, Key: "ci.err.mapping"}}, nil
85 }
90 }
internal/ci/parse_test.go +19 −0
@@ -35,6 +35,25 @@ jobs:
35 35 - echo release
36 36 `
37 37
38 func TestParseCommentOnly(t *testing.T) {
39 for _, raw := range []string{"", "\n", "# only\n# comments\n"} {
40 p, issues := Lint([]byte(raw), nil)
41 if len(issues) != 0 || len(p.Jobs) != 0 {
42 t.Fatalf("%q issues=%v jobs=%d", raw, issues, len(p.Jobs))
43 }
44 if _, err := Parse([]byte(raw)); err != nil {
45 t.Fatalf("parse %q: %v", raw, err)
46 }
47 }
48 if _, err := Parse([]byte("{}\n")); err == nil {
49 t.Fatal("lege mapping hoort een fout te zijn")
50 }
51 _, issues := Lint([]byte("stages:\n - test\n"), nil)
52 if len(issues) == 0 || issues[0].Key != "ci.err.noJobs" {
53 t.Fatalf("stages zonder jobs: %+v", issues)
54 }
55 }
56
38 57 func TestParseSample(t *testing.T) {
39 58 p, err := Parse([]byte(sample))
40 59 if err != nil {
@@ -35,6 +35,25 @@ jobs:
35 - echo release
35 - echo release
36`
36`
37
37
38func TestParseCommentOnly(t *testing.T) {
39 for _, raw := range []string{"", "\n", "# only\n# comments\n"} {
40 p, issues := Lint([]byte(raw), nil)
41 if len(issues) != 0 || len(p.Jobs) != 0 {
42 t.Fatalf("%q issues=%v jobs=%d", raw, issues, len(p.Jobs))
43 }
44 if _, err := Parse([]byte(raw)); err != nil {
45 t.Fatalf("parse %q: %v", raw, err)
46 }
47 }
48 if _, err := Parse([]byte("{}\n")); err == nil {
49 t.Fatal("lege mapping hoort een fout te zijn")
50 }
51 _, issues := Lint([]byte("stages:\n - test\n"), nil)
52 if len(issues) == 0 || issues[0].Key != "ci.err.noJobs" {
53 t.Fatalf("stages zonder jobs: %+v", issues)
54 }
55}
56
38func TestParseSample(t *testing.T) {
57func TestParseSample(t *testing.T) {
39 p, err := Parse([]byte(sample))
58 p, err := Parse([]byte(sample))
40 if err != nil {
59 if err != nil {
internal/i18n/catalog.go +4 −0
@@ -269,6 +269,10 @@ var en = map[string]string{
269 269 "edit.protected": "This branch is protected.",
270 270 "edit.badBranch": "That branch name cannot be used.",
271 271 "edit.needMessage": "A commit message is required.",
272 "edit.missing": "There is no blue-ci-cd.yml on this branch yet.",
273 "edit.protectedHint": "You cannot commit to this protected branch. Commit to a new branch and open a merge request.",
274 "edit.openMR": "Open a merge request",
275 "edit.configureMsg": "Add blue-ci-cd.yml",
272 276 "mail.fail.subject": "Pipeline #%d in %s failed",
273 277 "mail.fail.intro": "Pipeline #%d in %s on %s failed.",
274 278 "mail.fail.jobs": "Failed jobs",
@@ -269,6 +269,10 @@ var en = map[string]string{
269 "edit.protected": "This branch is protected.",
269 "edit.protected": "This branch is protected.",
270 "edit.badBranch": "That branch name cannot be used.",
270 "edit.badBranch": "That branch name cannot be used.",
271 "edit.needMessage": "A commit message is required.",
271 "edit.needMessage": "A commit message is required.",
272 "edit.missing": "There is no blue-ci-cd.yml on this branch yet.",
273 "edit.protectedHint": "You cannot commit to this protected branch. Commit to a new branch and open a merge request.",
274 "edit.openMR": "Open a merge request",
275 "edit.configureMsg": "Add blue-ci-cd.yml",
272 "mail.fail.subject": "Pipeline #%d in %s failed",
276 "mail.fail.subject": "Pipeline #%d in %s failed",
273 "mail.fail.intro": "Pipeline #%d in %s on %s failed.",
277 "mail.fail.intro": "Pipeline #%d in %s on %s failed.",
274 "mail.fail.jobs": "Failed jobs",
278 "mail.fail.jobs": "Failed jobs",
internal/i18n/catalog_lang.go +12 −0
@@ -275,6 +275,10 @@ var nl = map[string]string{
275 275 "edit.protected": "Deze branch is beschermd.",
276 276 "edit.badBranch": "Die branchnaam kan niet.",
277 277 "edit.needMessage": "Een commitbericht is verplicht.",
278 "edit.missing": "Op deze branch staat nog geen blue-ci-cd.yml.",
279 "edit.protectedHint": "Je kunt niet naar deze beschermde branch committen. Kies een nieuwe branch en open een merge request.",
280 "edit.openMR": "Open een merge request",
281 "edit.configureMsg": "Voeg blue-ci-cd.yml toe",
278 282 "mail.fail.subject": "Pipeline #%d in %s is mislukt",
279 283 "mail.fail.intro": "Pipeline #%d in %s op %s is mislukt.",
280 284 "mail.fail.jobs": "Mislukte jobs",
@@ -877,6 +881,10 @@ var de = map[string]string{
877 881 "edit.protected": "Dieser Branch ist geschützt.",
878 882 "edit.badBranch": "Dieser Branchname geht nicht.",
879 883 "edit.needMessage": "Eine Commit-Nachricht ist nötig.",
884 "edit.missing": "Auf diesem Branch gibt es noch keine blue-ci-cd.yml.",
885 "edit.protectedHint": "Du kannst nicht auf diesen geschützten Branch committen. Wähle einen neuen Branch und öffne einen Merge Request.",
886 "edit.openMR": "Merge Request öffnen",
887 "edit.configureMsg": "blue-ci-cd.yml hinzufügen",
880 888 "mail.fail.subject": "Pipeline #%d in %s ist fehlgeschlagen",
881 889 "mail.fail.intro": "Pipeline #%d in %s auf %s ist fehlgeschlagen.",
882 890 "mail.fail.jobs": "Fehlgeschlagene Jobs",
@@ -1479,6 +1487,10 @@ var fr = map[string]string{
1479 1487 "edit.protected": "Cette branche est protégée.",
1480 1488 "edit.badBranch": "Ce nom de branche est inutilisable.",
1481 1489 "edit.needMessage": "Un message de commit est requis.",
1490 "edit.missing": "Cette branche n'a pas encore de blue-ci-cd.yml.",
1491 "edit.protectedHint": "Tu ne peux pas committer sur cette branche protégée. Choisis une nouvelle branche et ouvre une merge request.",
1492 "edit.openMR": "Ouvrir une merge request",
1493 "edit.configureMsg": "Ajouter blue-ci-cd.yml",
1482 1494 "mail.fail.subject": "Le pipeline #%d dans %s a échoué",
1483 1495 "mail.fail.intro": "Le pipeline #%d dans %s sur %s a échoué.",
1484 1496 "mail.fail.jobs": "Jobs échoués",
@@ -275,6 +275,10 @@ var nl = map[string]string{
275 "edit.protected": "Deze branch is beschermd.",
275 "edit.protected": "Deze branch is beschermd.",
276 "edit.badBranch": "Die branchnaam kan niet.",
276 "edit.badBranch": "Die branchnaam kan niet.",
277 "edit.needMessage": "Een commitbericht is verplicht.",
277 "edit.needMessage": "Een commitbericht is verplicht.",
278 "edit.missing": "Op deze branch staat nog geen blue-ci-cd.yml.",
279 "edit.protectedHint": "Je kunt niet naar deze beschermde branch committen. Kies een nieuwe branch en open een merge request.",
280 "edit.openMR": "Open een merge request",
281 "edit.configureMsg": "Voeg blue-ci-cd.yml toe",
278 "mail.fail.subject": "Pipeline #%d in %s is mislukt",
282 "mail.fail.subject": "Pipeline #%d in %s is mislukt",
279 "mail.fail.intro": "Pipeline #%d in %s op %s is mislukt.",
283 "mail.fail.intro": "Pipeline #%d in %s op %s is mislukt.",
280 "mail.fail.jobs": "Mislukte jobs",
284 "mail.fail.jobs": "Mislukte jobs",
@@ -877,6 +881,10 @@ var de = map[string]string{
877 "edit.protected": "Dieser Branch ist geschützt.",
881 "edit.protected": "Dieser Branch ist geschützt.",
878 "edit.badBranch": "Dieser Branchname geht nicht.",
882 "edit.badBranch": "Dieser Branchname geht nicht.",
879 "edit.needMessage": "Eine Commit-Nachricht ist nötig.",
883 "edit.needMessage": "Eine Commit-Nachricht ist nötig.",
884 "edit.missing": "Auf diesem Branch gibt es noch keine blue-ci-cd.yml.",
885 "edit.protectedHint": "Du kannst nicht auf diesen geschützten Branch committen. Wähle einen neuen Branch und öffne einen Merge Request.",
886 "edit.openMR": "Merge Request öffnen",
887 "edit.configureMsg": "blue-ci-cd.yml hinzufügen",
880 "mail.fail.subject": "Pipeline #%d in %s ist fehlgeschlagen",
888 "mail.fail.subject": "Pipeline #%d in %s ist fehlgeschlagen",
881 "mail.fail.intro": "Pipeline #%d in %s auf %s ist fehlgeschlagen.",
889 "mail.fail.intro": "Pipeline #%d in %s auf %s ist fehlgeschlagen.",
882 "mail.fail.jobs": "Fehlgeschlagene Jobs",
890 "mail.fail.jobs": "Fehlgeschlagene Jobs",
@@ -1479,6 +1487,10 @@ var fr = map[string]string{
1479 "edit.protected": "Cette branche est protégée.",
1487 "edit.protected": "Cette branche est protégée.",
1480 "edit.badBranch": "Ce nom de branche est inutilisable.",
1488 "edit.badBranch": "Ce nom de branche est inutilisable.",
1481 "edit.needMessage": "Un message de commit est requis.",
1489 "edit.needMessage": "Un message de commit est requis.",
1490 "edit.missing": "Cette branche n'a pas encore de blue-ci-cd.yml.",
1491 "edit.protectedHint": "Tu ne peux pas committer sur cette branche protégée. Choisis une nouvelle branche et ouvre une merge request.",
1492 "edit.openMR": "Ouvrir une merge request",
1493 "edit.configureMsg": "Ajouter blue-ci-cd.yml",
1482 "mail.fail.subject": "Le pipeline #%d dans %s a échoué",
1494 "mail.fail.subject": "Le pipeline #%d dans %s a échoué",
1483 "mail.fail.intro": "Le pipeline #%d dans %s sur %s a échoué.",
1495 "mail.fail.intro": "Le pipeline #%d dans %s sur %s a échoué.",
1484 "mail.fail.jobs": "Jobs échoués",
1496 "mail.fail.jobs": "Jobs échoués",
internal/server/editor.go +94 −5
@@ -7,17 +7,34 @@ import (
7 7 "net/url"
8 8 "os"
9 9 "os/exec"
10 "strconv"
10 11 "strings"
11 12
12 13 "gitlab.com/Timfa/bluegit/internal/access"
13 14 "gitlab.com/Timfa/bluegit/internal/ci"
14 15 "gitlab.com/Timfa/bluegit/internal/gitrepo"
15 16 "gitlab.com/Timfa/bluegit/internal/highlight"
17 "gitlab.com/Timfa/bluegit/internal/store"
16 18 )
17 19
18 20 const ciFile = "blue-ci-cd.yml"
19 21 const ciMaxBytes = 200_000
20 22
23 // ciTemplate is het startbestand als blue-ci-cd.yml nog niet bestaat.
24 // Alles staat in commentaar, zodat opslaan geen job en geen mislukte pipeline maakt.
25 const ciTemplate = `# blue-ci-cd.yml
26 # Uncomment the job to run it.
27 #
28 # stages:
29 # - test
30 #
31 # unit:
32 # stage: test
33 # image: alpine:3.20
34 # script:
35 # - echo hello
36 `
37
21 38 // CIEditor is de Pipeline Editor voor blue-ci-cd.yml.
22 39 type CIEditor struct {
23 40 Ref string
@@ -28,6 +45,9 @@ type CIEditor struct {
28 45 Warnings int
29 46 Status string
30 47 Class string
48 Missing bool
49 NeedsMR bool
50 Suggest string
31 51 }
32 52
33 53 // EditorLine is één gekleurde regel, met een markering als de linter daar klaagt.
@@ -60,9 +80,18 @@ func (s *Server) ciEditor(w http.ResponseWriter, r *http.Request) {
60 80 v.Rev = ref
61 81 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
62 82 s.branchList(r, &v, dir)
63 body := s.ciFileAt(r, dir, ref)
83 body, missing := s.ciFileAt(r, dir, ref)
84 if missing {
85 body = ciTemplate
86 }
64 87 model := s.ciEditorModel(r, body, s.includeFrom(r, dir, ref))
65 88 model.Ref = ref
89 model.Missing = missing
90 patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
91 model.NeedsMR = access.BranchProtected(patterns, ref) && !role.CanPushBranch(true)
92 if model.NeedsMR {
93 model.Suggest = s.suggestCIBranch(r, dir, patterns)
94 }
66 95 v.Editor = model
67 96 s.render(w, "editor", v)
68 97 }
@@ -122,7 +151,12 @@ func (s *Server) saveCIEditor(w http.ResponseWriter, r *http.Request) {
122 151 s.redirect(w, r, back, "", s.tr(r, "edit.fail"))
123 152 return
124 153 }
154 openMR := r.FormValue("open_mr") == "1"
125 155 patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
156 if openMR && (branch == base || access.BranchProtected(patterns, branch)) {
157 s.redirect(w, r, back, "", s.tr(r, "edit.badBranch"))
158 return
159 }
126 160 if access.BranchProtected(patterns, branch) && !role.CanPushBranch(true) {
127 161 s.redirect(w, r, back, "", s.tr(r, "edit.protected"))
128 162 return
@@ -152,9 +186,44 @@ func (s *Server) saveCIEditor(w http.ResponseWriter, r *http.Request) {
152 186 s.redirect(w, r, back, "", s.tr(r, "edit.fail"))
153 187 return
154 188 }
189 if openMR {
190 number, mrErr := s.openCIMergeRequest(r, repo, u, dir, branch, base, message)
191 if mrErr != nil {
192 if s.Log != nil {
193 s.Log.Error("ci-editor-mr", "err", mrErr)
194 }
195 s.redirect(w, r, back, "", s.tr(r, "edit.fail"))
196 return
197 }
198 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(number, 10), s.tr(r, "flash.mrOpened"), "")
199 return
200 }
155 201 s.redirect(w, r, back, s.tr(r, "edit.saved"), "")
156 202 }
157 203
204 // openCIMergeRequest opent een merge request van branch naar target.
205 // Een open verzoek met dezelfde bronbranch wordt hergebruikt.
206 func (s *Server) openCIMergeRequest(r *http.Request, repo store.Repo, author store.User, dir, branch, target, title string) (int64, error) {
207 existing, err := s.Store.OpenMergeRequestsBySource(r.Context(), repo.ID, branch)
208 if err != nil {
209 return 0, err
210 }
211 if len(existing) > 0 {
212 return existing[0].Number, nil
213 }
214 mr, err := s.Store.CreateMergeRequest(r.Context(), repo.ID, author.ID, title, "", branch, target)
215 if err != nil {
216 return 0, err
217 }
218 num := strconv.FormatInt(mr.Number, 10)
219 if sha := gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "refs/heads/"+branch); sha != "" {
220 s.startOneMergePipeline(r.Context(), repo, sha, author.Username, "", mr)
221 }
222 s.Dispatch(repo.ID, pushEvent(repo, "merge_request", target, "", author.Username, s.tr(r, "hook.mr", num, mr.Title), repoURL(repo)+"/-/merge-requests/"+num))
223 s.recordContribution(author.ID, repo.ID, "merge_request", mrRef(mr.ID), mr.CreatedAt)
224 return mr.Number, nil
225 }
226
158 227 func (s *Server) ciEditorModel(r *http.Request, body string, read func(string) ([]byte, error)) *CIEditor {
159 228 _, issues := ci.Lint([]byte(body), read)
160 229 bad := map[int]bool{}
@@ -209,12 +278,32 @@ func (s *Server) ciEditorModel(r *http.Request, body string, read func(string) (
209 278 }
210 279 }
211 280
212 func (s *Server) ciFileAt(r *http.Request, dir, ref string) string {
281 func (s *Server) ciFileAt(r *http.Request, dir, ref string) (string, bool) {
213 282 out, err := exec.CommandContext(r.Context(), s.Git, "-C", dir, "show", ref+":"+ciFile).Output()
214 if err != nil || len(out) > ciMaxBytes {
215 return ""
283 if err != nil {
284 return "", true
285 }
286 if len(out) > ciMaxBytes {
287 return "", false
288 }
289 return string(out), false
290 }
291
292 func (s *Server) suggestCIBranch(r *http.Request, dir string, patterns []string) string {
293 const base = "add-blue-ci-cd"
294 for n := 1; n < 100; n++ {
295 name := base
296 if n > 1 {
297 name = base + "-" + strconv.Itoa(n)
298 }
299 if access.BranchProtected(patterns, name) {
300 continue
301 }
302 if gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "--quiet", "refs/heads/"+name) == "" {
303 return name
304 }
216 305 }
217 return string(out)
306 return base
218 307 }
219 308
220 309 func (s *Server) includeFrom(r *http.Request, dir, ref string) func(string) ([]byte, error) {
@@ -7,17 +7,34 @@ import (
7 "net/url"
7 "net/url"
8 "os"
8 "os"
9 "os/exec"
9 "os/exec"
10 "strconv"
10 "strings"
11 "strings"
11
12
12 "gitlab.com/Timfa/bluegit/internal/access"
13 "gitlab.com/Timfa/bluegit/internal/access"
13 "gitlab.com/Timfa/bluegit/internal/ci"
14 "gitlab.com/Timfa/bluegit/internal/ci"
14 "gitlab.com/Timfa/bluegit/internal/gitrepo"
15 "gitlab.com/Timfa/bluegit/internal/gitrepo"
15 "gitlab.com/Timfa/bluegit/internal/highlight"
16 "gitlab.com/Timfa/bluegit/internal/highlight"
17 "gitlab.com/Timfa/bluegit/internal/store"
16)
18)
17
19
18const ciFile = "blue-ci-cd.yml"
20const ciFile = "blue-ci-cd.yml"
19const ciMaxBytes = 200_000
21const ciMaxBytes = 200_000
20
22
23// ciTemplate is het startbestand als blue-ci-cd.yml nog niet bestaat.
24// Alles staat in commentaar, zodat opslaan geen job en geen mislukte pipeline maakt.
25const ciTemplate = `# blue-ci-cd.yml
26# Uncomment the job to run it.
27#
28# stages:
29# - test
30#
31# unit:
32# stage: test
33# image: alpine:3.20
34# script:
35# - echo hello
36`
37
21// CIEditor is de Pipeline Editor voor blue-ci-cd.yml.
38// CIEditor is de Pipeline Editor voor blue-ci-cd.yml.
22type CIEditor struct {
39type CIEditor struct {
23 Ref string
40 Ref string
@@ -28,6 +45,9 @@ type CIEditor struct {
28 Warnings int
45 Warnings int
29 Status string
46 Status string
30 Class string
47 Class string
48 Missing bool
49 NeedsMR bool
50 Suggest string
31}
51}
32
52
33// EditorLine is één gekleurde regel, met een markering als de linter daar klaagt.
53// EditorLine is één gekleurde regel, met een markering als de linter daar klaagt.
@@ -60,9 +80,18 @@ func (s *Server) ciEditor(w http.ResponseWriter, r *http.Request) {
60 v.Rev = ref
80 v.Rev = ref
61 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
81 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
62 s.branchList(r, &v, dir)
82 s.branchList(r, &v, dir)
63 body := s.ciFileAt(r, dir, ref)
83 body, missing := s.ciFileAt(r, dir, ref)
84 if missing {
85 body = ciTemplate
86 }
64 model := s.ciEditorModel(r, body, s.includeFrom(r, dir, ref))
87 model := s.ciEditorModel(r, body, s.includeFrom(r, dir, ref))
65 model.Ref = ref
88 model.Ref = ref
89 model.Missing = missing
90 patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
91 model.NeedsMR = access.BranchProtected(patterns, ref) && !role.CanPushBranch(true)
92 if model.NeedsMR {
93 model.Suggest = s.suggestCIBranch(r, dir, patterns)
94 }
66 v.Editor = model
95 v.Editor = model
67 s.render(w, "editor", v)
96 s.render(w, "editor", v)
68}
97}
@@ -122,7 +151,12 @@ func (s *Server) saveCIEditor(w http.ResponseWriter, r *http.Request) {
122 s.redirect(w, r, back, "", s.tr(r, "edit.fail"))
151 s.redirect(w, r, back, "", s.tr(r, "edit.fail"))
123 return
152 return
124 }
153 }
154 openMR := r.FormValue("open_mr") == "1"
125 patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
155 patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
156 if openMR && (branch == base || access.BranchProtected(patterns, branch)) {
157 s.redirect(w, r, back, "", s.tr(r, "edit.badBranch"))
158 return
159 }
126 if access.BranchProtected(patterns, branch) && !role.CanPushBranch(true) {
160 if access.BranchProtected(patterns, branch) && !role.CanPushBranch(true) {
127 s.redirect(w, r, back, "", s.tr(r, "edit.protected"))
161 s.redirect(w, r, back, "", s.tr(r, "edit.protected"))
128 return
162 return
@@ -152,9 +186,44 @@ func (s *Server) saveCIEditor(w http.ResponseWriter, r *http.Request) {
152 s.redirect(w, r, back, "", s.tr(r, "edit.fail"))
186 s.redirect(w, r, back, "", s.tr(r, "edit.fail"))
153 return
187 return
154 }
188 }
189 if openMR {
190 number, mrErr := s.openCIMergeRequest(r, repo, u, dir, branch, base, message)
191 if mrErr != nil {
192 if s.Log != nil {
193 s.Log.Error("ci-editor-mr", "err", mrErr)
194 }
195 s.redirect(w, r, back, "", s.tr(r, "edit.fail"))
196 return
197 }
198 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(number, 10), s.tr(r, "flash.mrOpened"), "")
199 return
200 }
155 s.redirect(w, r, back, s.tr(r, "edit.saved"), "")
201 s.redirect(w, r, back, s.tr(r, "edit.saved"), "")
156}
202}
157
203
204// openCIMergeRequest opent een merge request van branch naar target.
205// Een open verzoek met dezelfde bronbranch wordt hergebruikt.
206func (s *Server) openCIMergeRequest(r *http.Request, repo store.Repo, author store.User, dir, branch, target, title string) (int64, error) {
207 existing, err := s.Store.OpenMergeRequestsBySource(r.Context(), repo.ID, branch)
208 if err != nil {
209 return 0, err
210 }
211 if len(existing) > 0 {
212 return existing[0].Number, nil
213 }
214 mr, err := s.Store.CreateMergeRequest(r.Context(), repo.ID, author.ID, title, "", branch, target)
215 if err != nil {
216 return 0, err
217 }
218 num := strconv.FormatInt(mr.Number, 10)
219 if sha := gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "refs/heads/"+branch); sha != "" {
220 s.startOneMergePipeline(r.Context(), repo, sha, author.Username, "", mr)
221 }
222 s.Dispatch(repo.ID, pushEvent(repo, "merge_request", target, "", author.Username, s.tr(r, "hook.mr", num, mr.Title), repoURL(repo)+"/-/merge-requests/"+num))
223 s.recordContribution(author.ID, repo.ID, "merge_request", mrRef(mr.ID), mr.CreatedAt)
224 return mr.Number, nil
225}
226
158func (s *Server) ciEditorModel(r *http.Request, body string, read func(string) ([]byte, error)) *CIEditor {
227func (s *Server) ciEditorModel(r *http.Request, body string, read func(string) ([]byte, error)) *CIEditor {
159 _, issues := ci.Lint([]byte(body), read)
228 _, issues := ci.Lint([]byte(body), read)
160 bad := map[int]bool{}
229 bad := map[int]bool{}
@@ -209,12 +278,32 @@ func (s *Server) ciEditorModel(r *http.Request, body string, read func(string) (
209 }
278 }
210}
279}
211
280
212func (s *Server) ciFileAt(r *http.Request, dir, ref string) string {
281func (s *Server) ciFileAt(r *http.Request, dir, ref string) (string, bool) {
213 out, err := exec.CommandContext(r.Context(), s.Git, "-C", dir, "show", ref+":"+ciFile).Output()
282 out, err := exec.CommandContext(r.Context(), s.Git, "-C", dir, "show", ref+":"+ciFile).Output()
214 if err != nil || len(out) > ciMaxBytes {
283 if err != nil {
215 return ""
284 return "", true
285 }
286 if len(out) > ciMaxBytes {
287 return "", false
288 }
289 return string(out), false
290}
291
292func (s *Server) suggestCIBranch(r *http.Request, dir string, patterns []string) string {
293 const base = "add-blue-ci-cd"
294 for n := 1; n < 100; n++ {
295 name := base
296 if n > 1 {
297 name = base + "-" + strconv.Itoa(n)
298 }
299 if access.BranchProtected(patterns, name) {
300 continue
301 }
302 if gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "--quiet", "refs/heads/"+name) == "" {
303 return name
304 }
216 }
305 }
217 return string(out)
306 return base
218}
307}
219
308
220func (s *Server) includeFrom(r *http.Request, dir, ref string) func(string) ([]byte, error) {
309func (s *Server) includeFrom(r *http.Request, dir, ref string) func(string) ([]byte, error) {
internal/server/editor_test.go +150 −0
@@ -163,3 +163,153 @@ func TestPipelineEditorAndProtectedBranch(t *testing.T) {
163 163 t.Fatalf("master veranderde:\n%s", got)
164 164 }
165 165 }
166
167 func TestPipelineEditorMissingFile(t *testing.T) {
168 if _, err := exec.LookPath("git"); err != nil {
169 t.Skip("git ontbreekt")
170 }
171 storage := t.TempDir()
172 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
173 if err != nil {
174 t.Fatal(err)
175 }
176 t.Cleanup(func() { _ = st.Close() })
177 cfg := config.Config{
178 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
179 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
180 Git: config.Git{Binary: "git", DefaultBranch: "master"},
181 }
182 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
183 ts := httptest.NewServer(srv.Handler())
184 t.Cleanup(ts.Close)
185 jar, _ := cookiejar.New(nil)
186 tim := &http.Client{Jar: jar}
187 res, err := tim.Get(ts.URL + "/login")
188 if err != nil {
189 t.Fatal(err)
190 }
191 page := read(t, res)
192 res, err = tim.PostForm(ts.URL+"/new/repo", url.Values{
193 "csrf": {csrfOf(t, page)}, "name": {"leeg"}, "visibility": {"public"},
194 })
195 if err != nil {
196 t.Fatal(err)
197 }
198 page = read(t, res)
199 res, err = tim.PostForm(ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"laptop"}})
200 if err != nil {
201 t.Fatal(err)
202 }
203 token := between(read(t, res), `<p class="code">`, "</p>")
204 remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/leeg.git"
205 work := t.TempDir()
206 git(t, work, "init", "-b", "master")
207 git(t, work, "config", "user.email", "tim@users.git.timfalken.com")
208 git(t, work, "config", "user.name", "tim")
209 writeFile(t, filepath.Join(work, "README.md"), "leeg\n")
210 git(t, work, "add", "README.md")
211 git(t, work, "commit", "-m", "leesmij")
212 git(t, work, "remote", "add", "origin", remote)
213 git(t, work, "push", "-u", "origin", "master")
214
215 res, err = tim.Get(ts.URL + "/tim/leeg/-/ci/editor")
216 if err != nil {
217 t.Fatal(err)
218 }
219 editor := read(t, res)
220 for _, want := range []string{"echo hello", "No issues found", "There is no blue-ci-cd.yml on this branch yet.", `value="Add blue-ci-cd.yml"`, `name="branch" value="master"`} {
221 if !strings.Contains(editor, want) {
222 t.Errorf("editor mist %q", want)
223 }
224 }
225 if strings.Contains(editor, "must be a mapping") || strings.Contains(editor, `name="open_mr"`) {
226 t.Fatalf("beheerder ziet een fout of een merge-request:\n%s", editor)
227 }
228
229 ctx := res.Request.Context()
230 repo, err := st.RepoByPath(ctx, "tim", "leeg")
231 if err != nil {
232 t.Fatal(err)
233 }
234 ada, err := st.UpsertUser(ctx, 3, "ada", "", false)
235 if err != nil {
236 t.Fatal(err)
237 }
238 if err := st.SetMember(ctx, "repo", repo.ID, "ada", "developer"); err != nil {
239 t.Fatal(err)
240 }
241 adaC := clientAs(t, ts.URL, st, ada.ID)
242 res, err = adaC.Get(ts.URL + "/tim/leeg/-/ci/editor?ref=master")
243 if err != nil {
244 t.Fatal(err)
245 }
246 adaPage := read(t, res)
247 for _, want := range []string{`name="open_mr" value="1" checked`, `name="branch" value="add-blue-ci-cd"`, "You cannot commit to this protected branch."} {
248 if !strings.Contains(adaPage, want) {
249 t.Errorf("ada mist %q\n%s", want, adaPage)
250 }
251 }
252
253 dir := gitrepo.Dir(storage, "tim", "leeg")
254 res, err = adaC.PostForm(ts.URL+"/tim/leeg/-/ci/editor", url.Values{
255 "csrf": {csrfOf(t, adaPage)}, "base": {"master"}, "branch": {"master"}, "message": {"ada op master"}, "body": {ciTemplate},
256 })
257 if err != nil {
258 t.Fatal(err)
259 }
260 denied := read(t, res)
261 if !strings.Contains(denied, "This branch is protected.") {
262 t.Fatalf("beschermd:\n%s", denied)
263 }
264 if _, err := gitOut(dir, "cat-file", "-e", "master:blue-ci-cd.yml"); err == nil {
265 t.Fatal("master kreeg toch een ci-bestand")
266 }
267
268 res, err = adaC.PostForm(ts.URL+"/tim/leeg/-/ci/editor", url.Values{
269 "csrf": {csrfOf(t, adaPage)}, "base": {"master"}, "branch": {"master"}, "open_mr": {"1"}, "message": {"ada op master"}, "body": {ciTemplate},
270 })
271 if err != nil {
272 t.Fatal(err)
273 }
274 bad := read(t, res)
275 if !strings.Contains(bad, "That branch name cannot be used.") {
276 t.Fatalf("zelfde branch:\n%s", bad)
277 }
278
279 job := "stages:\n - test\nunit:\n stage: test\n image: alpine:3.20\n script:\n - echo from-ada\n"
280 res, err = adaC.PostForm(ts.URL+"/tim/leeg/-/ci/editor", url.Values{
281 "csrf": {csrfOf(t, adaPage)}, "base": {"master"}, "branch": {"add-blue-ci-cd"}, "open_mr": {"1"}, "message": {"ada voegt ci toe"}, "body": {job},
282 })
283 if err != nil {
284 t.Fatal(err)
285 }
286 opened := read(t, res)
287 if !strings.Contains(opened, "Merge request opened") || !strings.Contains(opened, "ada voegt ci toe") {
288 t.Fatalf("merge request:\n%s", opened)
289 }
290 if got := mustGit(t, dir, "show", "add-blue-ci-cd:blue-ci-cd.yml"); !strings.Contains(got, "echo from-ada") {
291 t.Fatalf("nieuwe branch: %s", got)
292 }
293 if _, err := gitOut(dir, "cat-file", "-e", "master:blue-ci-cd.yml"); err == nil {
294 t.Fatal("master kreeg het bestand via de merge request")
295 }
296
297 res, err = tim.Get(ts.URL + "/tim/leeg/-/ci/editor?ref=master")
298 if err != nil {
299 t.Fatal(err)
300 }
301 again := read(t, res)
302 res, err = tim.PostForm(ts.URL+"/tim/leeg/-/ci/editor", url.Values{
303 "csrf": {csrfOf(t, again)}, "base": {"master"}, "branch": {"master"}, "message": {"Add blue-ci-cd.yml"}, "body": {ciTemplate},
304 })
305 if err != nil {
306 t.Fatal(err)
307 }
308 saved := read(t, res)
309 if !strings.Contains(saved, "Committed.") {
310 t.Fatalf("opslaan:\n%s", saved)
311 }
312 if got := mustGit(t, dir, "show", "master:blue-ci-cd.yml"); !strings.Contains(got, "echo hello") {
313 t.Fatalf("master: %s", got)
314 }
315 }
@@ -163,3 +163,153 @@ func TestPipelineEditorAndProtectedBranch(t *testing.T) {
163 t.Fatalf("master veranderde:\n%s", got)
163 t.Fatalf("master veranderde:\n%s", got)
164 }
164 }
165}
165}
166
167func TestPipelineEditorMissingFile(t *testing.T) {
168 if _, err := exec.LookPath("git"); err != nil {
169 t.Skip("git ontbreekt")
170 }
171 storage := t.TempDir()
172 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
173 if err != nil {
174 t.Fatal(err)
175 }
176 t.Cleanup(func() { _ = st.Close() })
177 cfg := config.Config{
178 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
179 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
180 Git: config.Git{Binary: "git", DefaultBranch: "master"},
181 }
182 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
183 ts := httptest.NewServer(srv.Handler())
184 t.Cleanup(ts.Close)
185 jar, _ := cookiejar.New(nil)
186 tim := &http.Client{Jar: jar}
187 res, err := tim.Get(ts.URL + "/login")
188 if err != nil {
189 t.Fatal(err)
190 }
191 page := read(t, res)
192 res, err = tim.PostForm(ts.URL+"/new/repo", url.Values{
193 "csrf": {csrfOf(t, page)}, "name": {"leeg"}, "visibility": {"public"},
194 })
195 if err != nil {
196 t.Fatal(err)
197 }
198 page = read(t, res)
199 res, err = tim.PostForm(ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"laptop"}})
200 if err != nil {
201 t.Fatal(err)
202 }
203 token := between(read(t, res), `<p class="code">`, "</p>")
204 remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/leeg.git"
205 work := t.TempDir()
206 git(t, work, "init", "-b", "master")
207 git(t, work, "config", "user.email", "tim@users.git.timfalken.com")
208 git(t, work, "config", "user.name", "tim")
209 writeFile(t, filepath.Join(work, "README.md"), "leeg\n")
210 git(t, work, "add", "README.md")
211 git(t, work, "commit", "-m", "leesmij")
212 git(t, work, "remote", "add", "origin", remote)
213 git(t, work, "push", "-u", "origin", "master")
214
215 res, err = tim.Get(ts.URL + "/tim/leeg/-/ci/editor")
216 if err != nil {
217 t.Fatal(err)
218 }
219 editor := read(t, res)
220 for _, want := range []string{"echo hello", "No issues found", "There is no blue-ci-cd.yml on this branch yet.", `value="Add blue-ci-cd.yml"`, `name="branch" value="master"`} {
221 if !strings.Contains(editor, want) {
222 t.Errorf("editor mist %q", want)
223 }
224 }
225 if strings.Contains(editor, "must be a mapping") || strings.Contains(editor, `name="open_mr"`) {
226 t.Fatalf("beheerder ziet een fout of een merge-request:\n%s", editor)
227 }
228
229 ctx := res.Request.Context()
230 repo, err := st.RepoByPath(ctx, "tim", "leeg")
231 if err != nil {
232 t.Fatal(err)
233 }
234 ada, err := st.UpsertUser(ctx, 3, "ada", "", false)
235 if err != nil {
236 t.Fatal(err)
237 }
238 if err := st.SetMember(ctx, "repo", repo.ID, "ada", "developer"); err != nil {
239 t.Fatal(err)
240 }
241 adaC := clientAs(t, ts.URL, st, ada.ID)
242 res, err = adaC.Get(ts.URL + "/tim/leeg/-/ci/editor?ref=master")
243 if err != nil {
244 t.Fatal(err)
245 }
246 adaPage := read(t, res)
247 for _, want := range []string{`name="open_mr" value="1" checked`, `name="branch" value="add-blue-ci-cd"`, "You cannot commit to this protected branch."} {
248 if !strings.Contains(adaPage, want) {
249 t.Errorf("ada mist %q\n%s", want, adaPage)
250 }
251 }
252
253 dir := gitrepo.Dir(storage, "tim", "leeg")
254 res, err = adaC.PostForm(ts.URL+"/tim/leeg/-/ci/editor", url.Values{
255 "csrf": {csrfOf(t, adaPage)}, "base": {"master"}, "branch": {"master"}, "message": {"ada op master"}, "body": {ciTemplate},
256 })
257 if err != nil {
258 t.Fatal(err)
259 }
260 denied := read(t, res)
261 if !strings.Contains(denied, "This branch is protected.") {
262 t.Fatalf("beschermd:\n%s", denied)
263 }
264 if _, err := gitOut(dir, "cat-file", "-e", "master:blue-ci-cd.yml"); err == nil {
265 t.Fatal("master kreeg toch een ci-bestand")
266 }
267
268 res, err = adaC.PostForm(ts.URL+"/tim/leeg/-/ci/editor", url.Values{
269 "csrf": {csrfOf(t, adaPage)}, "base": {"master"}, "branch": {"master"}, "open_mr": {"1"}, "message": {"ada op master"}, "body": {ciTemplate},
270 })
271 if err != nil {
272 t.Fatal(err)
273 }
274 bad := read(t, res)
275 if !strings.Contains(bad, "That branch name cannot be used.") {
276 t.Fatalf("zelfde branch:\n%s", bad)
277 }
278
279 job := "stages:\n - test\nunit:\n stage: test\n image: alpine:3.20\n script:\n - echo from-ada\n"
280 res, err = adaC.PostForm(ts.URL+"/tim/leeg/-/ci/editor", url.Values{
281 "csrf": {csrfOf(t, adaPage)}, "base": {"master"}, "branch": {"add-blue-ci-cd"}, "open_mr": {"1"}, "message": {"ada voegt ci toe"}, "body": {job},
282 })
283 if err != nil {
284 t.Fatal(err)
285 }
286 opened := read(t, res)
287 if !strings.Contains(opened, "Merge request opened") || !strings.Contains(opened, "ada voegt ci toe") {
288 t.Fatalf("merge request:\n%s", opened)
289 }
290 if got := mustGit(t, dir, "show", "add-blue-ci-cd:blue-ci-cd.yml"); !strings.Contains(got, "echo from-ada") {
291 t.Fatalf("nieuwe branch: %s", got)
292 }
293 if _, err := gitOut(dir, "cat-file", "-e", "master:blue-ci-cd.yml"); err == nil {
294 t.Fatal("master kreeg het bestand via de merge request")
295 }
296
297 res, err = tim.Get(ts.URL + "/tim/leeg/-/ci/editor?ref=master")
298 if err != nil {
299 t.Fatal(err)
300 }
301 again := read(t, res)
302 res, err = tim.PostForm(ts.URL+"/tim/leeg/-/ci/editor", url.Values{
303 "csrf": {csrfOf(t, again)}, "base": {"master"}, "branch": {"master"}, "message": {"Add blue-ci-cd.yml"}, "body": {ciTemplate},
304 })
305 if err != nil {
306 t.Fatal(err)
307 }
308 saved := read(t, res)
309 if !strings.Contains(saved, "Committed.") {
310 t.Fatalf("opslaan:\n%s", saved)
311 }
312 if got := mustGit(t, dir, "show", "master:blue-ci-cd.yml"); !strings.Contains(got, "echo hello") {
313 t.Fatalf("master: %s", got)
314 }
315}
internal/server/templates/collab.html +5 −2
@@ -329,6 +329,7 @@
329 329 <h2>{{t "edit.title"}}</h2>
330 330 <p data-lint-status class="status {{.Editor.Class}}">{{.Editor.Status}}</p>
331 331 </div>
332 {{if .Editor.Missing}}<p class="muted">{{t "edit.missing"}}</p>{{end}}
332 333 <div class="ciedit">
333 334 <div class="ci-gutter" data-gutter>{{range .Editor.Rows}}<span{{if .Bad}} class="bad"{{end}}>{{.N}}</span>{{end}}</div>
334 335 <div class="ci-stage">
@@ -341,10 +342,12 @@
341 342 </ul>
342 343 </section>
343 344 {{if .CanWrite}}
344 <label>{{t "edit.message"}} <input name="message" required></label>
345 <label>{{t "edit.message"}} <input name="message" required{{if .Editor.Missing}} value="{{t "edit.configureMsg"}}"{{end}}></label>
346 {{if .Editor.NeedsMR}}<p class="muted">{{t "edit.protectedHint"}}</p>{{end}}
345 347 <label>{{t "edit.branch"}}
346 <input name="branch" value="{{.Editor.Ref}}" list="ci-branches" required>
348 <input name="branch" value="{{if .Editor.NeedsMR}}{{.Editor.Suggest}}{{else}}{{.Editor.Ref}}{{end}}" list="ci-branches" required>
347 349 </label>
350 {{if .Editor.NeedsMR}}<label class="row"><input type="checkbox" name="open_mr" value="1" checked> {{t "edit.openMR"}}</label>{{end}}
348 351 <datalist id="ci-branches">{{range .Branches}}<option value="{{.Name}}"></option>{{end}}</datalist>
349 352 <button type="submit">{{t "edit.save"}}</button>
350 353 {{end}}
@@ -329,6 +329,7 @@
329 <h2>{{t "edit.title"}}</h2>
329 <h2>{{t "edit.title"}}</h2>
330 <p data-lint-status class="status {{.Editor.Class}}">{{.Editor.Status}}</p>
330 <p data-lint-status class="status {{.Editor.Class}}">{{.Editor.Status}}</p>
331 </div>
331 </div>
332 {{if .Editor.Missing}}<p class="muted">{{t "edit.missing"}}</p>{{end}}
332 <div class="ciedit">
333 <div class="ciedit">
333 <div class="ci-gutter" data-gutter>{{range .Editor.Rows}}<span{{if .Bad}} class="bad"{{end}}>{{.N}}</span>{{end}}</div>
334 <div class="ci-gutter" data-gutter>{{range .Editor.Rows}}<span{{if .Bad}} class="bad"{{end}}>{{.N}}</span>{{end}}</div>
334 <div class="ci-stage">
335 <div class="ci-stage">
@@ -341,10 +342,12 @@
341 </ul>
342 </ul>
342 </section>
343 </section>
343 {{if .CanWrite}}
344 {{if .CanWrite}}
344 <label>{{t "edit.message"}} <input name="message" required></label>
345 <label>{{t "edit.message"}} <input name="message" required{{if .Editor.Missing}} value="{{t "edit.configureMsg"}}"{{end}}></label>
346 {{if .Editor.NeedsMR}}<p class="muted">{{t "edit.protectedHint"}}</p>{{end}}
345 <label>{{t "edit.branch"}}
347 <label>{{t "edit.branch"}}
346 <input name="branch" value="{{.Editor.Ref}}" list="ci-branches" required>
348 <input name="branch" value="{{if .Editor.NeedsMR}}{{.Editor.Suggest}}{{else}}{{.Editor.Ref}}{{end}}" list="ci-branches" required>
347 </label>
349 </label>
350 {{if .Editor.NeedsMR}}<label class="row"><input type="checkbox" name="open_mr" value="1" checked> {{t "edit.openMR"}}</label>{{end}}
348 <datalist id="ci-branches">{{range .Branches}}<option value="{{.Name}}"></option>{{end}}</datalist>
351 <datalist id="ci-branches">{{range .Branches}}<option value="{{.Name}}"></option>{{end}}</datalist>
349 <button type="submit">{{t "edit.save"}}</button>
352 <button type="submit">{{t "edit.save"}}</button>
350 {{end}}
353 {{end}}