BlueGit

timfa bluegit

Merge branch 'cursor/mr-layout-674d' into 'stage'

timfa

Authored 2026-10-23 · 3 weeks ago

Hash
31d986ba68b82e97032944100f5802a5d3c6a3c5
Pipeline
Passed
9 files changed +534 −87
internal/i18n/catalog_branch.go +60 −0
@@ -51,6 +51,21 @@ var branchEN = map[string]string{
51 51 "mr.emptyCompare": "Choose two different branches",
52 52 "mr.commented": "commented",
53 53 "mr.pipeEvent": "Pipeline #%d is %s",
54 "mr.state.open": "Open",
55 "mr.state.merged": "Merged",
56 "mr.state.closed": "Closed",
57 "mr.when.created": "created %s",
58 "mr.when.merged": "merged %s",
59 "mr.when.closed": "closed %s",
60 "mr.wantsLead": "wants to merge",
61 "mr.wantsFrom": "from",
62 "mr.wantsInto": "into",
63 "mr.wantsTail": "-",
64 "mr.mergedByLead": "Merged by",
65 "mr.mergedByOn": "on",
66 "mr.mergedOn": "Merged on %s",
67 "mr.remove.short": "Delete source branch",
68 "mr.squash.short": "Squash",
54 69 "err.branchName": "Branch name %s is not allowed",
55 70 "err.branchLocked": "Branch %s cannot be renamed or deleted",
56 71 "err.branchConfirm": "Type the branch name to confirm.",
@@ -105,6 +120,21 @@ var branchNL = map[string]string{
105 120 "mr.emptyCompare": "Kies twee verschillende branches",
106 121 "mr.commented": "reageerde",
107 122 "mr.pipeEvent": "Pipeline #%d is %s",
123 "mr.state.open": "Open",
124 "mr.state.merged": "Gemerged",
125 "mr.state.closed": "Gesloten",
126 "mr.when.created": "aangemaakt %s",
127 "mr.when.merged": "gemerged %s",
128 "mr.when.closed": "gesloten %s",
129 "mr.wantsLead": "wil",
130 "mr.wantsFrom": "van",
131 "mr.wantsInto": "naar",
132 "mr.wantsTail": "mergen",
133 "mr.mergedByLead": "Gemerged door",
134 "mr.mergedByOn": "op",
135 "mr.mergedOn": "Gemerged op %s",
136 "mr.remove.short": "Bron verwijderen",
137 "mr.squash.short": "Squash",
108 138 "err.branchName": "Branchnaam %s is niet toegestaan",
109 139 "err.branchLocked": "Branch %s kan niet hernoemd of verwijderd worden",
110 140 "err.branchConfirm": "Typ de branchnaam ter bevestiging.",
@@ -159,6 +189,21 @@ var branchDE = map[string]string{
159 189 "mr.emptyCompare": "Zwei verschiedene Branches wählen",
160 190 "mr.commented": "kommentierte",
161 191 "mr.pipeEvent": "Pipeline #%d ist %s",
192 "mr.state.open": "Offen",
193 "mr.state.merged": "Gemergt",
194 "mr.state.closed": "Geschlossen",
195 "mr.when.created": "erstellt %s",
196 "mr.when.merged": "gemergt %s",
197 "mr.when.closed": "geschlossen %s",
198 "mr.wantsLead": "möchte",
199 "mr.wantsFrom": "von",
200 "mr.wantsInto": "nach",
201 "mr.wantsTail": "mergen",
202 "mr.mergedByLead": "Gemergt von",
203 "mr.mergedByOn": "am",
204 "mr.mergedOn": "Gemergt am %s",
205 "mr.remove.short": "Quellbranch löschen",
206 "mr.squash.short": "Squash",
162 207 "err.branchName": "Branchname %s ist nicht erlaubt",
163 208 "err.branchLocked": "Branch %s kann nicht umbenannt oder gelöscht werden",
164 209 "err.branchConfirm": "Branchname zur Bestätigung eingeben.",
@@ -213,6 +258,21 @@ var branchFR = map[string]string{
213 258 "mr.emptyCompare": "Choisissez deux branches différentes",
214 259 "mr.commented": "a commenté",
215 260 "mr.pipeEvent": "Le pipeline #%d est %s",
261 "mr.state.open": "Ouvert",
262 "mr.state.merged": "Fusionné",
263 "mr.state.closed": "Fermé",
264 "mr.when.created": "créée %s",
265 "mr.when.merged": "fusionnée %s",
266 "mr.when.closed": "fermée %s",
267 "mr.wantsLead": "veut fusionner",
268 "mr.wantsFrom": "de",
269 "mr.wantsInto": "vers",
270 "mr.wantsTail": "-",
271 "mr.mergedByLead": "Fusionné par",
272 "mr.mergedByOn": "le",
273 "mr.mergedOn": "Fusionné le %s",
274 "mr.remove.short": "Supprimer la source",
275 "mr.squash.short": "Squash",
216 276 "err.branchName": "Le nom de branche %s n'est pas permis",
217 277 "err.branchLocked": "La branche %s ne peut pas être renommée ou supprimée",
218 278 "err.branchConfirm": "Saisir le nom de la branche pour confirmer.",
@@ -51,6 +51,21 @@ var branchEN = map[string]string{
51 "mr.emptyCompare": "Choose two different branches",
51 "mr.emptyCompare": "Choose two different branches",
52 "mr.commented": "commented",
52 "mr.commented": "commented",
53 "mr.pipeEvent": "Pipeline #%d is %s",
53 "mr.pipeEvent": "Pipeline #%d is %s",
54 "mr.state.open": "Open",
55 "mr.state.merged": "Merged",
56 "mr.state.closed": "Closed",
57 "mr.when.created": "created %s",
58 "mr.when.merged": "merged %s",
59 "mr.when.closed": "closed %s",
60 "mr.wantsLead": "wants to merge",
61 "mr.wantsFrom": "from",
62 "mr.wantsInto": "into",
63 "mr.wantsTail": "-",
64 "mr.mergedByLead": "Merged by",
65 "mr.mergedByOn": "on",
66 "mr.mergedOn": "Merged on %s",
67 "mr.remove.short": "Delete source branch",
68 "mr.squash.short": "Squash",
54 "err.branchName": "Branch name %s is not allowed",
69 "err.branchName": "Branch name %s is not allowed",
55 "err.branchLocked": "Branch %s cannot be renamed or deleted",
70 "err.branchLocked": "Branch %s cannot be renamed or deleted",
56 "err.branchConfirm": "Type the branch name to confirm.",
71 "err.branchConfirm": "Type the branch name to confirm.",
@@ -105,6 +120,21 @@ var branchNL = map[string]string{
105 "mr.emptyCompare": "Kies twee verschillende branches",
120 "mr.emptyCompare": "Kies twee verschillende branches",
106 "mr.commented": "reageerde",
121 "mr.commented": "reageerde",
107 "mr.pipeEvent": "Pipeline #%d is %s",
122 "mr.pipeEvent": "Pipeline #%d is %s",
123 "mr.state.open": "Open",
124 "mr.state.merged": "Gemerged",
125 "mr.state.closed": "Gesloten",
126 "mr.when.created": "aangemaakt %s",
127 "mr.when.merged": "gemerged %s",
128 "mr.when.closed": "gesloten %s",
129 "mr.wantsLead": "wil",
130 "mr.wantsFrom": "van",
131 "mr.wantsInto": "naar",
132 "mr.wantsTail": "mergen",
133 "mr.mergedByLead": "Gemerged door",
134 "mr.mergedByOn": "op",
135 "mr.mergedOn": "Gemerged op %s",
136 "mr.remove.short": "Bron verwijderen",
137 "mr.squash.short": "Squash",
108 "err.branchName": "Branchnaam %s is niet toegestaan",
138 "err.branchName": "Branchnaam %s is niet toegestaan",
109 "err.branchLocked": "Branch %s kan niet hernoemd of verwijderd worden",
139 "err.branchLocked": "Branch %s kan niet hernoemd of verwijderd worden",
110 "err.branchConfirm": "Typ de branchnaam ter bevestiging.",
140 "err.branchConfirm": "Typ de branchnaam ter bevestiging.",
@@ -159,6 +189,21 @@ var branchDE = map[string]string{
159 "mr.emptyCompare": "Zwei verschiedene Branches wählen",
189 "mr.emptyCompare": "Zwei verschiedene Branches wählen",
160 "mr.commented": "kommentierte",
190 "mr.commented": "kommentierte",
161 "mr.pipeEvent": "Pipeline #%d ist %s",
191 "mr.pipeEvent": "Pipeline #%d ist %s",
192 "mr.state.open": "Offen",
193 "mr.state.merged": "Gemergt",
194 "mr.state.closed": "Geschlossen",
195 "mr.when.created": "erstellt %s",
196 "mr.when.merged": "gemergt %s",
197 "mr.when.closed": "geschlossen %s",
198 "mr.wantsLead": "möchte",
199 "mr.wantsFrom": "von",
200 "mr.wantsInto": "nach",
201 "mr.wantsTail": "mergen",
202 "mr.mergedByLead": "Gemergt von",
203 "mr.mergedByOn": "am",
204 "mr.mergedOn": "Gemergt am %s",
205 "mr.remove.short": "Quellbranch löschen",
206 "mr.squash.short": "Squash",
162 "err.branchName": "Branchname %s ist nicht erlaubt",
207 "err.branchName": "Branchname %s ist nicht erlaubt",
163 "err.branchLocked": "Branch %s kann nicht umbenannt oder gelöscht werden",
208 "err.branchLocked": "Branch %s kann nicht umbenannt oder gelöscht werden",
164 "err.branchConfirm": "Branchname zur Bestätigung eingeben.",
209 "err.branchConfirm": "Branchname zur Bestätigung eingeben.",
@@ -213,6 +258,21 @@ var branchFR = map[string]string{
213 "mr.emptyCompare": "Choisissez deux branches différentes",
258 "mr.emptyCompare": "Choisissez deux branches différentes",
214 "mr.commented": "a commenté",
259 "mr.commented": "a commenté",
215 "mr.pipeEvent": "Le pipeline #%d est %s",
260 "mr.pipeEvent": "Le pipeline #%d est %s",
261 "mr.state.open": "Ouvert",
262 "mr.state.merged": "Fusionné",
263 "mr.state.closed": "Fermé",
264 "mr.when.created": "créée %s",
265 "mr.when.merged": "fusionnée %s",
266 "mr.when.closed": "fermée %s",
267 "mr.wantsLead": "veut fusionner",
268 "mr.wantsFrom": "de",
269 "mr.wantsInto": "vers",
270 "mr.wantsTail": "-",
271 "mr.mergedByLead": "Fusionné par",
272 "mr.mergedByOn": "le",
273 "mr.mergedOn": "Fusionné le %s",
274 "mr.remove.short": "Supprimer la source",
275 "mr.squash.short": "Squash",
216 "err.branchName": "Le nom de branche %s n'est pas permis",
276 "err.branchName": "Le nom de branche %s n'est pas permis",
217 "err.branchLocked": "La branche %s ne peut pas être renommée ou supprimée",
277 "err.branchLocked": "La branche %s ne peut pas être renommée ou supprimée",
218 "err.branchConfirm": "Saisir le nom de la branche pour confirmer.",
278 "err.branchConfirm": "Saisir le nom de la branche pour confirmer.",
internal/server/events.go +5 −1
@@ -391,7 +391,11 @@ func (s *Server) markIfContained(ctx context.Context, repo store.Repo, user stor
391 391 if err := s.Store.SetMergeRequestStatus(ctx, mr.ID, "merged"); err != nil {
392 392 return mergedSource{}, false
393 393 }
394 _ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "merged", "")
394 body := ""
395 if shaLike(targetSHA) {
396 body = targetSHA
397 }
398 _ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "merged", body)
395 399 mr.Status = "merged"
396 400 s.mrHook(repo, mr, user.Username, "merged", "")
397 401 s.closeMergedMR(ctx, repo, user, mr)
@@ -391,7 +391,11 @@ func (s *Server) markIfContained(ctx context.Context, repo store.Repo, user stor
391 if err := s.Store.SetMergeRequestStatus(ctx, mr.ID, "merged"); err != nil {
391 if err := s.Store.SetMergeRequestStatus(ctx, mr.ID, "merged"); err != nil {
392 return mergedSource{}, false
392 return mergedSource{}, false
393 }
393 }
394 _ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "merged", "")
394 body := ""
395 if shaLike(targetSHA) {
396 body = targetSHA
397 }
398 _ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "merged", body)
395 mr.Status = "merged"
399 mr.Status = "merged"
396 s.mrHook(repo, mr, user.Username, "merged", "")
400 s.mrHook(repo, mr, user.Username, "merged", "")
397 s.closeMergedMR(ctx, repo, user, mr)
401 s.closeMergedMR(ctx, repo, user, mr)
internal/server/mr_layout_test.go added +115 −0
@@ -0,0 +1,115 @@
1 package server
2
3 import (
4 "net/http"
5 "net/http/cookiejar"
6 "net/http/httptest"
7 "net/url"
8 "os/exec"
9 "path/filepath"
10 "regexp"
11 "strings"
12 "testing"
13
14 "gitlab.com/Timfa/bluegit/internal/auth"
15 "gitlab.com/Timfa/bluegit/internal/config"
16 "gitlab.com/Timfa/bluegit/internal/store"
17 )
18
19 func TestMRPageLayout(t *testing.T) {
20 if _, err := exec.LookPath("git"); err != nil {
21 t.Skip("git ontbreekt")
22 }
23 storage := t.TempDir()
24 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
25 if err != nil {
26 t.Fatal(err)
27 }
28 t.Cleanup(func() { _ = st.Close() })
29 cfg := config.Config{
30 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
31 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
32 Git: config.Git{Binary: "git", DefaultBranch: "master"},
33 }
34 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
35 ts := httptest.NewServer(srv.Handler())
36 t.Cleanup(ts.Close)
37 jar, _ := cookiejar.New(nil)
38 tim := &http.Client{Jar: jar}
39 page := read(t, mustGet(t, tim, ts.URL+"/login"))
40 page = read(t, mustPost(t, tim, ts.URL+"/new/repo", url.Values{
41 "csrf": {csrfOf(t, page)}, "name": {"layout"}, "visibility": {"public"},
42 }))
43 page = read(t, mustPost(t, tim, ts.URL+"/settings/tokens", url.Values{
44 "csrf": {csrfOf(t, page)}, "name": {"laptop"},
45 }))
46 token := between(page, `<p class="code">`, "</p>")
47 remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/layout.git"
48 work := t.TempDir()
49 git(t, work, "init", "-b", "master")
50 git(t, work, "config", "user.email", "tim@users.git.timfalken.com")
51 git(t, work, "config", "user.name", "tim")
52 git(t, work, "config", "commit.gpgsign", "false")
53 writeFile(t, filepath.Join(work, "hello.txt"), "alpha\n")
54 git(t, work, "add", "hello.txt")
55 git(t, work, "commit", "-m", "start")
56 git(t, work, "remote", "add", "origin", remote)
57 git(t, work, "push", "-u", "origin", "master")
58 git(t, work, "checkout", "-b", "topic")
59 writeFile(t, filepath.Join(work, "a.txt"), "een\n")
60 git(t, work, "add", "a.txt")
61 git(t, work, "commit", "-m", "eerste")
62 writeFile(t, filepath.Join(work, "b.txt"), "twee\n")
63 git(t, work, "add", "b.txt")
64 git(t, work, "commit", "-m", "tweede")
65 writeFile(t, filepath.Join(work, "a.txt"), "drie\n")
66 git(t, work, "add", "a.txt")
67 git(t, work, "commit", "-m", "derde")
68 git(t, work, "push", "-u", "origin", "topic")
69
70 page = read(t, mustPost(t, tim, ts.URL+"/tim/layout/-/merge-requests", url.Values{
71 "csrf": {csrfOf(t, page)}, "title": {"Layout van de pagina"}, "description": {"tekst"},
72 "source": {"topic"}, "target": {"master"},
73 }))
74 for _, want := range []string{
75 `class="mrstate open"`, ">Open<", "wants to merge", "3 commits",
76 `data-copy="topic"`, `data-copy="master"`,
77 `Commits <span class="count">3</span>`,
78 `Changes <span class="count">2</span>`,
79 `Pipelines <span class="count">0</span>`,
80 "Delete source branch", "> Squash",
81 "created just now", `href="/users/tim"`, `class="avatar sm">T</span>`,
82 "mrwidget",
83 } {
84 if !strings.Contains(page, want) {
85 t.Fatalf("open MR mist %q:\n%s", want, page)
86 }
87 }
88
89 page = read(t, mustPost(t, tim, ts.URL+"/tim/layout/-/merge-requests/1/merge", url.Values{
90 "csrf": {csrfOf(t, page)},
91 }))
92 git(t, work, "fetch", "origin", "master")
93 shaBytes, err := exec.Command("git", "-C", work, "rev-parse", "origin/master").Output()
94 if err != nil {
95 t.Fatal(err)
96 }
97 sha := strings.TrimSpace(string(shaBytes))
98 short := sha
99 if len(short) > 8 {
100 short = short[:8]
101 }
102 for _, want := range []string{
103 `class="mrstate merged"`, ">Merged<", "Merged by", `href="/users/tim"`,
104 "merged just now", `<code>` + short + `</code>`, `data-copy="` + sha + `"`,
105 `Commits <span class="count">3</span>`,
106 `Changes <span class="count">2</span>`,
107 } {
108 if !strings.Contains(page, want) {
109 t.Fatalf("gemergede MR mist %q:\n%s", want, page)
110 }
111 }
112 if regexp.MustCompile(`(?s)pushlist">` + sha).MatchString(page) {
113 t.Fatalf("de sha hoort niet als ruwe tijdlijntekst:\n%s", page)
114 }
115 }
@@ -0,0 +1,115 @@
1package server
2
3import (
4 "net/http"
5 "net/http/cookiejar"
6 "net/http/httptest"
7 "net/url"
8 "os/exec"
9 "path/filepath"
10 "regexp"
11 "strings"
12 "testing"
13
14 "gitlab.com/Timfa/bluegit/internal/auth"
15 "gitlab.com/Timfa/bluegit/internal/config"
16 "gitlab.com/Timfa/bluegit/internal/store"
17)
18
19func TestMRPageLayout(t *testing.T) {
20 if _, err := exec.LookPath("git"); err != nil {
21 t.Skip("git ontbreekt")
22 }
23 storage := t.TempDir()
24 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
25 if err != nil {
26 t.Fatal(err)
27 }
28 t.Cleanup(func() { _ = st.Close() })
29 cfg := config.Config{
30 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
31 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
32 Git: config.Git{Binary: "git", DefaultBranch: "master"},
33 }
34 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
35 ts := httptest.NewServer(srv.Handler())
36 t.Cleanup(ts.Close)
37 jar, _ := cookiejar.New(nil)
38 tim := &http.Client{Jar: jar}
39 page := read(t, mustGet(t, tim, ts.URL+"/login"))
40 page = read(t, mustPost(t, tim, ts.URL+"/new/repo", url.Values{
41 "csrf": {csrfOf(t, page)}, "name": {"layout"}, "visibility": {"public"},
42 }))
43 page = read(t, mustPost(t, tim, ts.URL+"/settings/tokens", url.Values{
44 "csrf": {csrfOf(t, page)}, "name": {"laptop"},
45 }))
46 token := between(page, `<p class="code">`, "</p>")
47 remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/layout.git"
48 work := t.TempDir()
49 git(t, work, "init", "-b", "master")
50 git(t, work, "config", "user.email", "tim@users.git.timfalken.com")
51 git(t, work, "config", "user.name", "tim")
52 git(t, work, "config", "commit.gpgsign", "false")
53 writeFile(t, filepath.Join(work, "hello.txt"), "alpha\n")
54 git(t, work, "add", "hello.txt")
55 git(t, work, "commit", "-m", "start")
56 git(t, work, "remote", "add", "origin", remote)
57 git(t, work, "push", "-u", "origin", "master")
58 git(t, work, "checkout", "-b", "topic")
59 writeFile(t, filepath.Join(work, "a.txt"), "een\n")
60 git(t, work, "add", "a.txt")
61 git(t, work, "commit", "-m", "eerste")
62 writeFile(t, filepath.Join(work, "b.txt"), "twee\n")
63 git(t, work, "add", "b.txt")
64 git(t, work, "commit", "-m", "tweede")
65 writeFile(t, filepath.Join(work, "a.txt"), "drie\n")
66 git(t, work, "add", "a.txt")
67 git(t, work, "commit", "-m", "derde")
68 git(t, work, "push", "-u", "origin", "topic")
69
70 page = read(t, mustPost(t, tim, ts.URL+"/tim/layout/-/merge-requests", url.Values{
71 "csrf": {csrfOf(t, page)}, "title": {"Layout van de pagina"}, "description": {"tekst"},
72 "source": {"topic"}, "target": {"master"},
73 }))
74 for _, want := range []string{
75 `class="mrstate open"`, ">Open<", "wants to merge", "3 commits",
76 `data-copy="topic"`, `data-copy="master"`,
77 `Commits <span class="count">3</span>`,
78 `Changes <span class="count">2</span>`,
79 `Pipelines <span class="count">0</span>`,
80 "Delete source branch", "> Squash",
81 "created just now", `href="/users/tim"`, `class="avatar sm">T</span>`,
82 "mrwidget",
83 } {
84 if !strings.Contains(page, want) {
85 t.Fatalf("open MR mist %q:\n%s", want, page)
86 }
87 }
88
89 page = read(t, mustPost(t, tim, ts.URL+"/tim/layout/-/merge-requests/1/merge", url.Values{
90 "csrf": {csrfOf(t, page)},
91 }))
92 git(t, work, "fetch", "origin", "master")
93 shaBytes, err := exec.Command("git", "-C", work, "rev-parse", "origin/master").Output()
94 if err != nil {
95 t.Fatal(err)
96 }
97 sha := strings.TrimSpace(string(shaBytes))
98 short := sha
99 if len(short) > 8 {
100 short = short[:8]
101 }
102 for _, want := range []string{
103 `class="mrstate merged"`, ">Merged<", "Merged by", `href="/users/tim"`,
104 "merged just now", `<code>` + short + `</code>`, `data-copy="` + sha + `"`,
105 `Commits <span class="count">3</span>`,
106 `Changes <span class="count">2</span>`,
107 } {
108 if !strings.Contains(page, want) {
109 t.Fatalf("gemergede MR mist %q:\n%s", want, page)
110 }
111 }
112 if regexp.MustCompile(`(?s)pushlist">` + sha).MatchString(page) {
113 t.Fatalf("de sha hoort niet als ruwe tijdlijntekst:\n%s", page)
114 }
115}
internal/server/mr_page.go +171 −1
@@ -7,6 +7,7 @@ import (
7 7 "sort"
8 8 "strconv"
9 9 "strings"
10 "time"
10 11
11 12 "gitlab.com/Timfa/bluegit/internal/access"
12 13 "gitlab.com/Timfa/bluegit/internal/gitrepo"
@@ -115,6 +116,7 @@ func (s *Server) finishMR(r *http.Request, v *View, repo store.Repo, mr store.Me
115 116 })
116 117 v.Notes = stampNotes(v.CommitDiff, rows)
117 118 s.fillTimeline(r, v, repo, mr, rows)
119 s.fillMRBanner(r, v, repo, mr)
118 120 }
119 121
120 122 func (s *Server) fillBranchChoices(r *http.Request, v *View, repo store.Repo) {
@@ -175,8 +177,12 @@ func (s *Server) fillTimeline(r *http.Request, v *View, repo store.Repo, mr stor
175 177 continue
176 178 }
177 179 actor, actorURL := who(e.Actor)
180 body := e.Body
181 if e.Kind == "merged" && shaLike(strings.TrimSpace(body)) {
182 body = ""
183 }
178 184 items = append(items, TimelineItem{
179 Kind: e.Kind, Actor: actor, ActorURL: actorURL, Text: s.tr(r, key), Body: e.Body,
185 Kind: e.Kind, Actor: actor, ActorURL: actorURL, Text: s.tr(r, key), Body: body,
180 186 When: i18n.FormatDate(lang, e.CreatedAt), At: e.CreatedAt, Rank: 2,
181 187 })
182 188 }
@@ -318,3 +324,167 @@ func (s *Server) recordMRPushes(repo store.Repo, user store.User, branch, before
318 324 _ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "pushed", body)
319 325 }
320 326 }
327
328 // MRBanner is the header and the counts on a merge request.
329 type MRBanner struct {
330 State, StateLabel string
331 WhenLabel string
332 Author, AuthorURL, Avatar string
333 Initial string
334 CommitPhrase string
335 NCommits, NPipes, NChanges int
336 MergedBy, MergedByURL string
337 MergedDate string
338 MergeSHA, MergeShort string
339 }
340
341 func (s *Server) fillMRBanner(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest) {
342 lang := s.langOf(r)
343 state := mr.Status
344 if state == "" {
345 state = "open"
346 }
347 label := s.tr(r, "mr.state."+state)
348 if label == "mr.state."+state {
349 label = state
350 }
351 b := &MRBanner{State: state, StateLabel: label}
352 when := mr.CreatedAt
353 whenKey := "mr.when.created"
354 var merger string
355 var mergeAt time.Time
356 var mergeSHA string
357 events, _ := s.Store.ListMREvents(r.Context(), mr.ID)
358 for _, e := range events {
359 if e.Kind != "merged" {
360 continue
361 }
362 merger = e.Actor
363 mergeAt = e.CreatedAt
364 if shaLike(strings.TrimSpace(e.Body)) {
365 mergeSHA = strings.TrimSpace(e.Body)
366 }
367 }
368 switch state {
369 case "merged":
370 whenKey = "mr.when.merged"
371 if !mergeAt.IsZero() {
372 when = mergeAt
373 } else if !mr.UpdatedAt.IsZero() {
374 when = mr.UpdatedAt
375 }
376 b.MergedDate = i18n.FormatDate(lang, when)
377 if merger != "" {
378 b.MergedBy = merger
379 if u, err := s.Store.UserByUsername(r.Context(), merger); err == nil && u.ID != 0 {
380 b.MergedBy = u.Username
381 b.MergedByURL = "/users/" + u.Username
382 }
383 }
384 if mergeSHA == "" {
385 mergeSHA = s.mergeCommitSHA(r.Context(), repo, mr)
386 }
387 if shaLike(mergeSHA) {
388 b.MergeSHA = mergeSHA
389 b.MergeShort = mergeSHA
390 if len(mergeSHA) > 8 {
391 b.MergeShort = mergeSHA[:8]
392 }
393 }
394 case "closed":
395 whenKey = "mr.when.closed"
396 if !mr.UpdatedAt.IsZero() {
397 when = mr.UpdatedAt
398 }
399 }
400 b.WhenLabel = s.tr(r, whenKey, i18n.Ago(lang, when.Unix()))
401 if mr.Author != "" {
402 b.Author = mr.Author
403 b.Initial = initialOf(mr.Author)
404 if u, err := s.Store.UserByUsername(r.Context(), mr.Author); err == nil && u.ID != 0 {
405 b.Author = u.Username
406 b.AuthorURL = "/users/" + u.Username
407 b.Avatar = u.AvatarURL
408 b.Initial = initialOf(u.Username)
409 }
410 }
411 n := s.commitCount(r.Context(), repo, mr.TargetBranch, mr.SourceBranch)
412 if state == "merged" && shaLike(mergeSHA) && (n == 0 || len(v.Commits) == 0 || v.CommitDiff == nil || len(v.CommitDiff.Files) == 0) {
413 if brought := s.fillFromMergeCommit(r, v, repo, mergeSHA); n == 0 && brought > 0 {
414 n = brought
415 }
416 }
417 b.NCommits = n
418 if n == 1 {
419 b.CommitPhrase = s.tr(r, "count.commit.one", n)
420 } else {
421 b.CommitPhrase = s.tr(r, "count.commit.many", n)
422 }
423 b.NPipes = len(v.PipeRows)
424 if v.CommitDiff != nil {
425 b.NChanges = len(v.CommitDiff.Files)
426 }
427 v.Banner = b
428 }
429
430 func (s *Server) commitCount(ctx context.Context, repo store.Repo, from, to string) int {
431 if s.Git == "" || s.StoragePath() == "" || from == "" || to == "" || from == to {
432 return 0
433 }
434 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
435 n, err := strconv.Atoi(gitOne(ctx, s.Git, dir, "rev-list", "--count", from+".."+to))
436 if err != nil || n < 0 {
437 return 0
438 }
439 return n
440 }
441
442 // fillFromMergeCommit vult commits en diff vanuit de merge-commit als de bronbranch
443 // al in het doel zit of inmiddels weg is. Het aantal is wat die commit binnenbracht.
444 func (s *Server) fillFromMergeCommit(r *http.Request, v *View, repo store.Repo, sha string) int {
445 if s.Git == "" || s.StoragePath() == "" {
446 return 0
447 }
448 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
449 parents := strings.Fields(gitOne(r.Context(), s.Git, dir, "rev-list", "--parents", "-n", "1", sha))
450 if len(parents) < 3 {
451 return 0
452 }
453 base, tip := parents[1], parents[2]
454 n, err := strconv.Atoi(gitOne(r.Context(), s.Git, dir, "rev-list", "--count", base+".."+tip))
455 if err != nil || n < 0 {
456 n = 0
457 }
458 if len(v.Commits) == 0 {
459 if commits, err := gitrepo.Log(r.Context(), s.Git, dir, base+".."+tip, 50); err == nil && len(commits) > 0 {
460 v.Commits = s.presentCommits(r.Context(), repo.ID, commits, s.langOf(r))
461 }
462 }
463 if v.CommitDiff == nil || len(v.CommitDiff.Files) == 0 {
464 if files, err := gitrepo.ComparePatch(r.Context(), s.Git, dir, base, tip); err == nil && len(files) > 0 {
465 v.CommitDiff = presentCommitDiff(repo.FullPath(), tip, nil, files)
466 }
467 }
468 return n
469 }
470
471 func (s *Server) mergeCommitSHA(ctx context.Context, repo store.Repo, mr store.MergeRequest) string {
472 if s.Git == "" || s.StoragePath() == "" || mr.SourceBranch == "" || mr.TargetBranch == "" {
473 return ""
474 }
475 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
476 needle := "Merge branch '" + mr.SourceBranch + "'"
477 return gitOne(ctx, s.Git, dir, "log", "-1", "--format=%H", "-F", "--grep="+needle, "refs/heads/"+mr.TargetBranch)
478 }
479
480 func shaLike(s string) bool {
481 if len(s) < 7 || len(s) > 40 {
482 return false
483 }
484 for _, c := range s {
485 if (c < '0' || c > '9') && (c < 'a' || c > 'f') {
486 return false
487 }
488 }
489 return true
490 }
@@ -7,6 +7,7 @@ import (
7 "sort"
7 "sort"
8 "strconv"
8 "strconv"
9 "strings"
9 "strings"
10 "time"
10
11
11 "gitlab.com/Timfa/bluegit/internal/access"
12 "gitlab.com/Timfa/bluegit/internal/access"
12 "gitlab.com/Timfa/bluegit/internal/gitrepo"
13 "gitlab.com/Timfa/bluegit/internal/gitrepo"
@@ -115,6 +116,7 @@ func (s *Server) finishMR(r *http.Request, v *View, repo store.Repo, mr store.Me
115 })
116 })
116 v.Notes = stampNotes(v.CommitDiff, rows)
117 v.Notes = stampNotes(v.CommitDiff, rows)
117 s.fillTimeline(r, v, repo, mr, rows)
118 s.fillTimeline(r, v, repo, mr, rows)
119 s.fillMRBanner(r, v, repo, mr)
118}
120}
119
121
120func (s *Server) fillBranchChoices(r *http.Request, v *View, repo store.Repo) {
122func (s *Server) fillBranchChoices(r *http.Request, v *View, repo store.Repo) {
@@ -175,8 +177,12 @@ func (s *Server) fillTimeline(r *http.Request, v *View, repo store.Repo, mr stor
175 continue
177 continue
176 }
178 }
177 actor, actorURL := who(e.Actor)
179 actor, actorURL := who(e.Actor)
180 body := e.Body
181 if e.Kind == "merged" && shaLike(strings.TrimSpace(body)) {
182 body = ""
183 }
178 items = append(items, TimelineItem{
184 items = append(items, TimelineItem{
179 Kind: e.Kind, Actor: actor, ActorURL: actorURL, Text: s.tr(r, key), Body: e.Body,
185 Kind: e.Kind, Actor: actor, ActorURL: actorURL, Text: s.tr(r, key), Body: body,
180 When: i18n.FormatDate(lang, e.CreatedAt), At: e.CreatedAt, Rank: 2,
186 When: i18n.FormatDate(lang, e.CreatedAt), At: e.CreatedAt, Rank: 2,
181 })
187 })
182 }
188 }
@@ -318,3 +324,167 @@ func (s *Server) recordMRPushes(repo store.Repo, user store.User, branch, before
318 _ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "pushed", body)
324 _ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "pushed", body)
319 }
325 }
320}
326}
327
328// MRBanner is the header and the counts on a merge request.
329type MRBanner struct {
330 State, StateLabel string
331 WhenLabel string
332 Author, AuthorURL, Avatar string
333 Initial string
334 CommitPhrase string
335 NCommits, NPipes, NChanges int
336 MergedBy, MergedByURL string
337 MergedDate string
338 MergeSHA, MergeShort string
339}
340
341func (s *Server) fillMRBanner(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest) {
342 lang := s.langOf(r)
343 state := mr.Status
344 if state == "" {
345 state = "open"
346 }
347 label := s.tr(r, "mr.state."+state)
348 if label == "mr.state."+state {
349 label = state
350 }
351 b := &MRBanner{State: state, StateLabel: label}
352 when := mr.CreatedAt
353 whenKey := "mr.when.created"
354 var merger string
355 var mergeAt time.Time
356 var mergeSHA string
357 events, _ := s.Store.ListMREvents(r.Context(), mr.ID)
358 for _, e := range events {
359 if e.Kind != "merged" {
360 continue
361 }
362 merger = e.Actor
363 mergeAt = e.CreatedAt
364 if shaLike(strings.TrimSpace(e.Body)) {
365 mergeSHA = strings.TrimSpace(e.Body)
366 }
367 }
368 switch state {
369 case "merged":
370 whenKey = "mr.when.merged"
371 if !mergeAt.IsZero() {
372 when = mergeAt
373 } else if !mr.UpdatedAt.IsZero() {
374 when = mr.UpdatedAt
375 }
376 b.MergedDate = i18n.FormatDate(lang, when)
377 if merger != "" {
378 b.MergedBy = merger
379 if u, err := s.Store.UserByUsername(r.Context(), merger); err == nil && u.ID != 0 {
380 b.MergedBy = u.Username
381 b.MergedByURL = "/users/" + u.Username
382 }
383 }
384 if mergeSHA == "" {
385 mergeSHA = s.mergeCommitSHA(r.Context(), repo, mr)
386 }
387 if shaLike(mergeSHA) {
388 b.MergeSHA = mergeSHA
389 b.MergeShort = mergeSHA
390 if len(mergeSHA) > 8 {
391 b.MergeShort = mergeSHA[:8]
392 }
393 }
394 case "closed":
395 whenKey = "mr.when.closed"
396 if !mr.UpdatedAt.IsZero() {
397 when = mr.UpdatedAt
398 }
399 }
400 b.WhenLabel = s.tr(r, whenKey, i18n.Ago(lang, when.Unix()))
401 if mr.Author != "" {
402 b.Author = mr.Author
403 b.Initial = initialOf(mr.Author)
404 if u, err := s.Store.UserByUsername(r.Context(), mr.Author); err == nil && u.ID != 0 {
405 b.Author = u.Username
406 b.AuthorURL = "/users/" + u.Username
407 b.Avatar = u.AvatarURL
408 b.Initial = initialOf(u.Username)
409 }
410 }
411 n := s.commitCount(r.Context(), repo, mr.TargetBranch, mr.SourceBranch)
412 if state == "merged" && shaLike(mergeSHA) && (n == 0 || len(v.Commits) == 0 || v.CommitDiff == nil || len(v.CommitDiff.Files) == 0) {
413 if brought := s.fillFromMergeCommit(r, v, repo, mergeSHA); n == 0 && brought > 0 {
414 n = brought
415 }
416 }
417 b.NCommits = n
418 if n == 1 {
419 b.CommitPhrase = s.tr(r, "count.commit.one", n)
420 } else {
421 b.CommitPhrase = s.tr(r, "count.commit.many", n)
422 }
423 b.NPipes = len(v.PipeRows)
424 if v.CommitDiff != nil {
425 b.NChanges = len(v.CommitDiff.Files)
426 }
427 v.Banner = b
428}
429
430func (s *Server) commitCount(ctx context.Context, repo store.Repo, from, to string) int {
431 if s.Git == "" || s.StoragePath() == "" || from == "" || to == "" || from == to {
432 return 0
433 }
434 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
435 n, err := strconv.Atoi(gitOne(ctx, s.Git, dir, "rev-list", "--count", from+".."+to))
436 if err != nil || n < 0 {
437 return 0
438 }
439 return n
440}
441
442// fillFromMergeCommit vult commits en diff vanuit de merge-commit als de bronbranch
443// al in het doel zit of inmiddels weg is. Het aantal is wat die commit binnenbracht.
444func (s *Server) fillFromMergeCommit(r *http.Request, v *View, repo store.Repo, sha string) int {
445 if s.Git == "" || s.StoragePath() == "" {
446 return 0
447 }
448 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
449 parents := strings.Fields(gitOne(r.Context(), s.Git, dir, "rev-list", "--parents", "-n", "1", sha))
450 if len(parents) < 3 {
451 return 0
452 }
453 base, tip := parents[1], parents[2]
454 n, err := strconv.Atoi(gitOne(r.Context(), s.Git, dir, "rev-list", "--count", base+".."+tip))
455 if err != nil || n < 0 {
456 n = 0
457 }
458 if len(v.Commits) == 0 {
459 if commits, err := gitrepo.Log(r.Context(), s.Git, dir, base+".."+tip, 50); err == nil && len(commits) > 0 {
460 v.Commits = s.presentCommits(r.Context(), repo.ID, commits, s.langOf(r))
461 }
462 }
463 if v.CommitDiff == nil || len(v.CommitDiff.Files) == 0 {
464 if files, err := gitrepo.ComparePatch(r.Context(), s.Git, dir, base, tip); err == nil && len(files) > 0 {
465 v.CommitDiff = presentCommitDiff(repo.FullPath(), tip, nil, files)
466 }
467 }
468 return n
469}
470
471func (s *Server) mergeCommitSHA(ctx context.Context, repo store.Repo, mr store.MergeRequest) string {
472 if s.Git == "" || s.StoragePath() == "" || mr.SourceBranch == "" || mr.TargetBranch == "" {
473 return ""
474 }
475 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
476 needle := "Merge branch '" + mr.SourceBranch + "'"
477 return gitOne(ctx, s.Git, dir, "log", "-1", "--format=%H", "-F", "--grep="+needle, "refs/heads/"+mr.TargetBranch)
478}
479
480func shaLike(s string) bool {
481 if len(s) < 7 || len(s) > 40 {
482 return false
483 }
484 for _, c := range s {
485 if (c < '0' || c > '9') && (c < 'a' || c > 'f') {
486 return false
487 }
488 }
489 return true
490}
internal/server/ops_mr.go +6 −1
@@ -344,7 +344,12 @@ func (s *Server) opMergeMR(r *http.Request, user store.User, repo store.Repo, nu
344 344 fresh, ferr := s.Store.MergeRequestByNumber(ctx, repo.ID, mr.Number)
345 345 if ferr != nil || fresh.Status != "merged" {
346 346 _ = s.Store.SetMergeRequestStatus(ctx, mr.ID, "merged")
347 _ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "merged", "")
347 sha := gitOne(ctx, s.Git, dir, "rev-parse", "--verify", "refs/heads/"+mr.TargetBranch)
348 body := ""
349 if shaLike(sha) {
350 body = sha
351 }
352 _ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "merged", body)
348 353 mr.Status = "merged"
349 354 s.mrHook(repo, mr, user.Username, "merged", "")
350 355 s.closeIssueNumbers(ctx, repo, user, closingNumbers(texts...))
@@ -344,7 +344,12 @@ func (s *Server) opMergeMR(r *http.Request, user store.User, repo store.Repo, nu
344 fresh, ferr := s.Store.MergeRequestByNumber(ctx, repo.ID, mr.Number)
344 fresh, ferr := s.Store.MergeRequestByNumber(ctx, repo.ID, mr.Number)
345 if ferr != nil || fresh.Status != "merged" {
345 if ferr != nil || fresh.Status != "merged" {
346 _ = s.Store.SetMergeRequestStatus(ctx, mr.ID, "merged")
346 _ = s.Store.SetMergeRequestStatus(ctx, mr.ID, "merged")
347 _ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "merged", "")
347 sha := gitOne(ctx, s.Git, dir, "rev-parse", "--verify", "refs/heads/"+mr.TargetBranch)
348 body := ""
349 if shaLike(sha) {
350 body = sha
351 }
352 _ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "merged", body)
348 mr.Status = "merged"
353 mr.Status = "merged"
349 s.mrHook(repo, mr, user.Username, "merged", "")
354 s.mrHook(repo, mr, user.Username, "merged", "")
350 s.closeIssueNumbers(ctx, repo, user, closingNumbers(texts...))
355 s.closeIssueNumbers(ctx, repo, user, closingNumbers(texts...))
internal/server/reviews_test.go +1 −1
@@ -264,7 +264,7 @@ func TestReviewsApprovalsAndReopen(t *testing.T) {
264 264 t.Fatal(err)
265 265 }
266 266 body = read(t, res)
267 if !strings.Contains(body, ">open<") && !strings.Contains(body, "pill\">open") {
267 if !strings.Contains(body, ">open<") && !strings.Contains(body, "pill\">open") && !strings.Contains(body, "mrstate open") {
268 268 t.Fatalf("heropend:\n%s", body)
269 269 }
270 270 }
@@ -264,7 +264,7 @@ func TestReviewsApprovalsAndReopen(t *testing.T) {
264 t.Fatal(err)
264 t.Fatal(err)
265 }
265 }
266 body = read(t, res)
266 body = read(t, res)
267 if !strings.Contains(body, ">open<") && !strings.Contains(body, "pill\">open") {
267 if !strings.Contains(body, ">open<") && !strings.Contains(body, "pill\">open") && !strings.Contains(body, "mrstate open") {
268 t.Fatalf("heropend:\n%s", body)
268 t.Fatalf("heropend:\n%s", body)
269 }
269 }
270}
270}
internal/server/server.go +1 −0
@@ -525,6 +525,7 @@ type View struct {
525 525 Branches []BranchRow
526 526 MRs []store.MergeRequest
527 527 MR *store.MergeRequest
528 Banner *MRBanner
528 529 MRPipe *PipeRow
529 530 MergeBlocks []string
530 531 Approval *ApprovalView
@@ -525,6 +525,7 @@ type View struct {
525 Branches []BranchRow
525 Branches []BranchRow
526 MRs []store.MergeRequest
526 MRs []store.MergeRequest
527 MR *store.MergeRequest
527 MR *store.MergeRequest
528 Banner *MRBanner
528 MRPipe *PipeRow
529 MRPipe *PipeRow
529 MergeBlocks []string
530 MergeBlocks []string
530 Approval *ApprovalView
531 Approval *ApprovalView
internal/server/static/style.css +59 −0
@@ -956,12 +956,71 @@ form.wh .grid-2 label { margin-top: 0; }
956 956 .usercard-actions { grid-column: 1 / -1; flex-direction: row; flex-wrap: wrap; }
957 957 .pagehead { align-items: flex-start; }
958 958 .pageacts { flex-wrap: wrap; justify-content: flex-end; }
959 .mrwidget .rowline { align-items: flex-start; }
960 .sub { flex-wrap: nowrap; overflow-x: auto; }
959 961 }
960 962 .issuelist { list-style: none; margin: 0; padding: 0; }
961 963 .issuelist > li { border-bottom: 1px solid var(--line); padding: 0.6rem 0; min-height: 2.4rem; }
962 964 .lab { display: inline-block; color: #fff; border-radius: 999px; padding: 0.05rem 0.45rem; font-size: 0.78rem; margin: 0 0.2rem; }
963 965 .issue-meta { display: flex; flex-wrap: wrap; gap: 0.35rem; align-items: center; margin: 0.4rem 0; }
964 966 .checks label { display: block; margin: 0.2rem 0; }
967 .mrhead { margin: 0 0 var(--sp-4); }
968 .mrhead h1 { margin: 0.35rem 0 0.15rem; overflow-wrap: anywhere; }
969 .mrbadges { display: flex; flex-wrap: wrap; gap: 0.35rem; align-items: center; margin: 0; }
970 .mrstate {
971 display: inline-flex; align-items: center; border-radius: 999px;
972 padding: 0.18rem 0.7rem; font-weight: 650; font-size: 0.84rem;
973 }
974 .mrstate.open { background: #e5f6ec; color: #146c43; }
975 .mrstate.merged { background: var(--blue-soft); color: var(--blue-deep); }
976 .mrstate.closed { background: #fde8e8; color: var(--bad); }
977 .mrmeta { color: var(--muted); margin: 0.15rem 0 0.45rem; }
978 .mrwant { margin: 0.2rem 0; line-height: 1.9; }
979 .mrwant span:empty { display: none; }
980 .mrwant a.who {
981 display: inline-flex; align-items: center; gap: 0.35rem; vertical-align: middle;
982 margin-right: 0.15rem; font-weight: 650; color: var(--ink); text-decoration: none;
983 }
984 .mrwant a.who:hover { text-decoration: underline; }
985 .branchchip {
986 display: inline-flex; align-items: center; gap: 0.1rem; max-width: 100%;
987 background: #f6f8fa; border: 1px solid var(--line); border-radius: 6px;
988 padding: 0 0.1rem 0 0.4rem; vertical-align: middle;
989 }
990 .branchchip code { font-size: 0.85rem; overflow-wrap: anywhere; }
991 .branchchip button.copy {
992 border: 0; background: transparent; color: var(--muted); cursor: pointer;
993 font: inherit; font-size: 0.78rem; min-height: 1.6rem; padding: 0 0.4rem;
994 }
995 .mrchips { display: flex; flex-wrap: wrap; gap: 0.3rem; margin: 0.35rem 0 0; }
996 .mrwidget {
997 background: var(--card); border: 1px solid var(--line); border-radius: var(--radius-lg);
998 margin: var(--sp-3) 0 var(--sp-4);
999 }
1000 .mrwidget .rowline {
1001 display: flex; flex-wrap: wrap; align-items: center; gap: 0.6rem 1rem;
1002 padding: 0.75rem 1rem; border-bottom: 1px solid var(--line);
1003 }
1004 .mrwidget .rowline:last-child { border-bottom: 0; }
1005 .mrwidget h2 { margin: 0; font-size: 0.95rem; flex: none; }
1006 .mrwidget .mrpipe { margin: 0; min-width: 0; }
1007 .mrwidget .checks { display: flex; flex-wrap: wrap; gap: 0.35rem 1rem; align-items: center; }
1008 .mrwidget .checks label { display: inline-flex; align-items: center; gap: 0.35rem; margin: 0; }
1009 .mrwidget .checks label:last-child { flex: 1 1 100%; display: block; }
1010 .mrwidget textarea { min-height: 4.5rem; }
1011 .mrwidget form { margin: 0; }
1012 .revblock { flex: 1 1 16rem; min-width: 0; }
1013 .mrreviews { list-style: none; padding: 0; margin: 0 0 0.35rem; }
1014 .mrreviews li { display: flex; flex-wrap: wrap; gap: 0.35rem; align-items: center; padding: 0.15rem 0; }
1015 .mrreviews form { margin: 0; }
1016 .mergeacts { display: flex; flex-wrap: wrap; gap: 0.5rem; align-items: center; }
1017 .mergedby { margin: 0; }
1018 .mergedby .branchchip { margin-left: 0.45rem; vertical-align: middle; }
1019 .sub .count {
1020 display: inline-block; margin-left: 0.3rem; background: #eef2f7; color: var(--muted);
1021 border-radius: 999px; padding: 0 0.4rem; font-size: 0.75rem; font-weight: 650;
1022 }
1023 .sub a.on .count { background: #fff; color: var(--blue-deep); }
965 1024 .taskcount { margin: 0.7rem 0 0.2rem; font-size: 0.9rem; }
966 1025 ul.tasks { list-style: none; padding-left: 0.1rem; }
967 1026 ul.tasks > li { display: flex; align-items: flex-start; gap: 0.35rem; margin: 0.25rem 0; }
@@ -956,12 +956,71 @@ form.wh .grid-2 label { margin-top: 0; }
956 .usercard-actions { grid-column: 1 / -1; flex-direction: row; flex-wrap: wrap; }
956 .usercard-actions { grid-column: 1 / -1; flex-direction: row; flex-wrap: wrap; }
957 .pagehead { align-items: flex-start; }
957 .pagehead { align-items: flex-start; }
958 .pageacts { flex-wrap: wrap; justify-content: flex-end; }
958 .pageacts { flex-wrap: wrap; justify-content: flex-end; }
959 .mrwidget .rowline { align-items: flex-start; }
960 .sub { flex-wrap: nowrap; overflow-x: auto; }
959}
961}
960.issuelist { list-style: none; margin: 0; padding: 0; }
962.issuelist { list-style: none; margin: 0; padding: 0; }
961.issuelist > li { border-bottom: 1px solid var(--line); padding: 0.6rem 0; min-height: 2.4rem; }
963.issuelist > li { border-bottom: 1px solid var(--line); padding: 0.6rem 0; min-height: 2.4rem; }
962.lab { display: inline-block; color: #fff; border-radius: 999px; padding: 0.05rem 0.45rem; font-size: 0.78rem; margin: 0 0.2rem; }
964.lab { display: inline-block; color: #fff; border-radius: 999px; padding: 0.05rem 0.45rem; font-size: 0.78rem; margin: 0 0.2rem; }
963.issue-meta { display: flex; flex-wrap: wrap; gap: 0.35rem; align-items: center; margin: 0.4rem 0; }
965.issue-meta { display: flex; flex-wrap: wrap; gap: 0.35rem; align-items: center; margin: 0.4rem 0; }
964.checks label { display: block; margin: 0.2rem 0; }
966.checks label { display: block; margin: 0.2rem 0; }
967.mrhead { margin: 0 0 var(--sp-4); }
968.mrhead h1 { margin: 0.35rem 0 0.15rem; overflow-wrap: anywhere; }
969.mrbadges { display: flex; flex-wrap: wrap; gap: 0.35rem; align-items: center; margin: 0; }
970.mrstate {
971 display: inline-flex; align-items: center; border-radius: 999px;
972 padding: 0.18rem 0.7rem; font-weight: 650; font-size: 0.84rem;
973}
974.mrstate.open { background: #e5f6ec; color: #146c43; }
975.mrstate.merged { background: var(--blue-soft); color: var(--blue-deep); }
976.mrstate.closed { background: #fde8e8; color: var(--bad); }
977.mrmeta { color: var(--muted); margin: 0.15rem 0 0.45rem; }
978.mrwant { margin: 0.2rem 0; line-height: 1.9; }
979.mrwant span:empty { display: none; }
980.mrwant a.who {
981 display: inline-flex; align-items: center; gap: 0.35rem; vertical-align: middle;
982 margin-right: 0.15rem; font-weight: 650; color: var(--ink); text-decoration: none;
983}
984.mrwant a.who:hover { text-decoration: underline; }
985.branchchip {
986 display: inline-flex; align-items: center; gap: 0.1rem; max-width: 100%;
987 background: #f6f8fa; border: 1px solid var(--line); border-radius: 6px;
988 padding: 0 0.1rem 0 0.4rem; vertical-align: middle;
989}
990.branchchip code { font-size: 0.85rem; overflow-wrap: anywhere; }
991.branchchip button.copy {
992 border: 0; background: transparent; color: var(--muted); cursor: pointer;
993 font: inherit; font-size: 0.78rem; min-height: 1.6rem; padding: 0 0.4rem;
994}
995.mrchips { display: flex; flex-wrap: wrap; gap: 0.3rem; margin: 0.35rem 0 0; }
996.mrwidget {
997 background: var(--card); border: 1px solid var(--line); border-radius: var(--radius-lg);
998 margin: var(--sp-3) 0 var(--sp-4);
999}
1000.mrwidget .rowline {
1001 display: flex; flex-wrap: wrap; align-items: center; gap: 0.6rem 1rem;
1002 padding: 0.75rem 1rem; border-bottom: 1px solid var(--line);
1003}
1004.mrwidget .rowline:last-child { border-bottom: 0; }
1005.mrwidget h2 { margin: 0; font-size: 0.95rem; flex: none; }
1006.mrwidget .mrpipe { margin: 0; min-width: 0; }
1007.mrwidget .checks { display: flex; flex-wrap: wrap; gap: 0.35rem 1rem; align-items: center; }
1008.mrwidget .checks label { display: inline-flex; align-items: center; gap: 0.35rem; margin: 0; }
1009.mrwidget .checks label:last-child { flex: 1 1 100%; display: block; }
1010.mrwidget textarea { min-height: 4.5rem; }
1011.mrwidget form { margin: 0; }
1012.revblock { flex: 1 1 16rem; min-width: 0; }
1013.mrreviews { list-style: none; padding: 0; margin: 0 0 0.35rem; }
1014.mrreviews li { display: flex; flex-wrap: wrap; gap: 0.35rem; align-items: center; padding: 0.15rem 0; }
1015.mrreviews form { margin: 0; }
1016.mergeacts { display: flex; flex-wrap: wrap; gap: 0.5rem; align-items: center; }
1017.mergedby { margin: 0; }
1018.mergedby .branchchip { margin-left: 0.45rem; vertical-align: middle; }
1019.sub .count {
1020 display: inline-block; margin-left: 0.3rem; background: #eef2f7; color: var(--muted);
1021 border-radius: 999px; padding: 0 0.4rem; font-size: 0.75rem; font-weight: 650;
1022}
1023.sub a.on .count { background: #fff; color: var(--blue-deep); }
965.taskcount { margin: 0.7rem 0 0.2rem; font-size: 0.9rem; }
1024.taskcount { margin: 0.7rem 0 0.2rem; font-size: 0.9rem; }
966ul.tasks { list-style: none; padding-left: 0.1rem; }
1025ul.tasks { list-style: none; padding-left: 0.1rem; }
967ul.tasks > li { display: flex; align-items: flex-start; gap: 0.35rem; margin: 0.25rem 0; }
1026ul.tasks > li { display: flex; align-items: flex-start; gap: 0.35rem; margin: 0.25rem 0; }
internal/server/templates/collab.html +116 −83
@@ -1,7 +1,7 @@
1 1 {{define "mergeopts"}}
2 2 <div class="checks">
3 <label><input type="checkbox" name="remove_source_branch" value="1"{{if .MR.RemoveSourceBranch}} checked{{end}}> {{t "mr.remove.on"}}</label>
4 <label><input type="checkbox" name="squash" value="1"{{if .MR.Squash}} checked{{end}}> {{t "mr.squash.on"}}</label>
3 <label><input type="checkbox" name="remove_source_branch" value="1"{{if .MR.RemoveSourceBranch}} checked{{end}}> {{t "mr.remove.short"}}</label>
4 <label><input type="checkbox" name="squash" value="1"{{if .MR.Squash}} checked{{end}}> {{t "mr.squash.short"}}</label>
5 5 <label>{{t "mr.squash.message"}} <textarea name="squash_commit_message">{{if .MR.SquashMessage}}{{.MR.SquashMessage}}{{else}}{{.MR.Title}}{{end}}</textarea></label>
6 6 </div>
7 7 {{end}}
@@ -18,93 +18,126 @@
18 18
19 19 {{define "mr"}}
20 20 {{template "layout-start" .}}
21 <header class="pagehead"><h1>!{{.MR.Number}} {{.MR.Title}}</h1></header>
22 <p>
23 <span class="pill">{{.MR.Status}}</span>
24 {{if .MR.Draft}}<span class="pill">{{t "mr.draft"}}</span>{{end}}
25 {{range .Labels}}<span class="pill">{{.}}</span>{{end}}
26 {{.MR.SourceBranch}} → {{.MR.TargetBranch}} · {{if .MR.Author}}<a href="/users/{{.MR.Author}}">{{.MR.Author}}</a>{{end}}
27 </p>
28 <h2>{{t "mr.pipeline"}}</h2>
29 {{if .MRPipe}}
30 {{$pipe := .MRPipe}}
31 <div class="mrpipe">
32 <a class="pipeid" href="/{{.Repo.FullPath}}/-/pipelines/{{$pipe.ID}}">#{{$pipe.ID}}</a>
33 <span class="status {{$pipe.Status}}"><span class="mark"></span>{{$pipe.Label}}</span>
34 <div class="stages">
35 {{range $pipe.Stages}}
36 <span class="stage">
37 <button type="button" class="stage-dot {{.Status}}" data-stage="{{.Name}}" data-tip="{{.Tip}}" aria-label="{{.Tip}}"><span class="mark"></span></button>
38 <div class="stage-pop" popover="manual">
39 <strong>{{t "pipe.stage"}}: {{.Name}}</strong>
40 <ul>
41 {{range .Jobs}}<li data-job="{{.ID}}"><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}}</a></li>{{end}}
42 </ul>
21 <header class="mrhead">
22 <p class="mrbadges">
23 {{if .Banner}}<span class="mrstate {{.Banner.State}}">{{.Banner.StateLabel}}</span>{{else}}<span class="pill">{{.MR.Status}}</span>{{end}}
24 {{if .MR.Draft}}<span class="pill">{{t "mr.draft"}}</span>{{end}}
25 </p>
26 <h1>{{.MR.Title}}</h1>
27 <p class="mrmeta">!{{.MR.Number}}{{if .Banner}} · {{.Banner.WhenLabel}}{{end}}</p>
28 {{if .Banner}}
29 <p class="mrwant">
30 {{if .Banner.AuthorURL}}<a class="who" href="{{.Banner.AuthorURL}}">{{if .Banner.Avatar}}<img class="avatar sm" src="{{.Banner.Avatar}}" alt="">{{else}}<span class="avatar sm">{{.Banner.Initial}}</span>{{end}}{{.Banner.Author}}</a>{{else if .Banner.Author}}<span class="avatar sm">{{.Banner.Initial}}</span> <strong>{{.Banner.Author}}</strong>{{end}}
31 <span>{{t "mr.wantsLead"}}</span>
32 <strong>{{.Banner.CommitPhrase}}</strong>
33 <span>{{t "mr.wantsFrom"}}</span>
34 <span class="branchchip"><code>{{.MR.SourceBranch}}</code><button type="button" class="copy" data-copy="{{.MR.SourceBranch}}" aria-label="{{t "action.copy"}} {{.MR.SourceBranch}}">{{t "action.copy"}}</button></span>
35 <span>{{t "mr.wantsInto"}}</span>
36 <span class="branchchip"><code>{{.MR.TargetBranch}}</code><button type="button" class="copy" data-copy="{{.MR.TargetBranch}}" aria-label="{{t "action.copy"}} {{.MR.TargetBranch}}">{{t "action.copy"}}</button></span>
37 {{if ne (t "mr.wantsTail") "-"}}<span>{{t "mr.wantsTail"}}</span>{{end}}
38 </p>
39 {{end}}
40 {{if .Labels}}<p class="mrchips">{{range .Labels}}<span class="pill">{{.}}</span>{{end}}</p>{{end}}
41 </header>
42 <section class="mrwidget">
43 <div class="rowline">
44 <h2>{{t "mr.pipeline"}}</h2>
45 {{if .MRPipe}}
46 {{$pipe := .MRPipe}}
47 <div class="mrpipe">
48 <a class="pipeid" href="/{{.Repo.FullPath}}/-/pipelines/{{$pipe.ID}}">#{{$pipe.ID}}</a>
49 <span class="status {{$pipe.Status}}"><span class="mark"></span>{{$pipe.Label}}</span>
50 <div class="stages">
51 {{range $pipe.Stages}}
52 <span class="stage">
53 <button type="button" class="stage-dot {{.Status}}" data-stage="{{.Name}}" data-tip="{{.Tip}}" aria-label="{{.Tip}}"><span class="mark"></span></button>
54 <div class="stage-pop" popover="manual">
55 <strong>{{t "pipe.stage"}}: {{.Name}}</strong>
56 <ul>
57 {{range .Jobs}}<li data-job="{{.ID}}"><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}}</a></li>{{end}}
58 </ul>
59 </div>
60 </span>
61 {{end}}
43 62 </div>
44 </span>
45 {{end}}
63 </div>
64 {{else}}<span class="muted">{{t "mr.noPipeline"}}</span>{{end}}
46 65 </div>
47 </div>
48 {{else}}<p class="muted">{{t "mr.noPipeline"}}</p>{{end}}
49 {{if .MergeBlocks}}
50 <div class="mergewhy" role="status">
51 <p>{{t "mr.block.why"}}</p>
52 <ul>
53 {{range .MergeBlocks}}<li>{{.}}</li>{{end}}
54 </ul>
55 </div>
56 {{end}}
57 {{if and .CanMerge (not .MergeBlocks)}}
58 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/merge">
59 <input type="hidden" name="csrf" value="{{.CSRF}}">
60 {{template "mergeopts" .}}
61 <button type="submit">{{t "action.merge"}}</button>
62 </form>
63 {{end}}
64 {{if .CanForce}}
65 <form class="force-merge" method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/merge">
66 <input type="hidden" name="csrf" value="{{.CSRF}}">
67 <input type="hidden" name="force" value="1">
68 <p class="flash bad">{{t "mr.force.warn"}}</p>
69 {{template "mergeopts" .}}
70 <label class="check"><input type="checkbox" name="confirm_force" value="1" required> {{t "mr.force.confirm"}}</label>
71 <button class="ghost" type="submit">{{t "mr.force"}}</button>
72 </form>
73 {{end}}
74 {{if .CanClose}}
75 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/close">
76 <input type="hidden" name="csrf" value="{{.CSRF}}"><button class="ghost" type="submit">{{t "action.close"}}</button>
77 </form>
78 {{end}}
79 {{if .CanReopen}}
80 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/reopen">
81 <input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "action.reopen"}}</button>
82 </form>
83 {{end}}
84 <h2>{{t "rev.title"}}</h2>
85 <ul class="clean">
86 {{range .Reviews}}<li><strong><a href="/users/{{.Username}}">{{.Username}}</a></strong> <span class="pill">{{.Label}}</span>
87 {{if and $.CanDismiss (or (eq .Status "changes") (eq .Status "rejected"))}}
88 <form method="post" action="/{{$.Repo.FullPath}}/-/merge-requests/{{$.MR.Number}}/reviews/dismiss">
89 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="user_id" value="{{.UserID}}">
90 <button class="ghost" type="submit">{{t "rev.dismiss"}}</button>
66 <div class="rowline">
67 <h2>{{t "rev.title"}}</h2>
68 <div class="revblock">
69 <ul class="mrreviews">
70 {{range .Reviews}}<li><strong><a href="/users/{{.Username}}">{{.Username}}</a></strong> <span class="pill">{{.Label}}</span>
71 {{if and $.CanDismiss (or (eq .Status "changes") (eq .Status "rejected"))}}
72 <form method="post" action="/{{$.Repo.FullPath}}/-/merge-requests/{{$.MR.Number}}/reviews/dismiss">
73 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="user_id" value="{{.UserID}}">
74 <button class="ghost" type="submit">{{t "rev.dismiss"}}</button>
75 </form>
76 {{end}}
77 </li>{{else}}<li class="muted">{{t "rev.none"}}</li>{{end}}
78 </ul>
79 {{if .CanReview}}
80 <form class="row" method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/reviews">
81 <input type="hidden" name="csrf" value="{{.CSRF}}">
82 {{if .CanApprove}}<button type="submit" name="status" value="approved">{{t "rev.approved"}}</button>{{end}}
83 <button type="submit" name="status" value="changes">{{t "rev.changes"}}</button>
84 <button class="ghost" type="submit" name="status" value="rejected">{{t "rev.rejected"}}</button>
85 </form>
86 {{end}}
87 </div>
88 </div>
89 <div class="rowline merge">
90 {{if and (eq .MR.Status "merged") .Banner}}
91 <p class="mergedby">
92 {{if .Banner.MergedBy}}{{t "mr.mergedByLead"}} {{if .Banner.MergedByURL}}<a href="{{.Banner.MergedByURL}}">{{.Banner.MergedBy}}</a>{{else}}<strong>{{.Banner.MergedBy}}</strong>{{end}} {{t "mr.mergedByOn"}} {{.Banner.MergedDate}}{{else}}{{t "mr.mergedOn" .Banner.MergedDate}}{{end}}
93 {{if .Banner.MergeShort}}<span class="branchchip"><code>{{.Banner.MergeShort}}</code><button type="button" class="copy" data-copy="{{.Banner.MergeSHA}}" aria-label="{{t "action.copy"}} {{.Banner.MergeShort}}">{{t "action.copy"}}</button></span>{{end}}
94 </p>
95 {{else}}
96 {{if .MergeBlocks}}
97 <div class="mergewhy" role="status">
98 <p>{{t "mr.block.why"}}</p>
99 <ul>
100 {{range .MergeBlocks}}<li>{{.}}</li>{{end}}
101 </ul>
102 </div>
103 {{end}}
104 {{if and .CanMerge (not .MergeBlocks)}}
105 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/merge">
106 <input type="hidden" name="csrf" value="{{.CSRF}}">
107 {{template "mergeopts" .}}
108 <button type="submit">{{t "action.merge"}}</button>
91 109 </form>
92 110 {{end}}
93 </li>{{else}}<li class="muted">{{t "rev.none"}}</li>{{end}}
94 </ul>
95 {{if .CanReview}}
96 <form class="row" method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/reviews">
97 <input type="hidden" name="csrf" value="{{.CSRF}}">
98 {{if .CanApprove}}<button type="submit" name="status" value="approved">{{t "rev.approved"}}</button>{{end}}
99 <button type="submit" name="status" value="changes">{{t "rev.changes"}}</button>
100 <button class="ghost" type="submit" name="status" value="rejected">{{t "rev.rejected"}}</button>
101 </form>
102 {{end}}
111 {{if .CanForce}}
112 <form class="force-merge" method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/merge">
113 <input type="hidden" name="csrf" value="{{.CSRF}}">
114 <input type="hidden" name="force" value="1">
115 <p class="flash bad">{{t "mr.force.warn"}}</p>
116 {{template "mergeopts" .}}
117 <label class="check"><input type="checkbox" name="confirm_force" value="1" required> {{t "mr.force.confirm"}}</label>
118 <button class="ghost" type="submit">{{t "mr.force"}}</button>
119 </form>
120 {{end}}
121 <div class="mergeacts">
122 {{if .CanClose}}
123 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/close">
124 <input type="hidden" name="csrf" value="{{.CSRF}}"><button class="ghost" type="submit">{{t "action.close"}}</button>
125 </form>
126 {{end}}
127 {{if .CanReopen}}
128 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/reopen">
129 <input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "action.reopen"}}</button>
130 </form>
131 {{end}}
132 </div>
133 {{end}}
134 </div>
135 </section>
103 136 <p class="sub">
104 137 <a href="?tab=overview"{{if eq .Tab "overview"}} class="on"{{end}}>{{t "mr.overview"}}</a>
105 <a href="?tab=commits"{{if eq .Tab "commits"}} class="on"{{end}}>{{t "mr.commits"}}</a>
106 <a href="?tab=pipelines"{{if eq .Tab "pipelines"}} class="on"{{end}}>{{t "mr.pipelines"}}</a>
107 <a href="?tab=changes"{{if eq .Tab "changes"}} class="on"{{end}}>{{t "mr.changes"}}</a>
138 <a href="?tab=commits"{{if eq .Tab "commits"}} class="on"{{end}}>{{t "mr.commits"}}{{if .Banner}} <span class="count">{{.Banner.NCommits}}</span>{{end}}</a>
139 <a href="?tab=pipelines"{{if eq .Tab "pipelines"}} class="on"{{end}}>{{t "mr.pipelines"}}{{if .Banner}} <span class="count">{{.Banner.NPipes}}</span>{{end}}</a>
140 <a href="?tab=changes"{{if eq .Tab "changes"}} class="on"{{end}}>{{t "mr.changes"}}{{if .Banner}} <span class="count">{{.Banner.NChanges}}</span>{{end}}</a>
108 141 </p>
109 142 <section{{if ne .Tab "overview"}} hidden{{end}}>
110 143 {{if .MR.Description}}<div class="mdbody">{{.DescHTML}}</div>{{end}}
@@ -1,7 +1,7 @@
1{{define "mergeopts"}}
1{{define "mergeopts"}}
2<div class="checks">
2<div class="checks">
3 <label><input type="checkbox" name="remove_source_branch" value="1"{{if .MR.RemoveSourceBranch}} checked{{end}}> {{t "mr.remove.on"}}</label>
3 <label><input type="checkbox" name="remove_source_branch" value="1"{{if .MR.RemoveSourceBranch}} checked{{end}}> {{t "mr.remove.short"}}</label>
4 <label><input type="checkbox" name="squash" value="1"{{if .MR.Squash}} checked{{end}}> {{t "mr.squash.on"}}</label>
4 <label><input type="checkbox" name="squash" value="1"{{if .MR.Squash}} checked{{end}}> {{t "mr.squash.short"}}</label>
5 <label>{{t "mr.squash.message"}} <textarea name="squash_commit_message">{{if .MR.SquashMessage}}{{.MR.SquashMessage}}{{else}}{{.MR.Title}}{{end}}</textarea></label>
5 <label>{{t "mr.squash.message"}} <textarea name="squash_commit_message">{{if .MR.SquashMessage}}{{.MR.SquashMessage}}{{else}}{{.MR.Title}}{{end}}</textarea></label>
6</div>
6</div>
7{{end}}
7{{end}}
@@ -18,93 +18,126 @@
18
18
19{{define "mr"}}
19{{define "mr"}}
20{{template "layout-start" .}}
20{{template "layout-start" .}}
21<header class="pagehead"><h1>!{{.MR.Number}} {{.MR.Title}}</h1></header>
21<header class="mrhead">
22<p>
22 <p class="mrbadges">
23 <span class="pill">{{.MR.Status}}</span>
23 {{if .Banner}}<span class="mrstate {{.Banner.State}}">{{.Banner.StateLabel}}</span>{{else}}<span class="pill">{{.MR.Status}}</span>{{end}}
24 {{if .MR.Draft}}<span class="pill">{{t "mr.draft"}}</span>{{end}}
24 {{if .MR.Draft}}<span class="pill">{{t "mr.draft"}}</span>{{end}}
25 {{range .Labels}}<span class="pill">{{.}}</span>{{end}}
25 </p>
26 {{.MR.SourceBranch}} → {{.MR.TargetBranch}} · {{if .MR.Author}}<a href="/users/{{.MR.Author}}">{{.MR.Author}}</a>{{end}}
26 <h1>{{.MR.Title}}</h1>
27</p>
27 <p class="mrmeta">!{{.MR.Number}}{{if .Banner}} · {{.Banner.WhenLabel}}{{end}}</p>
28<h2>{{t "mr.pipeline"}}</h2>
28 {{if .Banner}}
29{{if .MRPipe}}
29 <p class="mrwant">
30{{$pipe := .MRPipe}}
30 {{if .Banner.AuthorURL}}<a class="who" href="{{.Banner.AuthorURL}}">{{if .Banner.Avatar}}<img class="avatar sm" src="{{.Banner.Avatar}}" alt="">{{else}}<span class="avatar sm">{{.Banner.Initial}}</span>{{end}}{{.Banner.Author}}</a>{{else if .Banner.Author}}<span class="avatar sm">{{.Banner.Initial}}</span> <strong>{{.Banner.Author}}</strong>{{end}}
31<div class="mrpipe">
31 <span>{{t "mr.wantsLead"}}</span>
32 <a class="pipeid" href="/{{.Repo.FullPath}}/-/pipelines/{{$pipe.ID}}">#{{$pipe.ID}}</a>
32 <strong>{{.Banner.CommitPhrase}}</strong>
33 <span class="status {{$pipe.Status}}"><span class="mark"></span>{{$pipe.Label}}</span>
33 <span>{{t "mr.wantsFrom"}}</span>
34 <div class="stages">
34 <span class="branchchip"><code>{{.MR.SourceBranch}}</code><button type="button" class="copy" data-copy="{{.MR.SourceBranch}}" aria-label="{{t "action.copy"}} {{.MR.SourceBranch}}">{{t "action.copy"}}</button></span>
35 {{range $pipe.Stages}}
35 <span>{{t "mr.wantsInto"}}</span>
36 <span class="stage">
36 <span class="branchchip"><code>{{.MR.TargetBranch}}</code><button type="button" class="copy" data-copy="{{.MR.TargetBranch}}" aria-label="{{t "action.copy"}} {{.MR.TargetBranch}}">{{t "action.copy"}}</button></span>
37 <button type="button" class="stage-dot {{.Status}}" data-stage="{{.Name}}" data-tip="{{.Tip}}" aria-label="{{.Tip}}"><span class="mark"></span></button>
37 {{if ne (t "mr.wantsTail") "-"}}<span>{{t "mr.wantsTail"}}</span>{{end}}
38 <div class="stage-pop" popover="manual">
38 </p>
39 <strong>{{t "pipe.stage"}}: {{.Name}}</strong>
39 {{end}}
40 <ul>
40 {{if .Labels}}<p class="mrchips">{{range .Labels}}<span class="pill">{{.}}</span>{{end}}</p>{{end}}
41 {{range .Jobs}}<li data-job="{{.ID}}"><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}}</a></li>{{end}}
41</header>
42 </ul>
42<section class="mrwidget">
43 <div class="rowline">
44 <h2>{{t "mr.pipeline"}}</h2>
45 {{if .MRPipe}}
46 {{$pipe := .MRPipe}}
47 <div class="mrpipe">
48 <a class="pipeid" href="/{{.Repo.FullPath}}/-/pipelines/{{$pipe.ID}}">#{{$pipe.ID}}</a>
49 <span class="status {{$pipe.Status}}"><span class="mark"></span>{{$pipe.Label}}</span>
50 <div class="stages">
51 {{range $pipe.Stages}}
52 <span class="stage">
53 <button type="button" class="stage-dot {{.Status}}" data-stage="{{.Name}}" data-tip="{{.Tip}}" aria-label="{{.Tip}}"><span class="mark"></span></button>
54 <div class="stage-pop" popover="manual">
55 <strong>{{t "pipe.stage"}}: {{.Name}}</strong>
56 <ul>
57 {{range .Jobs}}<li data-job="{{.ID}}"><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}}</a></li>{{end}}
58 </ul>
59 </div>
60 </span>
61 {{end}}
43 </div>
62 </div>
44 </span>
63 </div>
45 {{end}}
64 {{else}}<span class="muted">{{t "mr.noPipeline"}}</span>{{end}}
46 </div>
65 </div>
47</div>
66 <div class="rowline">
48{{else}}<p class="muted">{{t "mr.noPipeline"}}</p>{{end}}
67 <h2>{{t "rev.title"}}</h2>
49{{if .MergeBlocks}}
68 <div class="revblock">
50<div class="mergewhy" role="status">
69 <ul class="mrreviews">
51 <p>{{t "mr.block.why"}}</p>
70 {{range .Reviews}}<li><strong><a href="/users/{{.Username}}">{{.Username}}</a></strong> <span class="pill">{{.Label}}</span>
52 <ul>
71 {{if and $.CanDismiss (or (eq .Status "changes") (eq .Status "rejected"))}}
53 {{range .MergeBlocks}}<li>{{.}}</li>{{end}}
72 <form method="post" action="/{{$.Repo.FullPath}}/-/merge-requests/{{$.MR.Number}}/reviews/dismiss">
54 </ul>
73 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="user_id" value="{{.UserID}}">
55</div>
74 <button class="ghost" type="submit">{{t "rev.dismiss"}}</button>
56{{end}}
75 </form>
57{{if and .CanMerge (not .MergeBlocks)}}
76 {{end}}
58<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/merge">
77 </li>{{else}}<li class="muted">{{t "rev.none"}}</li>{{end}}
59 <input type="hidden" name="csrf" value="{{.CSRF}}">
78 </ul>
60 {{template "mergeopts" .}}
79 {{if .CanReview}}
61 <button type="submit">{{t "action.merge"}}</button>
80 <form class="row" method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/reviews">
62</form>
81 <input type="hidden" name="csrf" value="{{.CSRF}}">
63{{end}}
82 {{if .CanApprove}}<button type="submit" name="status" value="approved">{{t "rev.approved"}}</button>{{end}}
64{{if .CanForce}}
83 <button type="submit" name="status" value="changes">{{t "rev.changes"}}</button>
65<form class="force-merge" method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/merge">
84 <button class="ghost" type="submit" name="status" value="rejected">{{t "rev.rejected"}}</button>
66 <input type="hidden" name="csrf" value="{{.CSRF}}">
85 </form>
67 <input type="hidden" name="force" value="1">
86 {{end}}
68 <p class="flash bad">{{t "mr.force.warn"}}</p>
87 </div>
69 {{template "mergeopts" .}}
88 </div>
70 <label class="check"><input type="checkbox" name="confirm_force" value="1" required> {{t "mr.force.confirm"}}</label>
89 <div class="rowline merge">
71 <button class="ghost" type="submit">{{t "mr.force"}}</button>
90 {{if and (eq .MR.Status "merged") .Banner}}
72</form>
91 <p class="mergedby">
73{{end}}
92 {{if .Banner.MergedBy}}{{t "mr.mergedByLead"}} {{if .Banner.MergedByURL}}<a href="{{.Banner.MergedByURL}}">{{.Banner.MergedBy}}</a>{{else}}<strong>{{.Banner.MergedBy}}</strong>{{end}} {{t "mr.mergedByOn"}} {{.Banner.MergedDate}}{{else}}{{t "mr.mergedOn" .Banner.MergedDate}}{{end}}
74{{if .CanClose}}
93 {{if .Banner.MergeShort}}<span class="branchchip"><code>{{.Banner.MergeShort}}</code><button type="button" class="copy" data-copy="{{.Banner.MergeSHA}}" aria-label="{{t "action.copy"}} {{.Banner.MergeShort}}">{{t "action.copy"}}</button></span>{{end}}
75<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/close">
94 </p>
76 <input type="hidden" name="csrf" value="{{.CSRF}}"><button class="ghost" type="submit">{{t "action.close"}}</button>
95 {{else}}
77</form>
96 {{if .MergeBlocks}}
78{{end}}
97 <div class="mergewhy" role="status">
79{{if .CanReopen}}
98 <p>{{t "mr.block.why"}}</p>
80<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/reopen">
99 <ul>
81 <input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "action.reopen"}}</button>
100 {{range .MergeBlocks}}<li>{{.}}</li>{{end}}
82</form>
101 </ul>
83{{end}}
102 </div>
84<h2>{{t "rev.title"}}</h2>
103 {{end}}
85<ul class="clean">
104 {{if and .CanMerge (not .MergeBlocks)}}
86 {{range .Reviews}}<li><strong><a href="/users/{{.Username}}">{{.Username}}</a></strong> <span class="pill">{{.Label}}</span>
105 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/merge">
87 {{if and $.CanDismiss (or (eq .Status "changes") (eq .Status "rejected"))}}
106 <input type="hidden" name="csrf" value="{{.CSRF}}">
88 <form method="post" action="/{{$.Repo.FullPath}}/-/merge-requests/{{$.MR.Number}}/reviews/dismiss">
107 {{template "mergeopts" .}}
89 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="user_id" value="{{.UserID}}">
108 <button type="submit">{{t "action.merge"}}</button>
90 <button class="ghost" type="submit">{{t "rev.dismiss"}}</button>
91 </form>
109 </form>
92 {{end}}
110 {{end}}
93 </li>{{else}}<li class="muted">{{t "rev.none"}}</li>{{end}}
111 {{if .CanForce}}
94</ul>
112 <form class="force-merge" method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/merge">
95{{if .CanReview}}
113 <input type="hidden" name="csrf" value="{{.CSRF}}">
96<form class="row" method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/reviews">
114 <input type="hidden" name="force" value="1">
97 <input type="hidden" name="csrf" value="{{.CSRF}}">
115 <p class="flash bad">{{t "mr.force.warn"}}</p>
98 {{if .CanApprove}}<button type="submit" name="status" value="approved">{{t "rev.approved"}}</button>{{end}}
116 {{template "mergeopts" .}}
99 <button type="submit" name="status" value="changes">{{t "rev.changes"}}</button>
117 <label class="check"><input type="checkbox" name="confirm_force" value="1" required> {{t "mr.force.confirm"}}</label>
100 <button class="ghost" type="submit" name="status" value="rejected">{{t "rev.rejected"}}</button>
118 <button class="ghost" type="submit">{{t "mr.force"}}</button>
101</form>
119 </form>
102{{end}}
120 {{end}}
121 <div class="mergeacts">
122 {{if .CanClose}}
123 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/close">
124 <input type="hidden" name="csrf" value="{{.CSRF}}"><button class="ghost" type="submit">{{t "action.close"}}</button>
125 </form>
126 {{end}}
127 {{if .CanReopen}}
128 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/reopen">
129 <input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "action.reopen"}}</button>
130 </form>
131 {{end}}
132 </div>
133 {{end}}
134 </div>
135</section>
103<p class="sub">
136<p class="sub">
104 <a href="?tab=overview"{{if eq .Tab "overview"}} class="on"{{end}}>{{t "mr.overview"}}</a>
137 <a href="?tab=overview"{{if eq .Tab "overview"}} class="on"{{end}}>{{t "mr.overview"}}</a>
105 <a href="?tab=commits"{{if eq .Tab "commits"}} class="on"{{end}}>{{t "mr.commits"}}</a>
138 <a href="?tab=commits"{{if eq .Tab "commits"}} class="on"{{end}}>{{t "mr.commits"}}{{if .Banner}} <span class="count">{{.Banner.NCommits}}</span>{{end}}</a>
106 <a href="?tab=pipelines"{{if eq .Tab "pipelines"}} class="on"{{end}}>{{t "mr.pipelines"}}</a>
139 <a href="?tab=pipelines"{{if eq .Tab "pipelines"}} class="on"{{end}}>{{t "mr.pipelines"}}{{if .Banner}} <span class="count">{{.Banner.NPipes}}</span>{{end}}</a>
107 <a href="?tab=changes"{{if eq .Tab "changes"}} class="on"{{end}}>{{t "mr.changes"}}</a>
140 <a href="?tab=changes"{{if eq .Tab "changes"}} class="on"{{end}}>{{t "mr.changes"}}{{if .Banner}} <span class="count">{{.Banner.NChanges}}</span>{{end}}</a>
108</p>
141</p>
109<section{{if ne .Tab "overview"}} hidden{{end}}>
142<section{{if ne .Tab "overview"}} hidden{{end}}>
110 {{if .MR.Description}}<div class="mdbody">{{.DescHTML}}</div>{{end}}
143 {{if .MR.Description}}<div class="mdbody">{{.DescHTML}}</div>{{end}}