Merge branch 'feat/mr-view-ux-panels' into feat/mr-view-ux
13 files · +884 -655
M docs/merge-requests.md +14 -0
| @@ -104,3 +104,17 @@ report whether more exist; ancestry, rather than the bounded list, detects a | |||
| 104 | 104 | rewrite. Merge-request details include at most `ports.MaxMergeRequestCommits` | |
| 105 | 105 | (100) commits. These history queries remain on the merge-request service | |
| 106 | 106 | because it owns the merge-git port. | |
| 107 | + | ||
| 108 | + | ### Review page panels | |
| 109 | + | ||
| 110 | + | The main request card ends with a collapsed Commits / Checks footer. With | |
| 111 | + | scripts, arrow keys (and Home / End) switch its tabs; without scripts, opening | |
| 112 | + | the footer shows both sections. The checks summary above the diff opens the | |
| 113 | + | Checks tab and continues to update live. Commit totals use `N+` when the branch | |
| 114 | + | list is capped: the reader's existing count operation counts all reachable | |
| 115 | + | ancestors, not the source-minus-target range. | |
| 116 | + | ||
| 117 | + | The rail keeps Files (including its `g f` shortcut) and Verdicts. Merge settings | |
| 118 | + | are read-only information in the More (⋯) menu, available to every viewer. | |
| 119 | + | Signing-key information is also there when a merge box offers signed modes; | |
| 120 | + | merge actions remain restricted to their existing permissions. | |
| @@ -104,3 +104,17 @@ report whether more exist; ancestry, rather than the bounded list, detects a | |||||
| 104 | rewrite. Merge-request details include at most `ports.MaxMergeRequestCommits` | 104 | rewrite. Merge-request details include at most `ports.MaxMergeRequestCommits` | ||
| 105 | (100) commits. These history queries remain on the merge-request service | 105 | (100) commits. These history queries remain on the merge-request service | ||
| 106 | because it owns the merge-git port. | 106 | because it owns the merge-git port. | ||
| 107 | + | ||||
| 108 | + | ### Review page panels | |||
| 109 | + | ||||
| 110 | + | The main request card ends with a collapsed Commits / Checks footer. With | |||
| 111 | + | scripts, arrow keys (and Home / End) switch its tabs; without scripts, opening | |||
| 112 | + | the footer shows both sections. The checks summary above the diff opens the | |||
| 113 | + | Checks tab and continues to update live. Commit totals use `N+` when the branch | |||
| 114 | + | list is capped: the reader's existing count operation counts all reachable | |||
| 115 | + | ancestors, not the source-minus-target range. | |||
| 116 | + | ||||
| 117 | + | The rail keeps Files (including its `g f` shortcut) and Verdicts. Merge settings | |||
| 118 | + | are read-only information in the More (⋯) menu, available to every viewer. | |||
| 119 | + | Signing-key information is also there when a merge box offers signed modes; | |||
| 120 | + | merge actions remain restricted to their existing permissions. | |||
M internal/adapters/web/actions.templ +2 -2
| @@ -434,7 +434,7 @@ templ CommitChecks(c ChecksSummary) { | |||
| 434 | 434 | } | |
| 435 | 435 | ||
| 436 | 436 | // MRChecksSum is the state of the checks of a merge request in the bar above | |
| 437 | - | // the diff, a link to the checks of the rail. The event stream replaces it | |
| 437 | + | // the diff, a link to the checks of the card footer. The event stream replaces it | |
| 438 | 438 | // with the checks section (same event, fragments.go). | |
| 439 | 439 | templ MRChecksSum(c ChecksSummary) { | |
| 440 | 440 | <a class="ck-sum mr-ck" id="mr-ck" href="#mr-checks" title={ c.Title }> | |
| @@ -447,7 +447,7 @@ templ MRChecksSum(c ChecksSummary) { | |||
| 447 | 447 | </a> | |
| 448 | 448 | } | |
| 449 | 449 | ||
| 450 | - | // MRChecks is the checks section of the rail of a merge request. | |
| 450 | + | // MRChecks is the checks section of the footer of a merge request. | |
| 451 | 451 | templ MRChecks(c ChecksSection) { | |
| 452 | 452 | <section aria-labelledby="r-checks" id="mr-checks"> | |
| 453 | 453 | <h2 id="r-checks">Checks <span class="count">{ itoa(len(c.Rows)) }</span></h2> | |
| @@ -434,7 +434,7 @@ templ CommitChecks(c ChecksSummary) { | |||||
| 434 | } | 434 | } | ||
| 435 | 435 | ||||
| 436 | // MRChecksSum is the state of the checks of a merge request in the bar above | 436 | // MRChecksSum is the state of the checks of a merge request in the bar above | ||
| 437 | - | // the diff, a link to the checks of the rail. The event stream replaces it | 437 | + | // the diff, a link to the checks of the card footer. The event stream replaces it |
| 438 | // with the checks section (same event, fragments.go). | 438 | // with the checks section (same event, fragments.go). | ||
| 439 | templ MRChecksSum(c ChecksSummary) { | 439 | templ MRChecksSum(c ChecksSummary) { | ||
| 440 | <a class="ck-sum mr-ck" id="mr-ck" href="#mr-checks" title={ c.Title }> | 440 | <a class="ck-sum mr-ck" id="mr-ck" href="#mr-checks" title={ c.Title }> | ||
| @@ -447,7 +447,7 @@ templ MRChecksSum(c ChecksSummary) { | |||||
| 447 | </a> | 447 | </a> | ||
| 448 | } | 448 | } | ||
| 449 | 449 | ||||
| 450 | - | // MRChecks is the checks section of the rail of a merge request. | 450 | + | // MRChecks is the checks section of the footer of a merge request. |
| 451 | templ MRChecks(c ChecksSection) { | 451 | templ MRChecks(c ChecksSection) { | ||
| 452 | <section aria-labelledby="r-checks" id="mr-checks"> | 452 | <section aria-labelledby="r-checks" id="mr-checks"> | ||
| 453 | <h2 id="r-checks">Checks <span class="count">{ itoa(len(c.Rows)) }</span></h2> | 453 | <h2 id="r-checks">Checks <span class="count">{ itoa(len(c.Rows)) }</span></h2> | ||
M internal/adapters/web/actions_templ.go +2 -2 generated file: collapsed
M internal/adapters/web/checks.go +1 -1
| @@ -81,7 +81,7 @@ func checksSummary(repo domain.RepoName, sha string, checks []ports.CheckView) C | |||
| 81 | 81 | return sum | |
| 82 | 82 | } | |
| 83 | 83 | ||
| 84 | - | // checksSection is the checks of the rail of a merge request, with the rule of | |
| 84 | + | // checksSection is the checks of the footer of a merge request, with the rule of | |
| 85 | 85 | // the repository that applies to them. | |
| 86 | 86 | func checksSection(repo domain.Repo, checks []ports.CheckView) ChecksSection { | |
| 87 | 87 | sec := ChecksSection{} | |
| @@ -81,7 +81,7 @@ func checksSummary(repo domain.RepoName, sha string, checks []ports.CheckView) C | |||||
| 81 | return sum | 81 | return sum | ||
| 82 | } | 82 | } | ||
| 83 | 83 | ||||
| 84 | - | // checksSection is the checks of the rail of a merge request, with the rule of | 84 | + | // checksSection is the checks of the footer of a merge request, with the rule of |
| 85 | // the repository that applies to them. | 85 | // the repository that applies to them. | ||
| 86 | func checksSection(repo domain.Repo, checks []ports.CheckView) ChecksSection { | 86 | func checksSection(repo domain.Repo, checks []ports.CheckView) ChecksSection { | ||
| 87 | sec := ChecksSection{} | 87 | sec := ChecksSection{} | ||
M internal/adapters/web/jstest/mr.test.mjs +43 -0
| @@ -92,3 +92,46 @@ for (const dataset of [{diff:'split'}, {view:'split'}]) test(`reveal selects the | |||
| 92 | 92 | globalThis.requestAnimationFrame=savedRAF; | |
| 93 | 93 | } | |
| 94 | 94 | }); | |
| 95 | + | ||
| 96 | + | test('footer tabs switch panels, support arrows, and open on checks hash', () => { | |
| 97 | + | const oldDocument = globalThis.document; | |
| 98 | + | const oldLocation = globalThis.location; | |
| 99 | + | const oldAdd = globalThis.addEventListener; | |
| 100 | + | const listeners = {}; | |
| 101 | + | const node = (id) => ({ id, attrs: {}, events: {}, hidden: false, | |
| 102 | + | setAttribute(k,v) { this.attrs[k]=v; }, | |
| 103 | + | addEventListener(k,v) { this.events[k]=v; }, focus() { this.focused=true; } }); | |
| 104 | + | const tabs = [node('mr-tab-commits'), node('mr-tab-checks')]; | |
| 105 | + | const panels = [node('mr-commits'), node('mr-checks-panel')]; | |
| 106 | + | const footer = node('mr-panels'); footer.open=false; | |
| 107 | + | const nav = node('tabs'); nav.querySelectorAll=()=>tabs; | |
| 108 | + | footer.querySelectorAll=()=>panels; | |
| 109 | + | globalThis.document = {querySelector: (s) => s === '#mr-panels' ? footer : s === '[data-mr-tabs]' ? nav : null, | |
| 110 | + | addEventListener(k,v) {listeners[k]=v;} }; | |
| 111 | + | globalThis.location = {hash:''}; | |
| 112 | + | globalThis.addEventListener = (k,v) => {listeners[k]=v;}; | |
| 113 | + | try { | |
| 114 | + | window.ermiteMR.panels(); | |
| 115 | + | assert.equal(footer.open,false); | |
| 116 | + | assert.equal(panels[0].hidden,false); | |
| 117 | + | assert.equal(panels[1].hidden,true); | |
| 118 | + | tabs[1].events.click({preventDefault(){}}); | |
| 119 | + | assert.equal(panels[0].hidden,true); | |
| 120 | + | assert.equal(tabs[1].attrs['aria-selected'],'true'); | |
| 121 | + | tabs[1].events.keydown({key:'ArrowRight',preventDefault(){}}); | |
| 122 | + | assert.equal(tabs[0].focused,true); | |
| 123 | + | assert.equal(panels[0].hidden,false); | |
| 124 | + | location.hash='#mr-checks'; listeners.hashchange(); | |
| 125 | + | assert.equal(footer.open,true); | |
| 126 | + | assert.equal(panels[1].hidden,false); | |
| 127 | + | footer.open=false; | |
| 128 | + | listeners.click({target:{closest:()=>true}}); | |
| 129 | + | assert.equal(footer.open,true); | |
| 130 | + | assert.equal(C.tabIndex('Home',1,2),0); | |
| 131 | + | assert.equal(C.tabIndex('End',0,2),1); | |
| 132 | + | assert.equal(C.tabIndex('ArrowLeft',0,2),1); | |
| 133 | + | assert.equal(C.tabIndex('Escape',0,2),null); | |
| 134 | + | } finally { | |
| 135 | + | globalThis.document=oldDocument; globalThis.location=oldLocation; globalThis.addEventListener=oldAdd; | |
| 136 | + | } | |
| 137 | + | }); | |
| @@ -92,3 +92,46 @@ for (const dataset of [{diff:'split'}, {view:'split'}]) test(`reveal selects the | |||||
| 92 | globalThis.requestAnimationFrame=savedRAF; | 92 | globalThis.requestAnimationFrame=savedRAF; | ||
| 93 | } | 93 | } | ||
| 94 | }); | 94 | }); | ||
| 95 | + | ||||
| 96 | + | test('footer tabs switch panels, support arrows, and open on checks hash', () => { | |||
| 97 | + | const oldDocument = globalThis.document; | |||
| 98 | + | const oldLocation = globalThis.location; | |||
| 99 | + | const oldAdd = globalThis.addEventListener; | |||
| 100 | + | const listeners = {}; | |||
| 101 | + | const node = (id) => ({ id, attrs: {}, events: {}, hidden: false, | |||
| 102 | + | setAttribute(k,v) { this.attrs[k]=v; }, | |||
| 103 | + | addEventListener(k,v) { this.events[k]=v; }, focus() { this.focused=true; } }); | |||
| 104 | + | const tabs = [node('mr-tab-commits'), node('mr-tab-checks')]; | |||
| 105 | + | const panels = [node('mr-commits'), node('mr-checks-panel')]; | |||
| 106 | + | const footer = node('mr-panels'); footer.open=false; | |||
| 107 | + | const nav = node('tabs'); nav.querySelectorAll=()=>tabs; | |||
| 108 | + | footer.querySelectorAll=()=>panels; | |||
| 109 | + | globalThis.document = {querySelector: (s) => s === '#mr-panels' ? footer : s === '[data-mr-tabs]' ? nav : null, | |||
| 110 | + | addEventListener(k,v) {listeners[k]=v;} }; | |||
| 111 | + | globalThis.location = {hash:''}; | |||
| 112 | + | globalThis.addEventListener = (k,v) => {listeners[k]=v;}; | |||
| 113 | + | try { | |||
| 114 | + | window.ermiteMR.panels(); | |||
| 115 | + | assert.equal(footer.open,false); | |||
| 116 | + | assert.equal(panels[0].hidden,false); | |||
| 117 | + | assert.equal(panels[1].hidden,true); | |||
| 118 | + | tabs[1].events.click({preventDefault(){}}); | |||
| 119 | + | assert.equal(panels[0].hidden,true); | |||
| 120 | + | assert.equal(tabs[1].attrs['aria-selected'],'true'); | |||
| 121 | + | tabs[1].events.keydown({key:'ArrowRight',preventDefault(){}}); | |||
| 122 | + | assert.equal(tabs[0].focused,true); | |||
| 123 | + | assert.equal(panels[0].hidden,false); | |||
| 124 | + | location.hash='#mr-checks'; listeners.hashchange(); | |||
| 125 | + | assert.equal(footer.open,true); | |||
| 126 | + | assert.equal(panels[1].hidden,false); | |||
| 127 | + | footer.open=false; | |||
| 128 | + | listeners.click({target:{closest:()=>true}}); | |||
| 129 | + | assert.equal(footer.open,true); | |||
| 130 | + | assert.equal(C.tabIndex('Home',1,2),0); | |||
| 131 | + | assert.equal(C.tabIndex('End',0,2),1); | |||
| 132 | + | assert.equal(C.tabIndex('ArrowLeft',0,2),1); | |||
| 133 | + | assert.equal(C.tabIndex('Escape',0,2),null); | |||
| 134 | + | } finally { | |||
| 135 | + | globalThis.document=oldDocument; globalThis.location=oldLocation; globalThis.addEventListener=oldAdd; | |||
| 136 | + | } | |||
| 137 | + | }); | |||
M internal/adapters/web/mr.go +3 -0
| @@ -291,6 +291,7 @@ type MRPage struct { | |||
| 291 | 291 | ||
| 292 | 292 | Commits []MRCommit | |
| 293 | 293 | CommitsNote string | |
| 294 | + | CommitCount string | |
| 294 | 295 | Modes []string | |
| 295 | 296 | ChecksBlock bool | |
| 296 | 297 | // Checks are the CI checks of the head of the request, ChecksSum their | |
| @@ -734,7 +735,9 @@ func (s *Server) mrReadPresentation(p *MRPage, name string, n int64, res ports.M | |||
| 734 | 735 | }) | |
| 735 | 736 | } | |
| 736 | 737 | lastRead := res.LastReadID.String() | |
| 738 | + | p.CommitCount = itoa(len(p.Commits)) | |
| 737 | 739 | if res.CommitsTruncated { | |
| 740 | + | p.CommitCount += "+" | |
| 738 | 741 | p.CommitsNote = "the branch has more commits than the " + itoa(len(p.Commits)) + " listed." | |
| 739 | 742 | } | |
| 740 | 743 | ||
| @@ -291,6 +291,7 @@ type MRPage struct { | |||||
| 291 | 291 | ||||
| 292 | Commits []MRCommit | 292 | Commits []MRCommit | ||
| 293 | CommitsNote string | 293 | CommitsNote string | ||
| 294 | + | CommitCount string | |||
| 294 | Modes []string | 295 | Modes []string | ||
| 295 | ChecksBlock bool | 296 | ChecksBlock bool | ||
| 296 | // Checks are the CI checks of the head of the request, ChecksSum their | 297 | // Checks are the CI checks of the head of the request, ChecksSum their | ||
| @@ -734,7 +735,9 @@ func (s *Server) mrReadPresentation(p *MRPage, name string, n int64, res ports.M | |||||
| 734 | }) | 735 | }) | ||
| 735 | } | 736 | } | ||
| 736 | lastRead := res.LastReadID.String() | 737 | lastRead := res.LastReadID.String() | ||
| 738 | + | p.CommitCount = itoa(len(p.Commits)) | |||
| 737 | if res.CommitsTruncated { | 739 | if res.CommitsTruncated { | ||
| 740 | + | p.CommitCount += "+" | |||
| 738 | p.CommitsNote = "the branch has more commits than the " + itoa(len(p.Commits)) + " listed." | 741 | p.CommitsNote = "the branch has more commits than the " + itoa(len(p.Commits)) + " listed." | ||
| 739 | } | 742 | } | ||
| 740 | 743 | ||||
M internal/adapters/web/mr.templ +105 -82
| @@ -147,6 +147,7 @@ templ MergeRequest(l Layout, p MRPage) { | |||
| 147 | 147 | @templ.Raw(string(p.Desc)) | |
| 148 | 148 | </article> | |
| 149 | 149 | } | |
| 150 | + | @mrFooter(p) | |
| 150 | 151 | </section> | |
| 151 | 152 | if p.Deleting != "" { | |
| 152 | 153 | <p class="note" role="status">merged. the branch { p.Deleting } is being deleted.</p> | |
| @@ -366,6 +367,65 @@ templ commentForm(f CommentForm, suffix string) { | |||
| 366 | 367 | </form> | |
| 367 | 368 | } | |
| 368 | 369 | ||
| 370 | + | templ mrFooter(p MRPage) { | |
| 371 | + | <footer class="mr-footer"> | |
| 372 | + | <details id="mr-panels"> | |
| 373 | + | <summary>Commits <span class="count">{ p.CommitCount }</span> · Checks</summary> | |
| 374 | + | <nav data-mr-tabs aria-label="Branch details"> | |
| 375 | + | <a id="mr-tab-commits" href="#mr-commits">Commits <span class="count">{ p.CommitCount }</span></a> | |
| 376 | + | <a id="mr-tab-checks" href="#mr-checks"> | |
| 377 | + | { "Checks " } | |
| 378 | + | <span data-checks-label> | |
| 379 | + | if p.ChecksSum.Total > 0 { | |
| 380 | + | { p.ChecksSum.Title } | |
| 381 | + | } else { | |
| 382 | + | no checks | |
| 383 | + | } | |
| 384 | + | </span> | |
| 385 | + | </a> | |
| 386 | + | </nav> | |
| 387 | + | <div id="mr-commits" data-mr-panel aria-labelledby="mr-tab-commits"> | |
| 388 | + | <table class="mr-commits"> | |
| 389 | + | <thead><tr><th>Commit</th><th>Subject</th><th>Author</th><th>Date</th><th>Signature</th><th>Status</th></tr></thead> | |
| 390 | + | <tbody> | |
| 391 | + | for _, c := range p.Commits { | |
| 392 | + | <tr data-new?={ c.New }> | |
| 393 | + | <td><a href={ templ.SafeURL(c.Href) }>{ c.Short }</a></td> | |
| 394 | + | <td>{ c.Subject }</td> | |
| 395 | + | <td>{ c.Author }</td> | |
| 396 | + | <td> | |
| 397 | + | if c.WhenAt != "" { | |
| 398 | + | <time datetime={ c.WhenAt }>{ c.When }</time> | |
| 399 | + | } | |
| 400 | + | </td> | |
| 401 | + | <td> | |
| 402 | + | if c.Sig != nil { | |
| 403 | + | @signaturePill(c.Sig) | |
| 404 | + | } | |
| 405 | + | </td> | |
| 406 | + | <td> | |
| 407 | + | if c.New { | |
| 408 | + | <span>new</span> | |
| 409 | + | } | |
| 410 | + | </td> | |
| 411 | + | </tr> | |
| 412 | + | } | |
| 413 | + | </tbody> | |
| 414 | + | </table> | |
| 415 | + | if len(p.Commits) == 0 { | |
| 416 | + | <p class="dim">no commit to merge.</p> | |
| 417 | + | } | |
| 418 | + | if p.CommitsNote != "" { | |
| 419 | + | <p class="note">{ p.CommitsNote }</p> | |
| 420 | + | } | |
| 421 | + | </div> | |
| 422 | + | <div id="mr-checks-panel" data-mr-panel aria-labelledby="mr-tab-checks"> | |
| 423 | + | @MRChecks(p.Checks) | |
| 424 | + | </div> | |
| 425 | + | </details> | |
| 426 | + | </footer> | |
| 427 | + | } | |
| 428 | + | ||
| 369 | 429 | templ mrRail(p MRPage) { | |
| 370 | 430 | <section aria-labelledby="r-files" class="r-files"> | |
| 371 | 431 | <h2 id="r-files"> | |
| @@ -391,51 +451,6 @@ templ mrRail(p MRPage) { | |||
| 391 | 451 | </ul> | |
| 392 | 452 | </section> | |
| 393 | 453 | } | |
| 394 | - | @MRChecks(p.Checks) | |
| 395 | - | <section aria-labelledby="r-commits"> | |
| 396 | - | <h2 id="r-commits">Commits <span class="count">{ itoa(len(p.Commits)) }</span></h2> | |
| 397 | - | <ul class="pcommits"> | |
| 398 | - | for _, c := range p.Commits { | |
| 399 | - | <li data-new?={ c.New }> | |
| 400 | - | <a href={ templ.SafeURL(c.Href) }>{ c.Short }</a> | |
| 401 | - | <span class="s">{ c.Subject }</span> | |
| 402 | - | if c.Sig != nil { | |
| 403 | - | @signaturePill(c.Sig) | |
| 404 | - | } | |
| 405 | - | <span class="mute"> | |
| 406 | - | { c.Author } | |
| 407 | - | if c.WhenAt != "" { | |
| 408 | - | { " · " }<time datetime={ c.WhenAt }>{ c.When }</time> | |
| 409 | - | } | |
| 410 | - | if c.New { | |
| 411 | - | { " · new" } | |
| 412 | - | } | |
| 413 | - | </span> | |
| 414 | - | </li> | |
| 415 | - | } | |
| 416 | - | </ul> | |
| 417 | - | if len(p.Commits) == 0 { | |
| 418 | - | <p class="dim">no commit to merge.</p> | |
| 419 | - | } | |
| 420 | - | if p.CommitsNote != "" { | |
| 421 | - | <p class="note">{ p.CommitsNote }</p> | |
| 422 | - | } | |
| 423 | - | </section> | |
| 424 | - | <section aria-labelledby="r-settings"> | |
| 425 | - | <h2 id="r-settings">Settings</h2> | |
| 426 | - | <dl class="kv"> | |
| 427 | - | <dt>modes</dt> | |
| 428 | - | <dd>{ strings.Join(p.Modes, ", ") }</dd> | |
| 429 | - | <dt>checks</dt> | |
| 430 | - | <dd> | |
| 431 | - | if p.ChecksBlock { | |
| 432 | - | failing ones block the merge | |
| 433 | - | } else { | |
| 434 | - | do not block the merge | |
| 435 | - | } | |
| 436 | - | </dd> | |
| 437 | - | </dl> | |
| 438 | - | </section> | |
| 439 | 454 | } | |
| 440 | 455 | ||
| 441 | 456 | // mrBar is the bar above the diff, which follows the review: the totals, the | |
| @@ -450,8 +465,8 @@ templ mrBar(p MRPage) { | |||
| 450 | 465 | @MRChecksSum(p.ChecksSum) | |
| 451 | 466 | if p.Box != nil { | |
| 452 | 467 | @mergeMenu(p) | |
| 453 | - | @moreMenu(p) | |
| 454 | 468 | } | |
| 469 | + | @moreMenu(p) | |
| 455 | 470 | </div> | |
| 456 | 471 | } | |
| 457 | 472 | ||
| @@ -474,18 +489,9 @@ templ mergeMenu(p MRPage) { | |||
| 474 | 489 | <kbd aria-hidden="true">M</kbd> | |
| 475 | 490 | </summary> | |
| 476 | 491 | <div class="menu-pop" role="group" aria-label="Merge"> | |
| 477 | - | <dl class="kv"> | |
| 478 | - | <dt>head</dt> | |
| 479 | - | <dd> | |
| 480 | - | if p.Box.HeadGone { | |
| 481 | - | gone: the source branch was deleted | |
| 482 | - | } else { | |
| 483 | - | { p.HeadShort } | |
| 484 | - | } | |
| 485 | - | </dd> | |
| 486 | - | <dt>into</dt> | |
| 487 | - | <dd>{ p.Target }</dd> | |
| 488 | - | </dl> | |
| 492 | + | if p.Box.HeadGone { | |
| 493 | + | <p class="dim">the source branch was deleted</p> | |
| 494 | + | } | |
| 489 | 495 | if p.Box.Error != "" { | |
| 490 | 496 | <p class="d-err" role="alert">{ p.Box.Error }</p> | |
| 491 | 497 | } | |
| @@ -519,15 +525,6 @@ templ mergeMenu(p MRPage) { | |||
| 519 | 525 | </label> | |
| 520 | 526 | } | |
| 521 | 527 | </fieldset> | |
| 522 | - | if p.Box.Signed { | |
| 523 | - | <p class="d-note" id="mr-signing"> | |
| 524 | - | squash and merge commits are signed with ermite's own key (generated on first start). | |
| 525 | - | if p.Box.Fingerprint != "" { | |
| 526 | - | fingerprint <code>{ p.Box.Fingerprint }</code> | |
| 527 | - | } | |
| 528 | - | <code>ermite signing-key show</code> prints it. | |
| 529 | - | </p> | |
| 530 | - | } | |
| 531 | 528 | if p.Box.CanDeleteBranch { | |
| 532 | 529 | <label class="d-check"><input type="checkbox" name="delete_branch" value="1"/> delete { p.Source } after the merge <kbd aria-hidden="true">D</kbd></label> | |
| 533 | 530 | } | |
| @@ -589,26 +586,52 @@ templ MRMergeabilityFragment(v MergeabilityView) { | |||
| 589 | 586 | @mrMergeabilitySlot(v) | |
| 590 | 587 | } | |
| 591 | 588 | ||
| 592 | - | // moreMenu is what else the owner does with an open request: mark the head | |
| 593 | - | // read, close it, merge it from a terminal. | |
| 589 | + | // moreMenu shows read-only settings to every viewer, and keeps owner actions | |
| 590 | + | // behind the same merge-box permission as before. | |
| 594 | 591 | templ moreMenu(p MRPage) { | |
| 595 | 592 | <details class="menu omenu"> | |
| 596 | 593 | <summary class="btn icon" aria-label="More actions" title="more actions">⋯</summary> | |
| 597 | 594 | <div class="menu-pop" role="group" aria-label="More actions"> | |
| 598 | - | if p.Box.CanMarkRead { | |
| 599 | - | <form method="post" action={ templ.SafeURL(p.Box.ReadAction) }> | |
| 600 | - | <input type="hidden" name="head_id" value={ p.Box.Head }/> | |
| 601 | - | <button type="submit" title="the next visit can show only what changed after this head" class="btn" aria-keyshortcuts="Shift+R" data-read>Mark read <kbd aria-hidden="true">R</kbd></button> | |
| 595 | + | <section class="merge-settings"> | |
| 596 | + | <h2>Merge settings</h2> | |
| 597 | + | <dl class="kv"> | |
| 598 | + | <dt>modes</dt> | |
| 599 | + | <dd>{ strings.Join(p.Modes, ", ") }</dd> | |
| 600 | + | <dt>checks</dt> | |
| 601 | + | <dd> | |
| 602 | + | if p.ChecksBlock { | |
| 603 | + | failing ones block the merge | |
| 604 | + | } else { | |
| 605 | + | do not block the merge | |
| 606 | + | } | |
| 607 | + | </dd> | |
| 608 | + | </dl> | |
| 609 | + | </section> | |
| 610 | + | if p.Box != nil { | |
| 611 | + | if p.Box.Signed { | |
| 612 | + | <p class="d-note" id="mr-signing"> | |
| 613 | + | squash and merge commits are signed with ermite's own key (generated on first start). | |
| 614 | + | if p.Box.Fingerprint != "" { | |
| 615 | + | fingerprint <code>{ p.Box.Fingerprint }</code> | |
| 616 | + | } | |
| 617 | + | <code>ermite signing-key show</code> prints it. | |
| 618 | + | </p> | |
| 619 | + | } | |
| 620 | + | if p.Box.CanMarkRead { | |
| 621 | + | <form method="post" action={ templ.SafeURL(p.Box.ReadAction) }> | |
| 622 | + | <input type="hidden" name="head_id" value={ p.Box.Head }/> | |
| 623 | + | <button type="submit" title="the next visit can show only what changed after this head" class="btn" aria-keyshortcuts="Shift+R" data-read>Mark read <kbd aria-hidden="true">R</kbd></button> | |
| 624 | + | </form> | |
| 625 | + | } | |
| 626 | + | <form method="post" action={ templ.SafeURL(p.Box.CloseAction) }> | |
| 627 | + | <button type="submit" title="close without merging; the branch is kept" class="btn danger">Close</button> | |
| 602 | 628 | </form> | |
| 603 | - | } | |
| 604 | - | <form method="post" action={ templ.SafeURL(p.Box.CloseAction) }> | |
| 605 | - | <button type="submit" title="close without merging; the branch is kept" class="btn danger">Close</button> | |
| 606 | - | </form> | |
| 607 | - | if !p.Box.HeadGone && p.Box.ReadyAction == "" { | |
| 608 | - | <details class="d-or"> | |
| 609 | - | <summary class="mute">or from a terminal</summary> | |
| 610 | - | @CloneBlock(p.Box.CLI) | |
| 611 | - | </details> | |
| 629 | + | if !p.Box.HeadGone && p.Box.ReadyAction == "" { | |
| 630 | + | <details class="d-or"> | |
| 631 | + | <summary class="mute">or from a terminal</summary> | |
| 632 | + | @CloneBlock(p.Box.CLI) | |
| 633 | + | </details> | |
| 634 | + | } | |
| 612 | 635 | } | |
| 613 | 636 | </div> | |
| 614 | 637 | </details> | |
| @@ -147,6 +147,7 @@ templ MergeRequest(l Layout, p MRPage) { | |||||
| 147 | @templ.Raw(string(p.Desc)) | 147 | @templ.Raw(string(p.Desc)) | ||
| 148 | </article> | 148 | </article> | ||
| 149 | } | 149 | } | ||
| 150 | + | @mrFooter(p) | |||
| 150 | </section> | 151 | </section> | ||
| 151 | if p.Deleting != "" { | 152 | if p.Deleting != "" { | ||
| 152 | <p class="note" role="status">merged. the branch { p.Deleting } is being deleted.</p> | 153 | <p class="note" role="status">merged. the branch { p.Deleting } is being deleted.</p> | ||
| @@ -366,6 +367,65 @@ templ commentForm(f CommentForm, suffix string) { | |||||
| 366 | </form> | 367 | </form> | ||
| 367 | } | 368 | } | ||
| 368 | 369 | ||||
| 370 | + | templ mrFooter(p MRPage) { | |||
| 371 | + | <footer class="mr-footer"> | |||
| 372 | + | <details id="mr-panels"> | |||
| 373 | + | <summary>Commits <span class="count">{ p.CommitCount }</span> · Checks</summary> | |||
| 374 | + | <nav data-mr-tabs aria-label="Branch details"> | |||
| 375 | + | <a id="mr-tab-commits" href="#mr-commits">Commits <span class="count">{ p.CommitCount }</span></a> | |||
| 376 | + | <a id="mr-tab-checks" href="#mr-checks"> | |||
| 377 | + | { "Checks " } | |||
| 378 | + | <span data-checks-label> | |||
| 379 | + | if p.ChecksSum.Total > 0 { | |||
| 380 | + | { p.ChecksSum.Title } | |||
| 381 | + | } else { | |||
| 382 | + | no checks | |||
| 383 | + | } | |||
| 384 | + | </span> | |||
| 385 | + | </a> | |||
| 386 | + | </nav> | |||
| 387 | + | <div id="mr-commits" data-mr-panel aria-labelledby="mr-tab-commits"> | |||
| 388 | + | <table class="mr-commits"> | |||
| 389 | + | <thead><tr><th>Commit</th><th>Subject</th><th>Author</th><th>Date</th><th>Signature</th><th>Status</th></tr></thead> | |||
| 390 | + | <tbody> | |||
| 391 | + | for _, c := range p.Commits { | |||
| 392 | + | <tr data-new?={ c.New }> | |||
| 393 | + | <td><a href={ templ.SafeURL(c.Href) }>{ c.Short }</a></td> | |||
| 394 | + | <td>{ c.Subject }</td> | |||
| 395 | + | <td>{ c.Author }</td> | |||
| 396 | + | <td> | |||
| 397 | + | if c.WhenAt != "" { | |||
| 398 | + | <time datetime={ c.WhenAt }>{ c.When }</time> | |||
| 399 | + | } | |||
| 400 | + | </td> | |||
| 401 | + | <td> | |||
| 402 | + | if c.Sig != nil { | |||
| 403 | + | @signaturePill(c.Sig) | |||
| 404 | + | } | |||
| 405 | + | </td> | |||
| 406 | + | <td> | |||
| 407 | + | if c.New { | |||
| 408 | + | <span>new</span> | |||
| 409 | + | } | |||
| 410 | + | </td> | |||
| 411 | + | </tr> | |||
| 412 | + | } | |||
| 413 | + | </tbody> | |||
| 414 | + | </table> | |||
| 415 | + | if len(p.Commits) == 0 { | |||
| 416 | + | <p class="dim">no commit to merge.</p> | |||
| 417 | + | } | |||
| 418 | + | if p.CommitsNote != "" { | |||
| 419 | + | <p class="note">{ p.CommitsNote }</p> | |||
| 420 | + | } | |||
| 421 | + | </div> | |||
| 422 | + | <div id="mr-checks-panel" data-mr-panel aria-labelledby="mr-tab-checks"> | |||
| 423 | + | @MRChecks(p.Checks) | |||
| 424 | + | </div> | |||
| 425 | + | </details> | |||
| 426 | + | </footer> | |||
| 427 | + | } | |||
| 428 | + | ||||
| 369 | templ mrRail(p MRPage) { | 429 | templ mrRail(p MRPage) { | ||
| 370 | <section aria-labelledby="r-files" class="r-files"> | 430 | <section aria-labelledby="r-files" class="r-files"> | ||
| 371 | <h2 id="r-files"> | 431 | <h2 id="r-files"> | ||
| @@ -391,51 +451,6 @@ templ mrRail(p MRPage) { | |||||
| 391 | </ul> | 451 | </ul> | ||
| 392 | </section> | 452 | </section> | ||
| 393 | } | 453 | } | ||
| 394 | - | @MRChecks(p.Checks) | |||
| 395 | - | <section aria-labelledby="r-commits"> | |||
| 396 | - | <h2 id="r-commits">Commits <span class="count">{ itoa(len(p.Commits)) }</span></h2> | |||
| 397 | - | <ul class="pcommits"> | |||
| 398 | - | for _, c := range p.Commits { | |||
| 399 | - | <li data-new?={ c.New }> | |||
| 400 | - | <a href={ templ.SafeURL(c.Href) }>{ c.Short }</a> | |||
| 401 | - | <span class="s">{ c.Subject }</span> | |||
| 402 | - | if c.Sig != nil { | |||
| 403 | - | @signaturePill(c.Sig) | |||
| 404 | - | } | |||
| 405 | - | <span class="mute"> | |||
| 406 | - | { c.Author } | |||
| 407 | - | if c.WhenAt != "" { | |||
| 408 | - | { " · " }<time datetime={ c.WhenAt }>{ c.When }</time> | |||
| 409 | - | } | |||
| 410 | - | if c.New { | |||
| 411 | - | { " · new" } | |||
| 412 | - | } | |||
| 413 | - | </span> | |||
| 414 | - | </li> | |||
| 415 | - | } | |||
| 416 | - | </ul> | |||
| 417 | - | if len(p.Commits) == 0 { | |||
| 418 | - | <p class="dim">no commit to merge.</p> | |||
| 419 | - | } | |||
| 420 | - | if p.CommitsNote != "" { | |||
| 421 | - | <p class="note">{ p.CommitsNote }</p> | |||
| 422 | - | } | |||
| 423 | - | </section> | |||
| 424 | - | <section aria-labelledby="r-settings"> | |||
| 425 | - | <h2 id="r-settings">Settings</h2> | |||
| 426 | - | <dl class="kv"> | |||
| 427 | - | <dt>modes</dt> | |||
| 428 | - | <dd>{ strings.Join(p.Modes, ", ") }</dd> | |||
| 429 | - | <dt>checks</dt> | |||
| 430 | - | <dd> | |||
| 431 | - | if p.ChecksBlock { | |||
| 432 | - | failing ones block the merge | |||
| 433 | - | } else { | |||
| 434 | - | do not block the merge | |||
| 435 | - | } | |||
| 436 | - | </dd> | |||
| 437 | - | </dl> | |||
| 438 | - | </section> | |||
| 439 | } | 454 | } | ||
| 440 | 455 | ||||
| 441 | // mrBar is the bar above the diff, which follows the review: the totals, the | 456 | // mrBar is the bar above the diff, which follows the review: the totals, the | ||
| @@ -450,8 +465,8 @@ templ mrBar(p MRPage) { | |||||
| 450 | @MRChecksSum(p.ChecksSum) | 465 | @MRChecksSum(p.ChecksSum) | ||
| 451 | if p.Box != nil { | 466 | if p.Box != nil { | ||
| 452 | @mergeMenu(p) | 467 | @mergeMenu(p) | ||
| 453 | - | @moreMenu(p) | |||
| 454 | } | 468 | } | ||
| 469 | + | @moreMenu(p) | |||
| 455 | </div> | 470 | </div> | ||
| 456 | } | 471 | } | ||
| 457 | 472 | ||||
| @@ -474,18 +489,9 @@ templ mergeMenu(p MRPage) { | |||||
| 474 | <kbd aria-hidden="true">M</kbd> | 489 | <kbd aria-hidden="true">M</kbd> | ||
| 475 | </summary> | 490 | </summary> | ||
| 476 | <div class="menu-pop" role="group" aria-label="Merge"> | 491 | <div class="menu-pop" role="group" aria-label="Merge"> | ||
| 477 | - | <dl class="kv"> | 492 | + | if p.Box.HeadGone { |
| 478 | - | <dt>head</dt> | 493 | + | <p class="dim">the source branch was deleted</p> |
| 479 | - | <dd> | 494 | + | } |
| 480 | - | if p.Box.HeadGone { | |||
| 481 | - | gone: the source branch was deleted | |||
| 482 | - | } else { | |||
| 483 | - | { p.HeadShort } | |||
| 484 | - | } | |||
| 485 | - | </dd> | |||
| 486 | - | <dt>into</dt> | |||
| 487 | - | <dd>{ p.Target }</dd> | |||
| 488 | - | </dl> | |||
| 489 | if p.Box.Error != "" { | 495 | if p.Box.Error != "" { | ||
| 490 | <p class="d-err" role="alert">{ p.Box.Error }</p> | 496 | <p class="d-err" role="alert">{ p.Box.Error }</p> | ||
| 491 | } | 497 | } | ||
| @@ -519,15 +525,6 @@ templ mergeMenu(p MRPage) { | |||||
| 519 | </label> | 525 | </label> | ||
| 520 | } | 526 | } | ||
| 521 | </fieldset> | 527 | </fieldset> | ||
| 522 | - | if p.Box.Signed { | |||
| 523 | - | <p class="d-note" id="mr-signing"> | |||
| 524 | - | squash and merge commits are signed with ermite's own key (generated on first start). | |||
| 525 | - | if p.Box.Fingerprint != "" { | |||
| 526 | - | fingerprint <code>{ p.Box.Fingerprint }</code> | |||
| 527 | - | } | |||
| 528 | - | <code>ermite signing-key show</code> prints it. | |||
| 529 | - | </p> | |||
| 530 | - | } | |||
| 531 | if p.Box.CanDeleteBranch { | 528 | if p.Box.CanDeleteBranch { | ||
| 532 | <label class="d-check"><input type="checkbox" name="delete_branch" value="1"/> delete { p.Source } after the merge <kbd aria-hidden="true">D</kbd></label> | 529 | <label class="d-check"><input type="checkbox" name="delete_branch" value="1"/> delete { p.Source } after the merge <kbd aria-hidden="true">D</kbd></label> | ||
| 533 | } | 530 | } | ||
| @@ -589,26 +586,52 @@ templ MRMergeabilityFragment(v MergeabilityView) { | |||||
| 589 | @mrMergeabilitySlot(v) | 586 | @mrMergeabilitySlot(v) | ||
| 590 | } | 587 | } | ||
| 591 | 588 | ||||
| 592 | - | // moreMenu is what else the owner does with an open request: mark the head | 589 | + | // moreMenu shows read-only settings to every viewer, and keeps owner actions |
| 593 | - | // read, close it, merge it from a terminal. | 590 | + | // behind the same merge-box permission as before. |
| 594 | templ moreMenu(p MRPage) { | 591 | templ moreMenu(p MRPage) { | ||
| 595 | <details class="menu omenu"> | 592 | <details class="menu omenu"> | ||
| 596 | <summary class="btn icon" aria-label="More actions" title="more actions">⋯</summary> | 593 | <summary class="btn icon" aria-label="More actions" title="more actions">⋯</summary> | ||
| 597 | <div class="menu-pop" role="group" aria-label="More actions"> | 594 | <div class="menu-pop" role="group" aria-label="More actions"> | ||
| 598 | - | if p.Box.CanMarkRead { | 595 | + | <section class="merge-settings"> |
| 599 | - | <form method="post" action={ templ.SafeURL(p.Box.ReadAction) }> | 596 | + | <h2>Merge settings</h2> |
| 600 | - | <input type="hidden" name="head_id" value={ p.Box.Head }/> | 597 | + | <dl class="kv"> |
| 601 | - | <button type="submit" title="the next visit can show only what changed after this head" class="btn" aria-keyshortcuts="Shift+R" data-read>Mark read <kbd aria-hidden="true">R</kbd></button> | 598 | + | <dt>modes</dt> |
| 599 | + | <dd>{ strings.Join(p.Modes, ", ") }</dd> | |||
| 600 | + | <dt>checks</dt> | |||
| 601 | + | <dd> | |||
| 602 | + | if p.ChecksBlock { | |||
| 603 | + | failing ones block the merge | |||
| 604 | + | } else { | |||
| 605 | + | do not block the merge | |||
| 606 | + | } | |||
| 607 | + | </dd> | |||
| 608 | + | </dl> | |||
| 609 | + | </section> | |||
| 610 | + | if p.Box != nil { | |||
| 611 | + | if p.Box.Signed { | |||
| 612 | + | <p class="d-note" id="mr-signing"> | |||
| 613 | + | squash and merge commits are signed with ermite's own key (generated on first start). | |||
| 614 | + | if p.Box.Fingerprint != "" { | |||
| 615 | + | fingerprint <code>{ p.Box.Fingerprint }</code> | |||
| 616 | + | } | |||
| 617 | + | <code>ermite signing-key show</code> prints it. | |||
| 618 | + | </p> | |||
| 619 | + | } | |||
| 620 | + | if p.Box.CanMarkRead { | |||
| 621 | + | <form method="post" action={ templ.SafeURL(p.Box.ReadAction) }> | |||
| 622 | + | <input type="hidden" name="head_id" value={ p.Box.Head }/> | |||
| 623 | + | <button type="submit" title="the next visit can show only what changed after this head" class="btn" aria-keyshortcuts="Shift+R" data-read>Mark read <kbd aria-hidden="true">R</kbd></button> | |||
| 624 | + | </form> | |||
| 625 | + | } | |||
| 626 | + | <form method="post" action={ templ.SafeURL(p.Box.CloseAction) }> | |||
| 627 | + | <button type="submit" title="close without merging; the branch is kept" class="btn danger">Close</button> | |||
| 602 | </form> | 628 | </form> | ||
| 603 | - | } | 629 | + | if !p.Box.HeadGone && p.Box.ReadyAction == "" { |
| 604 | - | <form method="post" action={ templ.SafeURL(p.Box.CloseAction) }> | 630 | + | <details class="d-or"> |
| 605 | - | <button type="submit" title="close without merging; the branch is kept" class="btn danger">Close</button> | 631 | + | <summary class="mute">or from a terminal</summary> |
| 606 | - | </form> | 632 | + | @CloneBlock(p.Box.CLI) |
| 607 | - | if !p.Box.HeadGone && p.Box.ReadyAction == "" { | 633 | + | </details> |
| 608 | - | <details class="d-or"> | 634 | + | } |
| 609 | - | <summary class="mute">or from a terminal</summary> | |||
| 610 | - | @CloneBlock(p.Box.CLI) | |||
| 611 | - | </details> | |||
| 612 | } | 635 | } | ||
| 613 | </div> | 636 | </div> | ||
| 614 | </details> | 637 | </details> | ||
M internal/adapters/web/mr_templ.go +607 -563
| @@ -808,6 +808,10 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||
| 808 | 808 | return templ_7745c5c3_Err | |
| 809 | 809 | } | |
| 810 | 810 | } | |
| 811 | + | templ_7745c5c3_Err = mrFooter(p).Render(ctx, templ_7745c5c3_Buffer) | |
| 812 | + | if templ_7745c5c3_Err != nil { | |
| 813 | + | return templ_7745c5c3_Err | |
| 814 | + | } | |
| 811 | 815 | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 71, "</section>") | |
| 812 | 816 | if templ_7745c5c3_Err != nil { | |
| 813 | 817 | return templ_7745c5c3_Err | |
| @@ -820,7 +824,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||
| 820 | 824 | var templ_7745c5c3_Var42 string | |
| 821 | 825 | templ_7745c5c3_Var42, templ_7745c5c3_Err = templ.JoinStringErrs(p.Deleting) | |
| 822 | 826 | if templ_7745c5c3_Err != nil { | |
| 823 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 152, Col: 64} | |
| 827 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 153, Col: 64} | |
| 824 | 828 | } | |
| 825 | 829 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var42)) | |
| 826 | 830 | if templ_7745c5c3_Err != nil { | |
| @@ -843,7 +847,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||
| 843 | 847 | var templ_7745c5c3_Var43 string | |
| 844 | 848 | templ_7745c5c3_Var43, templ_7745c5c3_Err = templ.JoinStringErrs(p.MergeError) | |
| 845 | 849 | if templ_7745c5c3_Err != nil { | |
| 846 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 155, Col: 47} | |
| 850 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 156, Col: 47} | |
| 847 | 851 | } | |
| 848 | 852 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var43)) | |
| 849 | 853 | if templ_7745c5c3_Err != nil { | |
| @@ -874,7 +878,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||
| 874 | 878 | var templ_7745c5c3_Var44 templ.SafeURL | |
| 875 | 879 | templ_7745c5c3_Var44, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Since.AllHref)) | |
| 876 | 880 | if templ_7745c5c3_Err != nil { | |
| 877 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 161, Col: 42} | |
| 881 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 162, Col: 42} | |
| 878 | 882 | } | |
| 879 | 883 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var44)) | |
| 880 | 884 | if templ_7745c5c3_Err != nil { | |
| @@ -897,7 +901,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||
| 897 | 901 | var templ_7745c5c3_Var45 string | |
| 898 | 902 | templ_7745c5c3_Var45, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | |
| 899 | 903 | if templ_7745c5c3_Err != nil { | |
| 900 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 165, Col: 49} | |
| 904 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 166, Col: 49} | |
| 901 | 905 | } | |
| 902 | 906 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var45)) | |
| 903 | 907 | if templ_7745c5c3_Err != nil { | |
| @@ -910,7 +914,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||
| 910 | 914 | var templ_7745c5c3_Var46 templ.SafeURL | |
| 911 | 915 | templ_7745c5c3_Var46, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Since.SinceHref)) | |
| 912 | 916 | if templ_7745c5c3_Err != nil { | |
| 913 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 167, Col: 44} | |
| 917 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 168, Col: 44} | |
| 914 | 918 | } | |
| 915 | 919 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var46)) | |
| 916 | 920 | if templ_7745c5c3_Err != nil { | |
| @@ -933,7 +937,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||
| 933 | 937 | var templ_7745c5c3_Var47 string | |
| 934 | 938 | templ_7745c5c3_Var47, templ_7745c5c3_Err = templ.JoinStringErrs(p.Since.ReadShort) | |
| 935 | 939 | if templ_7745c5c3_Err != nil { | |
| 936 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 171, Col: 64} | |
| 940 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 172, Col: 64} | |
| 937 | 941 | } | |
| 938 | 942 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var47)) | |
| 939 | 943 | if templ_7745c5c3_Err != nil { | |
| @@ -946,7 +950,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||
| 946 | 950 | var templ_7745c5c3_Var48 string | |
| 947 | 951 | templ_7745c5c3_Var48, templ_7745c5c3_Err = templ.JoinStringErrs(p.Since.HeadShort) | |
| 948 | 952 | if templ_7745c5c3_Err != nil { | |
| 949 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 171, Col: 90} | |
| 953 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 172, Col: 90} | |
| 950 | 954 | } | |
| 951 | 955 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var48)) | |
| 952 | 956 | if templ_7745c5c3_Err != nil { | |
| @@ -969,7 +973,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||
| 969 | 973 | var templ_7745c5c3_Var49 string | |
| 970 | 974 | templ_7745c5c3_Var49, templ_7745c5c3_Err = templ.JoinStringErrs(p.SinceNote) | |
| 971 | 975 | if templ_7745c5c3_Err != nil { | |
| 972 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 175, Col: 34} | |
| 976 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 176, Col: 34} | |
| 973 | 977 | } | |
| 974 | 978 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var49)) | |
| 975 | 979 | if templ_7745c5c3_Err != nil { | |
| @@ -1010,7 +1014,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||
| 1010 | 1014 | var templ_7745c5c3_Var50 string | |
| 1011 | 1015 | templ_7745c5c3_Var50, templ_7745c5c3_Err = templ.JoinStringErrs(p.Note) | |
| 1012 | 1016 | if templ_7745c5c3_Err != nil { | |
| 1013 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 185, Col: 29} | |
| 1017 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 186, Col: 29} | |
| 1014 | 1018 | } | |
| 1015 | 1019 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var50)) | |
| 1016 | 1020 | if templ_7745c5c3_Err != nil { | |
| @@ -1033,7 +1037,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||
| 1033 | 1037 | var templ_7745c5c3_Var51 string | |
| 1034 | 1038 | templ_7745c5c3_Var51, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Canonical) | |
| 1035 | 1039 | if templ_7745c5c3_Err != nil { | |
| 1036 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 191, Col: 32} | |
| 1040 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 192, Col: 32} | |
| 1037 | 1041 | } | |
| 1038 | 1042 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var51) | |
| 1039 | 1043 | if templ_7745c5c3_Err != nil { | |
| @@ -1052,7 +1056,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||
| 1052 | 1056 | var templ_7745c5c3_Var52 string | |
| 1053 | 1057 | templ_7745c5c3_Var52, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.View) | |
| 1054 | 1058 | if templ_7745c5c3_Err != nil { | |
| 1055 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 194, Col: 22} | |
| 1059 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 195, Col: 22} | |
| 1056 | 1060 | } | |
| 1057 | 1061 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var52) | |
| 1058 | 1062 | if templ_7745c5c3_Err != nil { | |
| @@ -1070,7 +1074,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||
| 1070 | 1074 | var templ_7745c5c3_Var53 string | |
| 1071 | 1075 | templ_7745c5c3_Var53, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.View) | |
| 1072 | 1076 | if templ_7745c5c3_Err != nil { | |
| 1073 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 196, Col: 22} | |
| 1077 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 197, Col: 22} | |
| 1074 | 1078 | } | |
| 1075 | 1079 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var53) | |
| 1076 | 1080 | if templ_7745c5c3_Err != nil { | |
| @@ -1110,7 +1114,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||
| 1110 | 1114 | var templ_7745c5c3_Var54 string | |
| 1111 | 1115 | templ_7745c5c3_Var54, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.NUnresolved)) | |
| 1112 | 1116 | if templ_7745c5c3_Err != nil { | |
| 1113 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 209, Col: 97} | |
| 1117 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 210, Col: 97} | |
| 1114 | 1118 | } | |
| 1115 | 1119 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var54)) | |
| 1116 | 1120 | if templ_7745c5c3_Err != nil { | |
| @@ -1123,7 +1127,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||
| 1123 | 1127 | var templ_7745c5c3_Var55 string | |
| 1124 | 1128 | templ_7745c5c3_Var55, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.NComments)) | |
| 1125 | 1129 | if templ_7745c5c3_Err != nil { | |
| 1126 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 209, Col: 126} | |
| 1130 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 210, Col: 126} | |
| 1127 | 1131 | } | |
| 1128 | 1132 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var55)) | |
| 1129 | 1133 | if templ_7745c5c3_Err != nil { | |
| @@ -1204,7 +1208,7 @@ func branchLink(name, href string) templ.Component { | |||
| 1204 | 1208 | var templ_7745c5c3_Var57 templ.SafeURL | |
| 1205 | 1209 | templ_7745c5c3_Var57, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(href)) | |
| 1206 | 1210 | if templ_7745c5c3_Err != nil { | |
| 1207 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 227, Col: 31} | |
| 1211 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 228, Col: 31} | |
| 1208 | 1212 | } | |
| 1209 | 1213 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var57)) | |
| 1210 | 1214 | if templ_7745c5c3_Err != nil { | |
| @@ -1217,7 +1221,7 @@ func branchLink(name, href string) templ.Component { | |||
| 1217 | 1221 | var templ_7745c5c3_Var58 string | |
| 1218 | 1222 | templ_7745c5c3_Var58, templ_7745c5c3_Err = templ.JoinStringErrs(name) | |
| 1219 | 1223 | if templ_7745c5c3_Err != nil { | |
| 1220 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 227, Col: 40} | |
| 1224 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 228, Col: 40} | |
| 1221 | 1225 | } | |
| 1222 | 1226 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var58)) | |
| 1223 | 1227 | if templ_7745c5c3_Err != nil { | |
| @@ -1231,7 +1235,7 @@ func branchLink(name, href string) templ.Component { | |||
| 1231 | 1235 | var templ_7745c5c3_Var59 string | |
| 1232 | 1236 | templ_7745c5c3_Var59, templ_7745c5c3_Err = templ.JoinStringErrs(name) | |
| 1233 | 1237 | if templ_7745c5c3_Err != nil { | |
| 1234 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 229, Col: 8} | |
| 1238 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 230, Col: 8} | |
| 1235 | 1239 | } | |
| 1236 | 1240 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var59)) | |
| 1237 | 1241 | if templ_7745c5c3_Err != nil { | |
| @@ -1312,7 +1316,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||
| 1312 | 1316 | var templ_7745c5c3_Var62 string | |
| 1313 | 1317 | templ_7745c5c3_Var62, templ_7745c5c3_Err = templ.ResolveAttributeValue("c" + c.ID + suffix) | |
| 1314 | 1318 | if templ_7745c5c3_Err != nil { | |
| 1315 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 248, Col: 42} | |
| 1319 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 249, Col: 42} | |
| 1316 | 1320 | } | |
| 1317 | 1321 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var62) | |
| 1318 | 1322 | if templ_7745c5c3_Err != nil { | |
| @@ -1325,7 +1329,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||
| 1325 | 1329 | var templ_7745c5c3_Var63 string | |
| 1326 | 1330 | templ_7745c5c3_Var63, templ_7745c5c3_Err = templ.ResolveAttributeValue(boolText(c.Resolved)) | |
| 1327 | 1331 | if templ_7745c5c3_Err != nil { | |
| 1328 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 248, Col: 81} | |
| 1332 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 249, Col: 81} | |
| 1329 | 1333 | } | |
| 1330 | 1334 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var63) | |
| 1331 | 1335 | if templ_7745c5c3_Err != nil { | |
| @@ -1348,7 +1352,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||
| 1348 | 1352 | var templ_7745c5c3_Var64 string | |
| 1349 | 1353 | templ_7745c5c3_Var64, templ_7745c5c3_Err = templ.JoinStringErrs(c.Author) | |
| 1350 | 1354 | if templ_7745c5c3_Err != nil { | |
| 1351 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 250, Col: 33} | |
| 1355 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 251, Col: 33} | |
| 1352 | 1356 | } | |
| 1353 | 1357 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var64)) | |
| 1354 | 1358 | if templ_7745c5c3_Err != nil { | |
| @@ -1362,7 +1366,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||
| 1362 | 1366 | var templ_7745c5c3_Var65 string | |
| 1363 | 1367 | templ_7745c5c3_Var65, templ_7745c5c3_Err = templ.JoinStringErrs(" ") | |
| 1364 | 1368 | if templ_7745c5c3_Err != nil { | |
| 1365 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 252, Col: 9} | |
| 1369 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 253, Col: 9} | |
| 1366 | 1370 | } | |
| 1367 | 1371 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var65)) | |
| 1368 | 1372 | if templ_7745c5c3_Err != nil { | |
| @@ -1375,7 +1379,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||
| 1375 | 1379 | var templ_7745c5c3_Var66 string | |
| 1376 | 1380 | templ_7745c5c3_Var66, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.WhenAt) | |
| 1377 | 1381 | if templ_7745c5c3_Err != nil { | |
| 1378 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 252, Col: 49} | |
| 1382 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 253, Col: 49} | |
| 1379 | 1383 | } | |
| 1380 | 1384 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var66) | |
| 1381 | 1385 | if templ_7745c5c3_Err != nil { | |
| @@ -1388,7 +1392,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||
| 1388 | 1392 | var templ_7745c5c3_Var67 string | |
| 1389 | 1393 | templ_7745c5c3_Var67, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.Abs) | |
| 1390 | 1394 | if templ_7745c5c3_Err != nil { | |
| 1391 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 252, Col: 65} | |
| 1395 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 253, Col: 65} | |
| 1392 | 1396 | } | |
| 1393 | 1397 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var67) | |
| 1394 | 1398 | if templ_7745c5c3_Err != nil { | |
| @@ -1401,7 +1405,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||
| 1401 | 1405 | var templ_7745c5c3_Var68 string | |
| 1402 | 1406 | templ_7745c5c3_Var68, templ_7745c5c3_Err = templ.JoinStringErrs(c.When) | |
| 1403 | 1407 | if templ_7745c5c3_Err != nil { | |
| 1404 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 252, Col: 76} | |
| 1408 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 253, Col: 76} | |
| 1405 | 1409 | } | |
| 1406 | 1410 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var68)) | |
| 1407 | 1411 | if templ_7745c5c3_Err != nil { | |
| @@ -1416,7 +1420,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||
| 1416 | 1420 | var templ_7745c5c3_Var69 string | |
| 1417 | 1421 | templ_7745c5c3_Var69, templ_7745c5c3_Err = templ.JoinStringErrs(" ") | |
| 1418 | 1422 | if templ_7745c5c3_Err != nil { | |
| 1419 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 255, Col: 9} | |
| 1423 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 256, Col: 9} | |
| 1420 | 1424 | } | |
| 1421 | 1425 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var69)) | |
| 1422 | 1426 | if templ_7745c5c3_Err != nil { | |
| @@ -1431,7 +1435,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||
| 1431 | 1435 | var templ_7745c5c3_Var70 string | |
| 1432 | 1436 | templ_7745c5c3_Var70, templ_7745c5c3_Err = templ.JoinStringErrs(" ") | |
| 1433 | 1437 | if templ_7745c5c3_Err != nil { | |
| 1434 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 258, Col: 9} | |
| 1438 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 259, Col: 9} | |
| 1435 | 1439 | } | |
| 1436 | 1440 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var70)) | |
| 1437 | 1441 | if templ_7745c5c3_Err != nil { | |
| @@ -1446,7 +1450,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||
| 1446 | 1450 | var templ_7745c5c3_Var71 string | |
| 1447 | 1451 | templ_7745c5c3_Var71, templ_7745c5c3_Err = templ.JoinStringErrs(" ") | |
| 1448 | 1452 | if templ_7745c5c3_Err != nil { | |
| 1449 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 261, Col: 9} | |
| 1453 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 262, Col: 9} | |
| 1450 | 1454 | } | |
| 1451 | 1455 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var71)) | |
| 1452 | 1456 | if templ_7745c5c3_Err != nil { | |
| @@ -1459,7 +1463,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||
| 1459 | 1463 | var templ_7745c5c3_Var72 string | |
| 1460 | 1464 | templ_7745c5c3_Var72, templ_7745c5c3_Err = templ.JoinStringErrs(c.Where) | |
| 1461 | 1465 | if templ_7745c5c3_Err != nil { | |
| 1462 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 261, Col: 47} | |
| 1466 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 262, Col: 47} | |
| 1463 | 1467 | } | |
| 1464 | 1468 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var72)) | |
| 1465 | 1469 | if templ_7745c5c3_Err != nil { | |
| @@ -1534,7 +1538,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||
| 1534 | 1538 | var templ_7745c5c3_Var73 string | |
| 1535 | 1539 | templ_7745c5c3_Var73, templ_7745c5c3_Err = templ.JoinStringErrs(c.Verdict) | |
| 1536 | 1540 | if templ_7745c5c3_Err != nil { | |
| 1537 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 285, Col: 36} | |
| 1541 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 286, Col: 36} | |
| 1538 | 1542 | } | |
| 1539 | 1543 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var73)) | |
| 1540 | 1544 | if templ_7745c5c3_Err != nil { | |
| @@ -1553,7 +1557,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||
| 1553 | 1557 | var templ_7745c5c3_Var74 string | |
| 1554 | 1558 | templ_7745c5c3_Var74, templ_7745c5c3_Err = templ.JoinStringErrs(c.Range) | |
| 1555 | 1559 | if templ_7745c5c3_Err != nil { | |
| 1556 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 288, Col: 31} | |
| 1560 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 289, Col: 31} | |
| 1557 | 1561 | } | |
| 1558 | 1562 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var74)) | |
| 1559 | 1563 | if templ_7745c5c3_Err != nil { | |
| @@ -1572,7 +1576,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||
| 1572 | 1576 | var templ_7745c5c3_Var75 string | |
| 1573 | 1577 | templ_7745c5c3_Var75, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.Quote) | |
| 1574 | 1578 | if templ_7745c5c3_Err != nil { | |
| 1575 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 291, Col: 65} | |
| 1579 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 292, Col: 65} | |
| 1576 | 1580 | } | |
| 1577 | 1581 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var75) | |
| 1578 | 1582 | if templ_7745c5c3_Err != nil { | |
| @@ -1591,7 +1595,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||
| 1591 | 1595 | var templ_7745c5c3_Var76 templ.SafeURL | |
| 1592 | 1596 | templ_7745c5c3_Var76, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(c.Edit.Action)) | |
| 1593 | 1597 | if templ_7745c5c3_Err != nil { | |
| 1594 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 294, Col: 92} | |
| 1598 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 295, Col: 92} | |
| 1595 | 1599 | } | |
| 1596 | 1600 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var76)) | |
| 1597 | 1601 | if templ_7745c5c3_Err != nil { | |
| @@ -1604,7 +1608,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||
| 1604 | 1608 | var templ_7745c5c3_Var77 string | |
| 1605 | 1609 | templ_7745c5c3_Var77, templ_7745c5c3_Err = templ.ResolveAttributeValue(itoa(c.Edit.From)) | |
| 1606 | 1610 | if templ_7745c5c3_Err != nil { | |
| 1607 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 294, Col: 153} | |
| 1611 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 295, Col: 153} | |
| 1608 | 1612 | } | |
| 1609 | 1613 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var77) | |
| 1610 | 1614 | if templ_7745c5c3_Err != nil { | |
| @@ -1617,7 +1621,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||
| 1617 | 1621 | var templ_7745c5c3_Var78 string | |
| 1618 | 1622 | templ_7745c5c3_Var78, templ_7745c5c3_Err = templ.JoinStringErrs(c.Edit.Text) | |
| 1619 | 1623 | if templ_7745c5c3_Err != nil { | |
| 1620 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 294, Col: 209} | |
| 1624 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 295, Col: 209} | |
| 1621 | 1625 | } | |
| 1622 | 1626 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var78)) | |
| 1623 | 1627 | if templ_7745c5c3_Err != nil { | |
| @@ -1636,7 +1640,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||
| 1636 | 1640 | var templ_7745c5c3_Var79 templ.SafeURL | |
| 1637 | 1641 | templ_7745c5c3_Var79, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(c.Delete.Action)) | |
| 1638 | 1642 | if templ_7745c5c3_Err != nil { | |
| 1639 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 297, Col: 96} | |
| 1643 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 298, Col: 96} | |
| 1640 | 1644 | } | |
| 1641 | 1645 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var79)) | |
| 1642 | 1646 | if templ_7745c5c3_Err != nil { | |
| @@ -1649,7 +1653,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||
| 1649 | 1653 | var templ_7745c5c3_Var80 string | |
| 1650 | 1654 | templ_7745c5c3_Var80, templ_7745c5c3_Err = templ.ResolveAttributeValue(itoa(c.Delete.From)) | |
| 1651 | 1655 | if templ_7745c5c3_Err != nil { | |
| 1652 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 297, Col: 159} | |
| 1656 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 298, Col: 159} | |
| 1653 | 1657 | } | |
| 1654 | 1658 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var80) | |
| 1655 | 1659 | if templ_7745c5c3_Err != nil { | |
| @@ -1688,7 +1692,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||
| 1688 | 1692 | var templ_7745c5c3_Var81 templ.SafeURL | |
| 1689 | 1693 | templ_7745c5c3_Var81, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(c.Resolve.Action)) | |
| 1690 | 1694 | if templ_7745c5c3_Err != nil { | |
| 1691 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 308, Col: 77} | |
| 1695 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 309, Col: 77} | |
| 1692 | 1696 | } | |
| 1693 | 1697 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var81)) | |
| 1694 | 1698 | if templ_7745c5c3_Err != nil { | |
| @@ -1701,7 +1705,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||
| 1701 | 1705 | var templ_7745c5c3_Var82 string | |
| 1702 | 1706 | templ_7745c5c3_Var82, templ_7745c5c3_Err = templ.ResolveAttributeValue(boolText(c.Resolve.Value)) | |
| 1703 | 1707 | if templ_7745c5c3_Err != nil { | |
| 1704 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 309, Col: 74} | |
| 1708 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 310, Col: 74} | |
| 1705 | 1709 | } | |
| 1706 | 1710 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var82) | |
| 1707 | 1711 | if templ_7745c5c3_Err != nil { | |
| @@ -1719,7 +1723,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||
| 1719 | 1723 | var templ_7745c5c3_Var83 string | |
| 1720 | 1724 | templ_7745c5c3_Var83, templ_7745c5c3_Err = templ.ResolveAttributeValue(itoa(c.Resolve.From)) | |
| 1721 | 1725 | if templ_7745c5c3_Err != nil { | |
| 1722 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 311, Col: 66} | |
| 1726 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 312, Col: 66} | |
| 1723 | 1727 | } | |
| 1724 | 1728 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var83) | |
| 1725 | 1729 | if templ_7745c5c3_Err != nil { | |
| @@ -1737,7 +1741,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||
| 1737 | 1741 | var templ_7745c5c3_Var84 string | |
| 1738 | 1742 | templ_7745c5c3_Var84, templ_7745c5c3_Err = templ.JoinStringErrs(c.Resolve.Label) | |
| 1739 | 1743 | if templ_7745c5c3_Err != nil { | |
| 1740 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 313, Col: 55} | |
| 1744 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 314, Col: 55} | |
| 1741 | 1745 | } | |
| 1742 | 1746 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var84)) | |
| 1743 | 1747 | if templ_7745c5c3_Err != nil { | |
| @@ -1792,7 +1796,7 @@ func commentForm(f CommentForm, suffix string) templ.Component { | |||
| 1792 | 1796 | var templ_7745c5c3_Var86 templ.SafeURL | |
| 1793 | 1797 | templ_7745c5c3_Var86, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(f.Action)) | |
| 1794 | 1798 | if templ_7745c5c3_Err != nil { | |
| 1795 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 328, Col: 67} | |
| 1799 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 329, Col: 67} | |
| 1796 | 1800 | } | |
| 1797 | 1801 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var86)) | |
| 1798 | 1802 | if templ_7745c5c3_Err != nil { | |
| @@ -1805,7 +1809,7 @@ func commentForm(f CommentForm, suffix string) templ.Component { | |||
| 1805 | 1809 | var templ_7745c5c3_Var87 string | |
| 1806 | 1810 | templ_7745c5c3_Var87, templ_7745c5c3_Err = templ.ResolveAttributeValue(f.ID + suffix) | |
| 1807 | 1811 | if templ_7745c5c3_Err != nil { | |
| 1808 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 329, Col: 28} | |
| 1812 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 330, Col: 28} | |
| 1809 | 1813 | } | |
| 1810 | 1814 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var87) | |
| 1811 | 1815 | if templ_7745c5c3_Err != nil { | |
| @@ -1818,7 +1822,7 @@ func commentForm(f CommentForm, suffix string) templ.Component { | |||
| 1818 | 1822 | var templ_7745c5c3_Var88 string | |
| 1819 | 1823 | templ_7745c5c3_Var88, templ_7745c5c3_Err = templ.JoinStringErrs(f.Title) | |
| 1820 | 1824 | if templ_7745c5c3_Err != nil { | |
| 1821 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 329, Col: 40} | |
| 1825 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 330, Col: 40} | |
| 1822 | 1826 | } | |
| 1823 | 1827 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var88)) | |
| 1824 | 1828 | if templ_7745c5c3_Err != nil { | |
| @@ -1831,7 +1835,7 @@ func commentForm(f CommentForm, suffix string) templ.Component { | |||
| 1831 | 1835 | var templ_7745c5c3_Var89 string | |
| 1832 | 1836 | templ_7745c5c3_Var89, templ_7745c5c3_Err = templ.ResolveAttributeValue(f.ID + suffix) | |
| 1833 | 1837 | if templ_7745c5c3_Err != nil { | |
| 1834 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 331, Col: 21} | |
| 1838 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 332, Col: 21} | |
| 1835 | 1839 | } | |
| 1836 | 1840 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var89) | |
| 1837 | 1841 | if templ_7745c5c3_Err != nil { | |
| @@ -1870,7 +1874,7 @@ func commentForm(f CommentForm, suffix string) templ.Component { | |||
| 1870 | 1874 | var templ_7745c5c3_Var90 string | |
| 1871 | 1875 | templ_7745c5c3_Var90, templ_7745c5c3_Err = templ.ResolveAttributeValue(f.Path) | |
| 1872 | 1876 | if templ_7745c5c3_Err != nil { | |
| 1873 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 346, Col: 50} | |
| 1877 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 347, Col: 50} | |
| 1874 | 1878 | } | |
| 1875 | 1879 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var90) | |
| 1876 | 1880 | if templ_7745c5c3_Err != nil { | |
| @@ -1883,7 +1887,7 @@ func commentForm(f CommentForm, suffix string) templ.Component { | |||
| 1883 | 1887 | var templ_7745c5c3_Var91 string | |
| 1884 | 1888 | templ_7745c5c3_Var91, templ_7745c5c3_Err = templ.ResolveAttributeValue(f.Line) | |
| 1885 | 1889 | if templ_7745c5c3_Err != nil { | |
| 1886 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 347, Col: 50} | |
| 1890 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 348, Col: 50} | |
| 1887 | 1891 | } | |
| 1888 | 1892 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var91) | |
| 1889 | 1893 | if templ_7745c5c3_Err != nil { | |
| @@ -1896,7 +1900,7 @@ func commentForm(f CommentForm, suffix string) templ.Component { | |||
| 1896 | 1900 | var templ_7745c5c3_Var92 string | |
| 1897 | 1901 | templ_7745c5c3_Var92, templ_7745c5c3_Err = templ.ResolveAttributeValue(f.Side) | |
| 1898 | 1902 | if templ_7745c5c3_Err != nil { | |
| 1899 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 348, Col: 50} | |
| 1903 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 349, Col: 50} | |
| 1900 | 1904 | } | |
| 1901 | 1905 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var92) | |
| 1902 | 1906 | if templ_7745c5c3_Err != nil { | |
| @@ -1909,7 +1913,7 @@ func commentForm(f CommentForm, suffix string) templ.Component { | |||
| 1909 | 1913 | var templ_7745c5c3_Var93 string | |
| 1910 | 1914 | templ_7745c5c3_Var93, templ_7745c5c3_Err = templ.ResolveAttributeValue(f.StartLine) | |
| 1911 | 1915 | if templ_7745c5c3_Err != nil { | |
| 1912 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 349, Col: 86} | |
| 1916 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 350, Col: 86} | |
| 1913 | 1917 | } | |
| 1914 | 1918 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var93) | |
| 1915 | 1919 | if templ_7745c5c3_Err != nil { | |
| @@ -1928,7 +1932,7 @@ func commentForm(f CommentForm, suffix string) templ.Component { | |||
| 1928 | 1932 | var templ_7745c5c3_Var94 string | |
| 1929 | 1933 | templ_7745c5c3_Var94, templ_7745c5c3_Err = templ.ResolveAttributeValue(f.ReplyTo) | |
| 1930 | 1934 | if templ_7745c5c3_Err != nil { | |
| 1931 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 352, Col: 57} | |
| 1935 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 353, Col: 57} | |
| 1932 | 1936 | } | |
| 1933 | 1937 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var94) | |
| 1934 | 1938 | if templ_7745c5c3_Err != nil { | |
| @@ -1953,7 +1957,7 @@ func commentForm(f CommentForm, suffix string) templ.Component { | |||
| 1953 | 1957 | var templ_7745c5c3_Var95 string | |
| 1954 | 1958 | templ_7745c5c3_Var95, templ_7745c5c3_Err = templ.ResolveAttributeValue(itoa(f.From)) | |
| 1955 | 1959 | if templ_7745c5c3_Err != nil { | |
| 1956 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 358, Col: 56} | |
| 1960 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 359, Col: 56} | |
| 1957 | 1961 | } | |
| 1958 | 1962 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var95) | |
| 1959 | 1963 | if templ_7745c5c3_Err != nil { | |
| @@ -1976,7 +1980,7 @@ func commentForm(f CommentForm, suffix string) templ.Component { | |||
| 1976 | 1980 | var templ_7745c5c3_Var96 templ.SafeURL | |
| 1977 | 1981 | templ_7745c5c3_Var96, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(f.Cancel)) | |
| 1978 | 1982 | if templ_7745c5c3_Err != nil { | |
| 1979 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 363, Col: 49} | |
| 1983 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 364, Col: 49} | |
| 1980 | 1984 | } | |
| 1981 | 1985 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var96)) | |
| 1982 | 1986 | if templ_7745c5c3_Err != nil { | |
| @@ -1995,7 +1999,7 @@ func commentForm(f CommentForm, suffix string) templ.Component { | |||
| 1995 | 1999 | }) | |
| 1996 | 2000 | } | |
| 1997 | 2001 | ||
| 1998 | - | func mrRail(p MRPage) templ.Component { | |
| 2002 | + | func mrFooter(p MRPage) templ.Component { | |
| 1999 | 2003 | return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { | |
| 2000 | 2004 | templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context | |
| 2001 | 2005 | if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { | |
| @@ -2016,312 +2020,349 @@ func mrRail(p MRPage) templ.Component { | |||
| 2016 | 2020 | templ_7745c5c3_Var97 = templ.NopComponent | |
| 2017 | 2021 | } | |
| 2018 | 2022 | ctx = templ.ClearChildren(ctx) | |
| 2019 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 185, "<section aria-labelledby=\"r-files\" class=\"r-files\"><h2 id=\"r-files\">Files <span class=\"count\">") | |
| 2023 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 185, "<footer class=\"mr-footer\"><details id=\"mr-panels\"><summary>Commits <span class=\"count\">") | |
| 2020 | 2024 | if templ_7745c5c3_Err != nil { | |
| 2021 | 2025 | return templ_7745c5c3_Err | |
| 2022 | 2026 | } | |
| 2023 | 2027 | var templ_7745c5c3_Var98 string | |
| 2024 | - | templ_7745c5c3_Var98, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(len(p.Files))) | |
| 2028 | + | templ_7745c5c3_Var98, templ_7745c5c3_Err = templ.JoinStringErrs(p.CommitCount) | |
| 2025 | 2029 | if templ_7745c5c3_Err != nil { | |
| 2026 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 372, Col: 49} | |
| 2030 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 373, Col: 55} | |
| 2027 | 2031 | } | |
| 2028 | 2032 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var98)) | |
| 2029 | 2033 | if templ_7745c5c3_Err != nil { | |
| 2030 | 2034 | return templ_7745c5c3_Err | |
| 2031 | 2035 | } | |
| 2032 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 186, "</span><kbd aria-hidden=\"true\">g f</kbd> <button type=\"button\" class=\"btn icon fold\" data-js aria-expanded=\"true\" title=\"fold the list of files\" hx-on:click=\"ermiteMR.foldFiles()\"><span class=\"ico i-chevron\" aria-hidden=\"true\"></span><span class=\"sr\">fold the list of files</span></button></h2>") | |
| 2036 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 186, "</span> · Checks</summary><nav data-mr-tabs aria-label=\"Branch details\"><a id=\"mr-tab-commits\" href=\"#mr-commits\">Commits <span class=\"count\">") | |
| 2033 | 2037 | if templ_7745c5c3_Err != nil { | |
| 2034 | 2038 | return templ_7745c5c3_Err | |
| 2035 | 2039 | } | |
| 2036 | - | templ_7745c5c3_Err = FileList(p.Files).Render(ctx, templ_7745c5c3_Buffer) | |
| 2040 | + | var templ_7745c5c3_Var99 string | |
| 2041 | + | templ_7745c5c3_Var99, templ_7745c5c3_Err = templ.JoinStringErrs(p.CommitCount) | |
| 2037 | 2042 | if templ_7745c5c3_Err != nil { | |
| 2038 | - | return templ_7745c5c3_Err | |
| 2043 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 375, Col: 89} | |
| 2039 | 2044 | } | |
| 2040 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 187, "</section>") | |
| 2045 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var99)) | |
| 2041 | 2046 | if templ_7745c5c3_Err != nil { | |
| 2042 | 2047 | return templ_7745c5c3_Err | |
| 2043 | 2048 | } | |
| 2044 | - | if len(p.Verdicts) > 0 { | |
| 2045 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 188, "<section><h2>Verdicts</h2><ul>") | |
| 2046 | - | if templ_7745c5c3_Err != nil { | |
| 2047 | - | return templ_7745c5c3_Err | |
| 2048 | - | } | |
| 2049 | - | for _, v := range p.Verdicts { | |
| 2050 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 189, "<li><a href=\"") | |
| 2051 | - | if templ_7745c5c3_Err != nil { | |
| 2052 | - | return templ_7745c5c3_Err | |
| 2053 | - | } | |
| 2054 | - | var templ_7745c5c3_Var99 templ.SafeURL | |
| 2055 | - | templ_7745c5c3_Var99, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(v.Href)) | |
| 2056 | - | if templ_7745c5c3_Err != nil { | |
| 2057 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 385, Col: 37} | |
| 2058 | - | } | |
| 2059 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var99)) | |
| 2060 | - | if templ_7745c5c3_Err != nil { | |
| 2061 | - | return templ_7745c5c3_Err | |
| 2062 | - | } | |
| 2063 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 190, "\">") | |
| 2064 | - | if templ_7745c5c3_Err != nil { | |
| 2065 | - | return templ_7745c5c3_Err | |
| 2066 | - | } | |
| 2067 | - | var templ_7745c5c3_Var100 string | |
| 2068 | - | templ_7745c5c3_Var100, templ_7745c5c3_Err = templ.JoinStringErrs(v.Author) | |
| 2069 | - | if templ_7745c5c3_Err != nil { | |
| 2070 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 385, Col: 50} | |
| 2071 | - | } | |
| 2072 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var100)) | |
| 2073 | - | if templ_7745c5c3_Err != nil { | |
| 2074 | - | return templ_7745c5c3_Err | |
| 2075 | - | } | |
| 2076 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 191, ": ") | |
| 2077 | - | if templ_7745c5c3_Err != nil { | |
| 2078 | - | return templ_7745c5c3_Err | |
| 2079 | - | } | |
| 2080 | - | var templ_7745c5c3_Var101 string | |
| 2081 | - | templ_7745c5c3_Var101, templ_7745c5c3_Err = templ.JoinStringErrs(v.Label) | |
| 2082 | - | if templ_7745c5c3_Err != nil { | |
| 2083 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 385, Col: 63} | |
| 2084 | - | } | |
| 2085 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var101)) | |
| 2086 | - | if templ_7745c5c3_Err != nil { | |
| 2087 | - | return templ_7745c5c3_Err | |
| 2088 | - | } | |
| 2089 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 192, "</a> ") | |
| 2090 | - | if templ_7745c5c3_Err != nil { | |
| 2091 | - | return templ_7745c5c3_Err | |
| 2092 | - | } | |
| 2093 | - | if v.Stale { | |
| 2094 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 193, "<span class=\"mute\">(stale)</span>") | |
| 2095 | - | if templ_7745c5c3_Err != nil { | |
| 2096 | - | return templ_7745c5c3_Err | |
| 2097 | - | } | |
| 2098 | - | } | |
| 2099 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 194, "</li>") | |
| 2100 | - | if templ_7745c5c3_Err != nil { | |
| 2101 | - | return templ_7745c5c3_Err | |
| 2102 | - | } | |
| 2103 | - | } | |
| 2104 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 195, "</ul></section>") | |
| 2105 | - | if templ_7745c5c3_Err != nil { | |
| 2106 | - | return templ_7745c5c3_Err | |
| 2107 | - | } | |
| 2108 | - | } | |
| 2109 | - | templ_7745c5c3_Err = MRChecks(p.Checks).Render(ctx, templ_7745c5c3_Buffer) | |
| 2049 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 187, "</span></a> <a id=\"mr-tab-checks\" href=\"#mr-checks\">") | |
| 2110 | 2050 | if templ_7745c5c3_Err != nil { | |
| 2111 | 2051 | return templ_7745c5c3_Err | |
| 2112 | 2052 | } | |
| 2113 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 196, "<section aria-labelledby=\"r-commits\"><h2 id=\"r-commits\">Commits <span class=\"count\">") | |
| 2053 | + | var templ_7745c5c3_Var100 string | |
| 2054 | + | templ_7745c5c3_Var100, templ_7745c5c3_Err = templ.JoinStringErrs("Checks ") | |
| 2114 | 2055 | if templ_7745c5c3_Err != nil { | |
| 2115 | - | return templ_7745c5c3_Err | |
| 2056 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 377, Col: 16} | |
| 2116 | 2057 | } | |
| 2117 | - | var templ_7745c5c3_Var102 string | |
| 2118 | - | templ_7745c5c3_Var102, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(len(p.Commits))) | |
| 2058 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var100)) | |
| 2119 | 2059 | if templ_7745c5c3_Err != nil { | |
| 2120 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 396, Col: 71} | |
| 2060 | + | return templ_7745c5c3_Err | |
| 2121 | 2061 | } | |
| 2122 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var102)) | |
| 2062 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 188, " <span data-checks-label>") | |
| 2123 | 2063 | if templ_7745c5c3_Err != nil { | |
| 2124 | 2064 | return templ_7745c5c3_Err | |
| 2125 | 2065 | } | |
| 2126 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 197, "</span></h2><ul class=\"pcommits\">") | |
| 2066 | + | if p.ChecksSum.Total > 0 { | |
| 2067 | + | var templ_7745c5c3_Var101 string | |
| 2068 | + | templ_7745c5c3_Var101, templ_7745c5c3_Err = templ.JoinStringErrs(p.ChecksSum.Title) | |
| 2069 | + | if templ_7745c5c3_Err != nil { | |
| 2070 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 380, Col: 26} | |
| 2071 | + | } | |
| 2072 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var101)) | |
| 2073 | + | if templ_7745c5c3_Err != nil { | |
| 2074 | + | return templ_7745c5c3_Err | |
| 2075 | + | } | |
| 2076 | + | } else { | |
| 2077 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 189, "no checks") | |
| 2078 | + | if templ_7745c5c3_Err != nil { | |
| 2079 | + | return templ_7745c5c3_Err | |
| 2080 | + | } | |
| 2081 | + | } | |
| 2082 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 190, "</span></a></nav><div id=\"mr-commits\" data-mr-panel aria-labelledby=\"mr-tab-commits\"><table class=\"mr-commits\"><thead><tr><th>Commit</th><th>Subject</th><th>Author</th><th>Date</th><th>Signature</th><th>Status</th></tr></thead> <tbody>") | |
| 2127 | 2083 | if templ_7745c5c3_Err != nil { | |
| 2128 | 2084 | return templ_7745c5c3_Err | |
| 2129 | 2085 | } | |
| 2130 | 2086 | for _, c := range p.Commits { | |
| 2131 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 198, "<li") | |
| 2087 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 191, "<tr") | |
| 2132 | 2088 | if templ_7745c5c3_Err != nil { | |
| 2133 | 2089 | return templ_7745c5c3_Err | |
| 2134 | 2090 | } | |
| 2135 | 2091 | if c.New { | |
| 2136 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 199, " data-new") | |
| 2092 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 192, " data-new") | |
| 2137 | 2093 | if templ_7745c5c3_Err != nil { | |
| 2138 | 2094 | return templ_7745c5c3_Err | |
| 2139 | 2095 | } | |
| 2140 | 2096 | } | |
| 2141 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 200, "><a href=\"") | |
| 2097 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 193, "><td><a href=\"") | |
| 2142 | 2098 | if templ_7745c5c3_Err != nil { | |
| 2143 | 2099 | return templ_7745c5c3_Err | |
| 2144 | 2100 | } | |
| 2145 | - | var templ_7745c5c3_Var103 templ.SafeURL | |
| 2146 | - | templ_7745c5c3_Var103, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(c.Href)) | |
| 2101 | + | var templ_7745c5c3_Var102 templ.SafeURL | |
| 2102 | + | templ_7745c5c3_Var102, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(c.Href)) | |
| 2147 | 2103 | if templ_7745c5c3_Err != nil { | |
| 2148 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 400, Col: 36} | |
| 2104 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 393, Col: 43} | |
| 2149 | 2105 | } | |
| 2150 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var103)) | |
| 2106 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var102)) | |
| 2151 | 2107 | if templ_7745c5c3_Err != nil { | |
| 2152 | 2108 | return templ_7745c5c3_Err | |
| 2153 | 2109 | } | |
| 2154 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 201, "\">") | |
| 2110 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 194, "\">") | |
| 2155 | 2111 | if templ_7745c5c3_Err != nil { | |
| 2156 | 2112 | return templ_7745c5c3_Err | |
| 2157 | 2113 | } | |
| 2158 | - | var templ_7745c5c3_Var104 string | |
| 2159 | - | templ_7745c5c3_Var104, templ_7745c5c3_Err = templ.JoinStringErrs(c.Short) | |
| 2114 | + | var templ_7745c5c3_Var103 string | |
| 2115 | + | templ_7745c5c3_Var103, templ_7745c5c3_Err = templ.JoinStringErrs(c.Short) | |
| 2160 | 2116 | if templ_7745c5c3_Err != nil { | |
| 2161 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 400, Col: 48} | |
| 2117 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 393, Col: 55} | |
| 2162 | 2118 | } | |
| 2163 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var104)) | |
| 2119 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var103)) | |
| 2164 | 2120 | if templ_7745c5c3_Err != nil { | |
| 2165 | 2121 | return templ_7745c5c3_Err | |
| 2166 | 2122 | } | |
| 2167 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 202, "</a> <span class=\"s\">") | |
| 2123 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 195, "</a></td><td>") | |
| 2168 | 2124 | if templ_7745c5c3_Err != nil { | |
| 2169 | 2125 | return templ_7745c5c3_Err | |
| 2170 | 2126 | } | |
| 2171 | - | var templ_7745c5c3_Var105 string | |
| 2172 | - | templ_7745c5c3_Var105, templ_7745c5c3_Err = templ.JoinStringErrs(c.Subject) | |
| 2127 | + | var templ_7745c5c3_Var104 string | |
| 2128 | + | templ_7745c5c3_Var104, templ_7745c5c3_Err = templ.JoinStringErrs(c.Subject) | |
| 2173 | 2129 | if templ_7745c5c3_Err != nil { | |
| 2174 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 401, Col: 32} | |
| 2130 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 394, Col: 23} | |
| 2175 | 2131 | } | |
| 2176 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var105)) | |
| 2132 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var104)) | |
| 2177 | 2133 | if templ_7745c5c3_Err != nil { | |
| 2178 | 2134 | return templ_7745c5c3_Err | |
| 2179 | 2135 | } | |
| 2180 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 203, "</span> ") | |
| 2136 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 196, "</td><td>") | |
| 2181 | 2137 | if templ_7745c5c3_Err != nil { | |
| 2182 | 2138 | return templ_7745c5c3_Err | |
| 2183 | 2139 | } | |
| 2184 | - | if c.Sig != nil { | |
| 2185 | - | templ_7745c5c3_Err = signaturePill(c.Sig).Render(ctx, templ_7745c5c3_Buffer) | |
| 2186 | - | if templ_7745c5c3_Err != nil { | |
| 2187 | - | return templ_7745c5c3_Err | |
| 2188 | - | } | |
| 2189 | - | } | |
| 2190 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 204, "<span class=\"mute\">") | |
| 2191 | - | if templ_7745c5c3_Err != nil { | |
| 2192 | - | return templ_7745c5c3_Err | |
| 2193 | - | } | |
| 2194 | - | var templ_7745c5c3_Var106 string | |
| 2195 | - | templ_7745c5c3_Var106, templ_7745c5c3_Err = templ.JoinStringErrs(c.Author) | |
| 2140 | + | var templ_7745c5c3_Var105 string | |
| 2141 | + | templ_7745c5c3_Var105, templ_7745c5c3_Err = templ.JoinStringErrs(c.Author) | |
| 2196 | 2142 | if templ_7745c5c3_Err != nil { | |
| 2197 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 406, Col: 16} | |
| 2143 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 395, Col: 22} | |
| 2198 | 2144 | } | |
| 2199 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var106)) | |
| 2145 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var105)) | |
| 2200 | 2146 | if templ_7745c5c3_Err != nil { | |
| 2201 | 2147 | return templ_7745c5c3_Err | |
| 2202 | 2148 | } | |
| 2203 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 205, " ") | |
| 2149 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 197, "</td><td>") | |
| 2204 | 2150 | if templ_7745c5c3_Err != nil { | |
| 2205 | 2151 | return templ_7745c5c3_Err | |
| 2206 | 2152 | } | |
| 2207 | 2153 | if c.WhenAt != "" { | |
| 2208 | - | var templ_7745c5c3_Var107 string | |
| 2209 | - | templ_7745c5c3_Var107, templ_7745c5c3_Err = templ.JoinStringErrs(" · ") | |
| 2210 | - | if templ_7745c5c3_Err != nil { | |
| 2211 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 408, Col: 15} | |
| 2212 | - | } | |
| 2213 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var107)) | |
| 2154 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 198, "<time datetime=\"") | |
| 2214 | 2155 | if templ_7745c5c3_Err != nil { | |
| 2215 | 2156 | return templ_7745c5c3_Err | |
| 2216 | 2157 | } | |
| 2217 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 206, "<time datetime=\"") | |
| 2158 | + | var templ_7745c5c3_Var106 string | |
| 2159 | + | templ_7745c5c3_Var106, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.WhenAt) | |
| 2218 | 2160 | if templ_7745c5c3_Err != nil { | |
| 2219 | - | return templ_7745c5c3_Err | |
| 2161 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 398, Col: 35} | |
| 2220 | 2162 | } | |
| 2221 | - | var templ_7745c5c3_Var108 string | |
| 2222 | - | templ_7745c5c3_Var108, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.WhenAt) | |
| 2223 | - | if templ_7745c5c3_Err != nil { | |
| 2224 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 408, Col: 42} | |
| 2225 | - | } | |
| 2226 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var108) | |
| 2163 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var106) | |
| 2227 | 2164 | if templ_7745c5c3_Err != nil { | |
| 2228 | 2165 | return templ_7745c5c3_Err | |
| 2229 | 2166 | } | |
| 2230 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 207, "\">") | |
| 2167 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 199, "\">") | |
| 2231 | 2168 | if templ_7745c5c3_Err != nil { | |
| 2232 | 2169 | return templ_7745c5c3_Err | |
| 2233 | 2170 | } | |
| 2234 | - | var templ_7745c5c3_Var109 string | |
| 2235 | - | templ_7745c5c3_Var109, templ_7745c5c3_Err = templ.JoinStringErrs(c.When) | |
| 2171 | + | var templ_7745c5c3_Var107 string | |
| 2172 | + | templ_7745c5c3_Var107, templ_7745c5c3_Err = templ.JoinStringErrs(c.When) | |
| 2236 | 2173 | if templ_7745c5c3_Err != nil { | |
| 2237 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 408, Col: 53} | |
| 2174 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 398, Col: 46} | |
| 2238 | 2175 | } | |
| 2239 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var109)) | |
| 2176 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var107)) | |
| 2240 | 2177 | if templ_7745c5c3_Err != nil { | |
| 2241 | 2178 | return templ_7745c5c3_Err | |
| 2242 | 2179 | } | |
| 2243 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 208, "</time> ") | |
| 2180 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 200, "</time>") | |
| 2244 | 2181 | if templ_7745c5c3_Err != nil { | |
| 2245 | 2182 | return templ_7745c5c3_Err | |
| 2246 | 2183 | } | |
| 2247 | 2184 | } | |
| 2248 | - | if c.New { | |
| 2249 | - | var templ_7745c5c3_Var110 string | |
| 2250 | - | templ_7745c5c3_Var110, templ_7745c5c3_Err = templ.JoinStringErrs(" · new") | |
| 2185 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 201, "</td><td>") | |
| 2186 | + | if templ_7745c5c3_Err != nil { | |
| 2187 | + | return templ_7745c5c3_Err | |
| 2188 | + | } | |
| 2189 | + | if c.Sig != nil { | |
| 2190 | + | templ_7745c5c3_Err = signaturePill(c.Sig).Render(ctx, templ_7745c5c3_Buffer) | |
| 2251 | 2191 | if templ_7745c5c3_Err != nil { | |
| 2252 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 411, Col: 18} | |
| 2192 | + | return templ_7745c5c3_Err | |
| 2253 | 2193 | } | |
| 2254 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var110)) | |
| 2194 | + | } | |
| 2195 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 202, "</td><td>") | |
| 2196 | + | if templ_7745c5c3_Err != nil { | |
| 2197 | + | return templ_7745c5c3_Err | |
| 2198 | + | } | |
| 2199 | + | if c.New { | |
| 2200 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 203, "<span>new</span>") | |
| 2255 | 2201 | if templ_7745c5c3_Err != nil { | |
| 2256 | 2202 | return templ_7745c5c3_Err | |
| 2257 | 2203 | } | |
| 2258 | 2204 | } | |
| 2259 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 209, "</span></li>") | |
| 2205 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 204, "</td></tr>") | |
| 2260 | 2206 | if templ_7745c5c3_Err != nil { | |
| 2261 | 2207 | return templ_7745c5c3_Err | |
| 2262 | 2208 | } | |
| 2263 | 2209 | } | |
| 2264 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 210, "</ul>") | |
| 2210 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 205, "</tbody></table>") | |
| 2265 | 2211 | if templ_7745c5c3_Err != nil { | |
| 2266 | 2212 | return templ_7745c5c3_Err | |
| 2267 | 2213 | } | |
| 2268 | 2214 | if len(p.Commits) == 0 { | |
| 2269 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 211, "<p class=\"dim\">no commit to merge.</p>") | |
| 2215 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 206, "<p class=\"dim\">no commit to merge.</p>") | |
| 2270 | 2216 | if templ_7745c5c3_Err != nil { | |
| 2271 | 2217 | return templ_7745c5c3_Err | |
| 2272 | 2218 | } | |
| 2273 | 2219 | } | |
| 2274 | 2220 | if p.CommitsNote != "" { | |
| 2275 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 212, "<p class=\"note\">") | |
| 2221 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 207, "<p class=\"note\">") | |
| 2276 | 2222 | if templ_7745c5c3_Err != nil { | |
| 2277 | 2223 | return templ_7745c5c3_Err | |
| 2278 | 2224 | } | |
| 2279 | - | var templ_7745c5c3_Var111 string | |
| 2280 | - | templ_7745c5c3_Var111, templ_7745c5c3_Err = templ.JoinStringErrs(p.CommitsNote) | |
| 2225 | + | var templ_7745c5c3_Var108 string | |
| 2226 | + | templ_7745c5c3_Var108, templ_7745c5c3_Err = templ.JoinStringErrs(p.CommitsNote) | |
| 2281 | 2227 | if templ_7745c5c3_Err != nil { | |
| 2282 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 421, Col: 34} | |
| 2228 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 419, Col: 36} | |
| 2283 | 2229 | } | |
| 2284 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var111)) | |
| 2230 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var108)) | |
| 2285 | 2231 | if templ_7745c5c3_Err != nil { | |
| 2286 | 2232 | return templ_7745c5c3_Err | |
| 2287 | 2233 | } | |
| 2288 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 213, "</p>") | |
| 2234 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 208, "</p>") | |
| 2289 | 2235 | if templ_7745c5c3_Err != nil { | |
| 2290 | 2236 | return templ_7745c5c3_Err | |
| 2291 | 2237 | } | |
| 2292 | 2238 | } | |
| 2293 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 214, "</section><section aria-labelledby=\"r-settings\"><h2 id=\"r-settings\">Settings</h2><dl class=\"kv\"><dt>modes</dt><dd>") | |
| 2239 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 209, "</div><div id=\"mr-checks-panel\" data-mr-panel aria-labelledby=\"mr-tab-checks\">") | |
| 2294 | 2240 | if templ_7745c5c3_Err != nil { | |
| 2295 | 2241 | return templ_7745c5c3_Err | |
| 2296 | 2242 | } | |
| 2297 | - | var templ_7745c5c3_Var112 string | |
| 2298 | - | templ_7745c5c3_Var112, templ_7745c5c3_Err = templ.JoinStringErrs(strings.Join(p.Modes, ", ")) | |
| 2243 | + | templ_7745c5c3_Err = MRChecks(p.Checks).Render(ctx, templ_7745c5c3_Buffer) | |
| 2299 | 2244 | if templ_7745c5c3_Err != nil { | |
| 2300 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 428, Col: 36} | |
| 2245 | + | return templ_7745c5c3_Err | |
| 2246 | + | } | |
| 2247 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 210, "</div></details></footer>") | |
| 2248 | + | if templ_7745c5c3_Err != nil { | |
| 2249 | + | return templ_7745c5c3_Err | |
| 2250 | + | } | |
| 2251 | + | return nil | |
| 2252 | + | }) | |
| 2253 | + | } | |
| 2254 | + | ||
| 2255 | + | func mrRail(p MRPage) templ.Component { | |
| 2256 | + | return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { | |
| 2257 | + | templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context | |
| 2258 | + | if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { | |
| 2259 | + | return templ_7745c5c3_CtxErr | |
| 2301 | 2260 | } | |
| 2302 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var112)) | |
| 2261 | + | templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) | |
| 2262 | + | if !templ_7745c5c3_IsBuffer { | |
| 2263 | + | defer func() { | |
| 2264 | + | templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) | |
| 2265 | + | if templ_7745c5c3_Err == nil { | |
| 2266 | + | templ_7745c5c3_Err = templ_7745c5c3_BufErr | |
| 2267 | + | } | |
| 2268 | + | }() | |
| 2269 | + | } | |
| 2270 | + | ctx = templ.InitializeContext(ctx) | |
| 2271 | + | templ_7745c5c3_Var109 := templ.GetChildren(ctx) | |
| 2272 | + | if templ_7745c5c3_Var109 == nil { | |
| 2273 | + | templ_7745c5c3_Var109 = templ.NopComponent | |
| 2274 | + | } | |
| 2275 | + | ctx = templ.ClearChildren(ctx) | |
| 2276 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 211, "<section aria-labelledby=\"r-files\" class=\"r-files\"><h2 id=\"r-files\">Files <span class=\"count\">") | |
| 2303 | 2277 | if templ_7745c5c3_Err != nil { | |
| 2304 | 2278 | return templ_7745c5c3_Err | |
| 2305 | 2279 | } | |
| 2306 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 215, "</dd><dt>checks</dt><dd>") | |
| 2280 | + | var templ_7745c5c3_Var110 string | |
| 2281 | + | templ_7745c5c3_Var110, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(len(p.Files))) | |
| 2282 | + | if templ_7745c5c3_Err != nil { | |
| 2283 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 432, Col: 49} | |
| 2284 | + | } | |
| 2285 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var110)) | |
| 2307 | 2286 | if templ_7745c5c3_Err != nil { | |
| 2308 | 2287 | return templ_7745c5c3_Err | |
| 2309 | 2288 | } | |
| 2310 | - | if p.ChecksBlock { | |
| 2311 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 216, "failing ones block the merge") | |
| 2289 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 212, "</span><kbd aria-hidden=\"true\">g f</kbd> <button type=\"button\" class=\"btn icon fold\" data-js aria-expanded=\"true\" title=\"fold the list of files\" hx-on:click=\"ermiteMR.foldFiles()\"><span class=\"ico i-chevron\" aria-hidden=\"true\"></span><span class=\"sr\">fold the list of files</span></button></h2>") | |
| 2290 | + | if templ_7745c5c3_Err != nil { | |
| 2291 | + | return templ_7745c5c3_Err | |
| 2292 | + | } | |
| 2293 | + | templ_7745c5c3_Err = FileList(p.Files).Render(ctx, templ_7745c5c3_Buffer) | |
| 2294 | + | if templ_7745c5c3_Err != nil { | |
| 2295 | + | return templ_7745c5c3_Err | |
| 2296 | + | } | |
| 2297 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 213, "</section>") | |
| 2298 | + | if templ_7745c5c3_Err != nil { | |
| 2299 | + | return templ_7745c5c3_Err | |
| 2300 | + | } | |
| 2301 | + | if len(p.Verdicts) > 0 { | |
| 2302 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 214, "<section><h2>Verdicts</h2><ul>") | |
| 2312 | 2303 | if templ_7745c5c3_Err != nil { | |
| 2313 | 2304 | return templ_7745c5c3_Err | |
| 2314 | 2305 | } | |
| 2315 | - | } else { | |
| 2316 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 217, "do not block the merge") | |
| 2306 | + | for _, v := range p.Verdicts { | |
| 2307 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 215, "<li><a href=\"") | |
| 2308 | + | if templ_7745c5c3_Err != nil { | |
| 2309 | + | return templ_7745c5c3_Err | |
| 2310 | + | } | |
| 2311 | + | var templ_7745c5c3_Var111 templ.SafeURL | |
| 2312 | + | templ_7745c5c3_Var111, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(v.Href)) | |
| 2313 | + | if templ_7745c5c3_Err != nil { | |
| 2314 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 445, Col: 37} | |
| 2315 | + | } | |
| 2316 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var111)) | |
| 2317 | + | if templ_7745c5c3_Err != nil { | |
| 2318 | + | return templ_7745c5c3_Err | |
| 2319 | + | } | |
| 2320 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 216, "\">") | |
| 2321 | + | if templ_7745c5c3_Err != nil { | |
| 2322 | + | return templ_7745c5c3_Err | |
| 2323 | + | } | |
| 2324 | + | var templ_7745c5c3_Var112 string | |
| 2325 | + | templ_7745c5c3_Var112, templ_7745c5c3_Err = templ.JoinStringErrs(v.Author) | |
| 2326 | + | if templ_7745c5c3_Err != nil { | |
| 2327 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 445, Col: 50} | |
| 2328 | + | } | |
| 2329 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var112)) | |
| 2330 | + | if templ_7745c5c3_Err != nil { | |
| 2331 | + | return templ_7745c5c3_Err | |
| 2332 | + | } | |
| 2333 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 217, ": ") | |
| 2334 | + | if templ_7745c5c3_Err != nil { | |
| 2335 | + | return templ_7745c5c3_Err | |
| 2336 | + | } | |
| 2337 | + | var templ_7745c5c3_Var113 string | |
| 2338 | + | templ_7745c5c3_Var113, templ_7745c5c3_Err = templ.JoinStringErrs(v.Label) | |
| 2339 | + | if templ_7745c5c3_Err != nil { | |
| 2340 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 445, Col: 63} | |
| 2341 | + | } | |
| 2342 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var113)) | |
| 2343 | + | if templ_7745c5c3_Err != nil { | |
| 2344 | + | return templ_7745c5c3_Err | |
| 2345 | + | } | |
| 2346 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 218, "</a> ") | |
| 2347 | + | if templ_7745c5c3_Err != nil { | |
| 2348 | + | return templ_7745c5c3_Err | |
| 2349 | + | } | |
| 2350 | + | if v.Stale { | |
| 2351 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 219, "<span class=\"mute\">(stale)</span>") | |
| 2352 | + | if templ_7745c5c3_Err != nil { | |
| 2353 | + | return templ_7745c5c3_Err | |
| 2354 | + | } | |
| 2355 | + | } | |
| 2356 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 220, "</li>") | |
| 2357 | + | if templ_7745c5c3_Err != nil { | |
| 2358 | + | return templ_7745c5c3_Err | |
| 2359 | + | } | |
| 2360 | + | } | |
| 2361 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 221, "</ul></section>") | |
| 2317 | 2362 | if templ_7745c5c3_Err != nil { | |
| 2318 | 2363 | return templ_7745c5c3_Err | |
| 2319 | 2364 | } | |
| 2320 | 2365 | } | |
| 2321 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 218, "</dd></dl></section>") | |
| 2322 | - | if templ_7745c5c3_Err != nil { | |
| 2323 | - | return templ_7745c5c3_Err | |
| 2324 | - | } | |
| 2325 | 2366 | return nil | |
| 2326 | 2367 | }) | |
| 2327 | 2368 | } | |
| @@ -2346,51 +2387,51 @@ func mrBar(p MRPage) templ.Component { | |||
| 2346 | 2387 | }() | |
| 2347 | 2388 | } | |
| 2348 | 2389 | ctx = templ.InitializeContext(ctx) | |
| 2349 | - | templ_7745c5c3_Var113 := templ.GetChildren(ctx) | |
| 2350 | - | if templ_7745c5c3_Var113 == nil { | |
| 2351 | - | templ_7745c5c3_Var113 = templ.NopComponent | |
| 2390 | + | templ_7745c5c3_Var114 := templ.GetChildren(ctx) | |
| 2391 | + | if templ_7745c5c3_Var114 == nil { | |
| 2392 | + | templ_7745c5c3_Var114 = templ.NopComponent | |
| 2352 | 2393 | } | |
| 2353 | 2394 | ctx = templ.ClearChildren(ctx) | |
| 2354 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 219, "<div class=\"diff-tools mr-bar\" role=\"group\" aria-label=\"Diff view and merge\"><span class=\"dim\">") | |
| 2395 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 222, "<div class=\"diff-tools mr-bar\" role=\"group\" aria-label=\"Diff view and merge\"><span class=\"dim\">") | |
| 2355 | 2396 | if templ_7745c5c3_Err != nil { | |
| 2356 | 2397 | return templ_7745c5c3_Err | |
| 2357 | 2398 | } | |
| 2358 | - | var templ_7745c5c3_Var114 string | |
| 2359 | - | templ_7745c5c3_Var114, templ_7745c5c3_Err = templ.JoinStringErrs(plural(p.NFiles, "file", "files")) | |
| 2399 | + | var templ_7745c5c3_Var115 string | |
| 2400 | + | templ_7745c5c3_Var115, templ_7745c5c3_Err = templ.JoinStringErrs(plural(p.NFiles, "file", "files")) | |
| 2360 | 2401 | if templ_7745c5c3_Err != nil { | |
| 2361 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 447, Col: 55} | |
| 2402 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 462, Col: 55} | |
| 2362 | 2403 | } | |
| 2363 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var114)) | |
| 2404 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var115)) | |
| 2364 | 2405 | if templ_7745c5c3_Err != nil { | |
| 2365 | 2406 | return templ_7745c5c3_Err | |
| 2366 | 2407 | } | |
| 2367 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 220, " · <span class=\"plus\">+") | |
| 2408 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 223, " · <span class=\"plus\">+") | |
| 2368 | 2409 | if templ_7745c5c3_Err != nil { | |
| 2369 | 2410 | return templ_7745c5c3_Err | |
| 2370 | 2411 | } | |
| 2371 | - | var templ_7745c5c3_Var115 string | |
| 2372 | - | templ_7745c5c3_Var115, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Adds)) | |
| 2412 | + | var templ_7745c5c3_Var116 string | |
| 2413 | + | templ_7745c5c3_Var116, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Adds)) | |
| 2373 | 2414 | if templ_7745c5c3_Err != nil { | |
| 2374 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 447, Col: 95} | |
| 2415 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 462, Col: 95} | |
| 2375 | 2416 | } | |
| 2376 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var115)) | |
| 2417 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var116)) | |
| 2377 | 2418 | if templ_7745c5c3_Err != nil { | |
| 2378 | 2419 | return templ_7745c5c3_Err | |
| 2379 | 2420 | } | |
| 2380 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 221, "</span> <span class=\"minus\">-") | |
| 2421 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 224, "</span> <span class=\"minus\">-") | |
| 2381 | 2422 | if templ_7745c5c3_Err != nil { | |
| 2382 | 2423 | return templ_7745c5c3_Err | |
| 2383 | 2424 | } | |
| 2384 | - | var templ_7745c5c3_Var116 string | |
| 2385 | - | templ_7745c5c3_Var116, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Dels)) | |
| 2425 | + | var templ_7745c5c3_Var117 string | |
| 2426 | + | templ_7745c5c3_Var117, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Dels)) | |
| 2386 | 2427 | if templ_7745c5c3_Err != nil { | |
| 2387 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 447, Col: 140} | |
| 2428 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 462, Col: 140} | |
| 2388 | 2429 | } | |
| 2389 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var116)) | |
| 2430 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var117)) | |
| 2390 | 2431 | if templ_7745c5c3_Err != nil { | |
| 2391 | 2432 | return templ_7745c5c3_Err | |
| 2392 | 2433 | } | |
| 2393 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 222, "</span></span>") | |
| 2434 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 225, "</span></span>") | |
| 2394 | 2435 | if templ_7745c5c3_Err != nil { | |
| 2395 | 2436 | return templ_7745c5c3_Err | |
| 2396 | 2437 | } | |
| @@ -2398,7 +2439,7 @@ func mrBar(p MRPage) templ.Component { | |||
| 2398 | 2439 | if templ_7745c5c3_Err != nil { | |
| 2399 | 2440 | return templ_7745c5c3_Err | |
| 2400 | 2441 | } | |
| 2401 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 223, "<span class=\"grow\"></span>") | |
| 2442 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 226, "<span class=\"grow\"></span>") | |
| 2402 | 2443 | if templ_7745c5c3_Err != nil { | |
| 2403 | 2444 | return templ_7745c5c3_Err | |
| 2404 | 2445 | } | |
| @@ -2411,16 +2452,12 @@ func mrBar(p MRPage) templ.Component { | |||
| 2411 | 2452 | if templ_7745c5c3_Err != nil { | |
| 2412 | 2453 | return templ_7745c5c3_Err | |
| 2413 | 2454 | } | |
| 2414 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 224, " ") | |
| 2415 | - | if templ_7745c5c3_Err != nil { | |
| 2416 | - | return templ_7745c5c3_Err | |
| 2417 | - | } | |
| 2418 | - | templ_7745c5c3_Err = moreMenu(p).Render(ctx, templ_7745c5c3_Buffer) | |
| 2419 | - | if templ_7745c5c3_Err != nil { | |
| 2420 | - | return templ_7745c5c3_Err | |
| 2421 | - | } | |
| 2422 | 2455 | } | |
| 2423 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 225, "</div>") | |
| 2456 | + | templ_7745c5c3_Err = moreMenu(p).Render(ctx, templ_7745c5c3_Buffer) | |
| 2457 | + | if templ_7745c5c3_Err != nil { | |
| 2458 | + | return templ_7745c5c3_Err | |
| 2459 | + | } | |
| 2460 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 227, "</div>") | |
| 2424 | 2461 | if templ_7745c5c3_Err != nil { | |
| 2425 | 2462 | return templ_7745c5c3_Err | |
| 2426 | 2463 | } | |
| @@ -2452,84 +2489,57 @@ func mergeMenu(p MRPage) templ.Component { | |||
| 2452 | 2489 | }() | |
| 2453 | 2490 | } | |
| 2454 | 2491 | ctx = templ.InitializeContext(ctx) | |
| 2455 | - | templ_7745c5c3_Var117 := templ.GetChildren(ctx) | |
| 2456 | - | if templ_7745c5c3_Var117 == nil { | |
| 2457 | - | templ_7745c5c3_Var117 = templ.NopComponent | |
| 2492 | + | templ_7745c5c3_Var118 := templ.GetChildren(ctx) | |
| 2493 | + | if templ_7745c5c3_Var118 == nil { | |
| 2494 | + | templ_7745c5c3_Var118 = templ.NopComponent | |
| 2458 | 2495 | } | |
| 2459 | 2496 | ctx = templ.ClearChildren(ctx) | |
| 2460 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 226, "<details class=\"menu mmenu\" id=\"merge-menu\" data-state=\"open\"") | |
| 2497 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 228, "<details class=\"menu mmenu\" id=\"merge-menu\" data-state=\"open\"") | |
| 2461 | 2498 | if templ_7745c5c3_Err != nil { | |
| 2462 | 2499 | return templ_7745c5c3_Err | |
| 2463 | 2500 | } | |
| 2464 | 2501 | if p.Box.Error != "" { | |
| 2465 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 227, " open") | |
| 2502 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 229, " open") | |
| 2466 | 2503 | if templ_7745c5c3_Err != nil { | |
| 2467 | 2504 | return templ_7745c5c3_Err | |
| 2468 | 2505 | } | |
| 2469 | 2506 | } | |
| 2470 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 228, "><summary class=\"btn primary\" aria-keyshortcuts=\"Shift+M\">") | |
| 2507 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 230, "><summary class=\"btn primary\" aria-keyshortcuts=\"Shift+M\">") | |
| 2471 | 2508 | if templ_7745c5c3_Err != nil { | |
| 2472 | 2509 | return templ_7745c5c3_Err | |
| 2473 | 2510 | } | |
| 2474 | 2511 | if p.Box.ReadyAction != "" { | |
| 2475 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 229, "Draft ") | |
| 2512 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 231, "Draft ") | |
| 2476 | 2513 | if templ_7745c5c3_Err != nil { | |
| 2477 | 2514 | return templ_7745c5c3_Err | |
| 2478 | 2515 | } | |
| 2479 | 2516 | } else { | |
| 2480 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 230, "Merge ") | |
| 2517 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 232, "Merge ") | |
| 2481 | 2518 | if templ_7745c5c3_Err != nil { | |
| 2482 | 2519 | return templ_7745c5c3_Err | |
| 2483 | 2520 | } | |
| 2484 | 2521 | } | |
| 2485 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 231, "<kbd aria-hidden=\"true\">M</kbd></summary><div class=\"menu-pop\" role=\"group\" aria-label=\"Merge\"><dl class=\"kv\"><dt>head</dt><dd>") | |
| 2522 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 233, "<kbd aria-hidden=\"true\">M</kbd></summary><div class=\"menu-pop\" role=\"group\" aria-label=\"Merge\">") | |
| 2486 | 2523 | if templ_7745c5c3_Err != nil { | |
| 2487 | 2524 | return templ_7745c5c3_Err | |
| 2488 | 2525 | } | |
| 2489 | 2526 | if p.Box.HeadGone { | |
| 2490 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 232, "gone: the source branch was deleted") | |
| 2491 | - | if templ_7745c5c3_Err != nil { | |
| 2492 | - | return templ_7745c5c3_Err | |
| 2493 | - | } | |
| 2494 | - | } else { | |
| 2495 | - | var templ_7745c5c3_Var118 string | |
| 2496 | - | templ_7745c5c3_Var118, templ_7745c5c3_Err = templ.JoinStringErrs(p.HeadShort) | |
| 2497 | - | if templ_7745c5c3_Err != nil { | |
| 2498 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 483, Col: 19} | |
| 2499 | - | } | |
| 2500 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var118)) | |
| 2527 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 234, "<p class=\"dim\">the source branch was deleted</p>") | |
| 2501 | 2528 | if templ_7745c5c3_Err != nil { | |
| 2502 | 2529 | return templ_7745c5c3_Err | |
| 2503 | 2530 | } | |
| 2504 | 2531 | } | |
| 2505 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 233, "</dd><dt>into</dt><dd>") | |
| 2506 | - | if templ_7745c5c3_Err != nil { | |
| 2507 | - | return templ_7745c5c3_Err | |
| 2508 | - | } | |
| 2509 | - | var templ_7745c5c3_Var119 string | |
| 2510 | - | templ_7745c5c3_Var119, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | |
| 2511 | - | if templ_7745c5c3_Err != nil { | |
| 2512 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 487, Col: 18} | |
| 2513 | - | } | |
| 2514 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var119)) | |
| 2515 | - | if templ_7745c5c3_Err != nil { | |
| 2516 | - | return templ_7745c5c3_Err | |
| 2517 | - | } | |
| 2518 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 234, "</dd></dl>") | |
| 2519 | - | if templ_7745c5c3_Err != nil { | |
| 2520 | - | return templ_7745c5c3_Err | |
| 2521 | - | } | |
| 2522 | 2532 | if p.Box.Error != "" { | |
| 2523 | 2533 | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 235, "<p class=\"d-err\" role=\"alert\">") | |
| 2524 | 2534 | if templ_7745c5c3_Err != nil { | |
| 2525 | 2535 | return templ_7745c5c3_Err | |
| 2526 | 2536 | } | |
| 2527 | - | var templ_7745c5c3_Var120 string | |
| 2528 | - | templ_7745c5c3_Var120, templ_7745c5c3_Err = templ.JoinStringErrs(p.Box.Error) | |
| 2537 | + | var templ_7745c5c3_Var119 string | |
| 2538 | + | templ_7745c5c3_Var119, templ_7745c5c3_Err = templ.JoinStringErrs(p.Box.Error) | |
| 2529 | 2539 | if templ_7745c5c3_Err != nil { | |
| 2530 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 490, Col: 47} | |
| 2540 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 496, Col: 47} | |
| 2531 | 2541 | } | |
| 2532 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var120)) | |
| 2542 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var119)) | |
| 2533 | 2543 | if templ_7745c5c3_Err != nil { | |
| 2534 | 2544 | return templ_7745c5c3_Err | |
| 2535 | 2545 | } | |
| @@ -2543,12 +2553,12 @@ func mergeMenu(p MRPage) templ.Component { | |||
| 2543 | 2553 | if templ_7745c5c3_Err != nil { | |
| 2544 | 2554 | return templ_7745c5c3_Err | |
| 2545 | 2555 | } | |
| 2546 | - | var templ_7745c5c3_Var121 templ.SafeURL | |
| 2547 | - | templ_7745c5c3_Var121, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.ReadyAction)) | |
| 2556 | + | var templ_7745c5c3_Var120 templ.SafeURL | |
| 2557 | + | templ_7745c5c3_Var120, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.ReadyAction)) | |
| 2548 | 2558 | if templ_7745c5c3_Err != nil { | |
| 2549 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 494, Col: 80} | |
| 2559 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 500, Col: 80} | |
| 2550 | 2560 | } | |
| 2551 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var121)) | |
| 2561 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var120)) | |
| 2552 | 2562 | if templ_7745c5c3_Err != nil { | |
| 2553 | 2563 | return templ_7745c5c3_Err | |
| 2554 | 2564 | } | |
| @@ -2565,12 +2575,12 @@ func mergeMenu(p MRPage) templ.Component { | |||
| 2565 | 2575 | if templ_7745c5c3_Err != nil { | |
| 2566 | 2576 | return templ_7745c5c3_Err | |
| 2567 | 2577 | } | |
| 2568 | - | var templ_7745c5c3_Var122 templ.SafeURL | |
| 2569 | - | templ_7745c5c3_Var122, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.MergeAction)) | |
| 2578 | + | var templ_7745c5c3_Var121 templ.SafeURL | |
| 2579 | + | templ_7745c5c3_Var121, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.MergeAction)) | |
| 2570 | 2580 | if templ_7745c5c3_Err != nil { | |
| 2571 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 499, Col: 80} | |
| 2581 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 505, Col: 80} | |
| 2572 | 2582 | } | |
| 2573 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var122)) | |
| 2583 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var121)) | |
| 2574 | 2584 | if templ_7745c5c3_Err != nil { | |
| 2575 | 2585 | return templ_7745c5c3_Err | |
| 2576 | 2586 | } | |
| @@ -2578,12 +2588,12 @@ func mergeMenu(p MRPage) templ.Component { | |||
| 2578 | 2588 | if templ_7745c5c3_Err != nil { | |
| 2579 | 2589 | return templ_7745c5c3_Err | |
| 2580 | 2590 | } | |
| 2581 | - | var templ_7745c5c3_Var123 string | |
| 2582 | - | templ_7745c5c3_Var123, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Box.Head) | |
| 2591 | + | var templ_7745c5c3_Var122 string | |
| 2592 | + | templ_7745c5c3_Var122, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Box.Head) | |
| 2583 | 2593 | if templ_7745c5c3_Err != nil { | |
| 2584 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 500, Col: 59} | |
| 2594 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 506, Col: 59} | |
| 2585 | 2595 | } | |
| 2586 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var123) | |
| 2596 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var122) | |
| 2587 | 2597 | if templ_7745c5c3_Err != nil { | |
| 2588 | 2598 | return templ_7745c5c3_Err | |
| 2589 | 2599 | } | |
| @@ -2596,12 +2606,12 @@ func mergeMenu(p MRPage) templ.Component { | |||
| 2596 | 2606 | if templ_7745c5c3_Err != nil { | |
| 2597 | 2607 | return templ_7745c5c3_Err | |
| 2598 | 2608 | } | |
| 2599 | - | var templ_7745c5c3_Var124 string | |
| 2600 | - | templ_7745c5c3_Var124, templ_7745c5c3_Err = templ.ResolveAttributeValue(m.Value) | |
| 2609 | + | var templ_7745c5c3_Var123 string | |
| 2610 | + | templ_7745c5c3_Var123, templ_7745c5c3_Err = templ.ResolveAttributeValue(m.Value) | |
| 2601 | 2611 | if templ_7745c5c3_Err != nil { | |
| 2602 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 508, Col: 24} | |
| 2612 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 514, Col: 24} | |
| 2603 | 2613 | } | |
| 2604 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var124) | |
| 2614 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var123) | |
| 2605 | 2615 | if templ_7745c5c3_Err != nil { | |
| 2606 | 2616 | return templ_7745c5c3_Err | |
| 2607 | 2617 | } | |
| @@ -2625,12 +2635,12 @@ func mergeMenu(p MRPage) templ.Component { | |||
| 2625 | 2635 | if templ_7745c5c3_Err != nil { | |
| 2626 | 2636 | return templ_7745c5c3_Err | |
| 2627 | 2637 | } | |
| 2628 | - | var templ_7745c5c3_Var125 string | |
| 2629 | - | templ_7745c5c3_Var125, templ_7745c5c3_Err = templ.ResolveAttributeValue(m.Reason) | |
| 2638 | + | var templ_7745c5c3_Var124 string | |
| 2639 | + | templ_7745c5c3_Var124, templ_7745c5c3_Err = templ.ResolveAttributeValue(m.Reason) | |
| 2630 | 2640 | if templ_7745c5c3_Err != nil { | |
| 2631 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 511, Col: 25} | |
| 2641 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 517, Col: 25} | |
| 2632 | 2642 | } | |
| 2633 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var125) | |
| 2643 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var124) | |
| 2634 | 2644 | if templ_7745c5c3_Err != nil { | |
| 2635 | 2645 | return templ_7745c5c3_Err | |
| 2636 | 2646 | } | |
| @@ -2638,12 +2648,12 @@ func mergeMenu(p MRPage) templ.Component { | |||
| 2638 | 2648 | if templ_7745c5c3_Err != nil { | |
| 2639 | 2649 | return templ_7745c5c3_Err | |
| 2640 | 2650 | } | |
| 2641 | - | var templ_7745c5c3_Var126 string | |
| 2642 | - | templ_7745c5c3_Var126, templ_7745c5c3_Err = templ.JoinStringErrs(m.Label) | |
| 2651 | + | var templ_7745c5c3_Var125 string | |
| 2652 | + | templ_7745c5c3_Var125, templ_7745c5c3_Err = templ.JoinStringErrs(m.Label) | |
| 2643 | 2653 | if templ_7745c5c3_Err != nil { | |
| 2644 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 515, Col: 17} | |
| 2654 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 521, Col: 17} | |
| 2645 | 2655 | } | |
| 2646 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var126)) | |
| 2656 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var125)) | |
| 2647 | 2657 | if templ_7745c5c3_Err != nil { | |
| 2648 | 2658 | return templ_7745c5c3_Err | |
| 2649 | 2659 | } | |
| @@ -2656,12 +2666,12 @@ func mergeMenu(p MRPage) templ.Component { | |||
| 2656 | 2666 | if templ_7745c5c3_Err != nil { | |
| 2657 | 2667 | return templ_7745c5c3_Err | |
| 2658 | 2668 | } | |
| 2659 | - | var templ_7745c5c3_Var127 string | |
| 2660 | - | templ_7745c5c3_Var127, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(i + 1)) | |
| 2669 | + | var templ_7745c5c3_Var126 string | |
| 2670 | + | templ_7745c5c3_Var126, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(i + 1)) | |
| 2661 | 2671 | if templ_7745c5c3_Err != nil { | |
| 2662 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 517, Col: 46} | |
| 2672 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 523, Col: 46} | |
| 2663 | 2673 | } | |
| 2664 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var127)) | |
| 2674 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var126)) | |
| 2665 | 2675 | if templ_7745c5c3_Err != nil { | |
| 2666 | 2676 | return templ_7745c5c3_Err | |
| 2667 | 2677 | } | |
| @@ -2679,96 +2689,67 @@ func mergeMenu(p MRPage) templ.Component { | |||
| 2679 | 2689 | if templ_7745c5c3_Err != nil { | |
| 2680 | 2690 | return templ_7745c5c3_Err | |
| 2681 | 2691 | } | |
| 2682 | - | if p.Box.Signed { | |
| 2683 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 253, "<p class=\"d-note\" id=\"mr-signing\">squash and merge commits are signed with ermite's own key (generated on first start). ") | |
| 2684 | - | if templ_7745c5c3_Err != nil { | |
| 2685 | - | return templ_7745c5c3_Err | |
| 2686 | - | } | |
| 2687 | - | if p.Box.Fingerprint != "" { | |
| 2688 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 254, "fingerprint <code>") | |
| 2689 | - | if templ_7745c5c3_Err != nil { | |
| 2690 | - | return templ_7745c5c3_Err | |
| 2691 | - | } | |
| 2692 | - | var templ_7745c5c3_Var128 string | |
| 2693 | - | templ_7745c5c3_Var128, templ_7745c5c3_Err = templ.JoinStringErrs(p.Box.Fingerprint) | |
| 2694 | - | if templ_7745c5c3_Err != nil { | |
| 2695 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 526, Col: 45} | |
| 2696 | - | } | |
| 2697 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var128)) | |
| 2698 | - | if templ_7745c5c3_Err != nil { | |
| 2699 | - | return templ_7745c5c3_Err | |
| 2700 | - | } | |
| 2701 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 255, "</code> ") | |
| 2702 | - | if templ_7745c5c3_Err != nil { | |
| 2703 | - | return templ_7745c5c3_Err | |
| 2704 | - | } | |
| 2705 | - | } | |
| 2706 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 256, "<code>ermite signing-key show</code> prints it.</p>") | |
| 2707 | - | if templ_7745c5c3_Err != nil { | |
| 2708 | - | return templ_7745c5c3_Err | |
| 2709 | - | } | |
| 2710 | - | } | |
| 2711 | 2692 | if p.Box.CanDeleteBranch { | |
| 2712 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 257, "<label class=\"d-check\"><input type=\"checkbox\" name=\"delete_branch\" value=\"1\"> delete ") | |
| 2693 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 253, "<label class=\"d-check\"><input type=\"checkbox\" name=\"delete_branch\" value=\"1\"> delete ") | |
| 2713 | 2694 | if templ_7745c5c3_Err != nil { | |
| 2714 | 2695 | return templ_7745c5c3_Err | |
| 2715 | 2696 | } | |
| 2716 | - | var templ_7745c5c3_Var129 string | |
| 2717 | - | templ_7745c5c3_Var129, templ_7745c5c3_Err = templ.JoinStringErrs(p.Source) | |
| 2697 | + | var templ_7745c5c3_Var127 string | |
| 2698 | + | templ_7745c5c3_Var127, templ_7745c5c3_Err = templ.JoinStringErrs(p.Source) | |
| 2718 | 2699 | if templ_7745c5c3_Err != nil { | |
| 2719 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 532, Col: 102} | |
| 2700 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 529, Col: 102} | |
| 2720 | 2701 | } | |
| 2721 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var129)) | |
| 2702 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var127)) | |
| 2722 | 2703 | if templ_7745c5c3_Err != nil { | |
| 2723 | 2704 | return templ_7745c5c3_Err | |
| 2724 | 2705 | } | |
| 2725 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 258, " after the merge <kbd aria-hidden=\"true\">D</kbd></label>") | |
| 2706 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 254, " after the merge <kbd aria-hidden=\"true\">D</kbd></label>") | |
| 2726 | 2707 | if templ_7745c5c3_Err != nil { | |
| 2727 | 2708 | return templ_7745c5c3_Err | |
| 2728 | 2709 | } | |
| 2729 | 2710 | } | |
| 2730 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 259, "<div class=\"d-btns\"><button type=\"submit\" class=\"btn primary\" data-default") | |
| 2711 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 255, "<div class=\"d-btns\"><button type=\"submit\" class=\"btn primary\" data-default") | |
| 2731 | 2712 | if templ_7745c5c3_Err != nil { | |
| 2732 | 2713 | return templ_7745c5c3_Err | |
| 2733 | 2714 | } | |
| 2734 | 2715 | if !p.Box.CanMerge() { | |
| 2735 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 260, " disabled") | |
| 2716 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 256, " disabled") | |
| 2736 | 2717 | if templ_7745c5c3_Err != nil { | |
| 2737 | 2718 | return templ_7745c5c3_Err | |
| 2738 | 2719 | } | |
| 2739 | 2720 | } | |
| 2740 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 261, " title=\"") | |
| 2721 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 257, " title=\"") | |
| 2741 | 2722 | if templ_7745c5c3_Err != nil { | |
| 2742 | 2723 | return templ_7745c5c3_Err | |
| 2743 | 2724 | } | |
| 2744 | - | var templ_7745c5c3_Var130 string | |
| 2745 | - | templ_7745c5c3_Var130, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Box.MergeTitle()) | |
| 2725 | + | var templ_7745c5c3_Var128 string | |
| 2726 | + | templ_7745c5c3_Var128, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Box.MergeTitle()) | |
| 2746 | 2727 | if templ_7745c5c3_Err != nil { | |
| 2747 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 540, Col: 33} | |
| 2728 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 537, Col: 33} | |
| 2748 | 2729 | } | |
| 2749 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var130) | |
| 2730 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var128) | |
| 2750 | 2731 | if templ_7745c5c3_Err != nil { | |
| 2751 | 2732 | return templ_7745c5c3_Err | |
| 2752 | 2733 | } | |
| 2753 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 262, "\" :disabled=\"!this.form.querySelector('input[name=mode]:checked:not(:disabled)')\" :title=\"(this.form.querySelector('input[name=mode]:checked') || {}).title || ''\">Merge into ") | |
| 2734 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 258, "\" :disabled=\"!this.form.querySelector('input[name=mode]:checked:not(:disabled)')\" :title=\"(this.form.querySelector('input[name=mode]:checked') || {}).title || ''\">Merge into ") | |
| 2754 | 2735 | if templ_7745c5c3_Err != nil { | |
| 2755 | 2736 | return templ_7745c5c3_Err | |
| 2756 | 2737 | } | |
| 2757 | - | var templ_7745c5c3_Var131 string | |
| 2758 | - | templ_7745c5c3_Var131, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | |
| 2738 | + | var templ_7745c5c3_Var129 string | |
| 2739 | + | templ_7745c5c3_Var129, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | |
| 2759 | 2740 | if templ_7745c5c3_Err != nil { | |
| 2760 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 543, Col: 28} | |
| 2741 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 540, Col: 28} | |
| 2761 | 2742 | } | |
| 2762 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var131)) | |
| 2743 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var129)) | |
| 2763 | 2744 | if templ_7745c5c3_Err != nil { | |
| 2764 | 2745 | return templ_7745c5c3_Err | |
| 2765 | 2746 | } | |
| 2766 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 263, "</button></div></form>") | |
| 2747 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 259, "</button></div></form>") | |
| 2767 | 2748 | if templ_7745c5c3_Err != nil { | |
| 2768 | 2749 | return templ_7745c5c3_Err | |
| 2769 | 2750 | } | |
| 2770 | 2751 | } | |
| 2771 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 264, "</div></details>") | |
| 2752 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 260, "</div></details>") | |
| 2772 | 2753 | if templ_7745c5c3_Err != nil { | |
| 2773 | 2754 | return templ_7745c5c3_Err | |
| 2774 | 2755 | } | |
| @@ -2794,182 +2775,182 @@ func MRMergeability(v MergeabilityView) templ.Component { | |||
| 2794 | 2775 | }() | |
| 2795 | 2776 | } | |
| 2796 | 2777 | ctx = templ.InitializeContext(ctx) | |
| 2797 | - | templ_7745c5c3_Var132 := templ.GetChildren(ctx) | |
| 2798 | - | if templ_7745c5c3_Var132 == nil { | |
| 2799 | - | templ_7745c5c3_Var132 = templ.NopComponent | |
| 2778 | + | templ_7745c5c3_Var130 := templ.GetChildren(ctx) | |
| 2779 | + | if templ_7745c5c3_Var130 == nil { | |
| 2780 | + | templ_7745c5c3_Var130 = templ.NopComponent | |
| 2800 | 2781 | } | |
| 2801 | 2782 | ctx = templ.ClearChildren(ctx) | |
| 2802 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 265, "<span data-mergeability data-state=\"") | |
| 2783 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 261, "<span data-mergeability data-state=\"") | |
| 2803 | 2784 | if templ_7745c5c3_Err != nil { | |
| 2804 | 2785 | return templ_7745c5c3_Err | |
| 2805 | 2786 | } | |
| 2806 | - | var templ_7745c5c3_Var133 string | |
| 2807 | - | templ_7745c5c3_Var133, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.State) | |
| 2787 | + | var templ_7745c5c3_Var131 string | |
| 2788 | + | templ_7745c5c3_Var131, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.State) | |
| 2808 | 2789 | if templ_7745c5c3_Err != nil { | |
| 2809 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 556, Col: 22} | |
| 2790 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 553, Col: 22} | |
| 2810 | 2791 | } | |
| 2811 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var133) | |
| 2792 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var131) | |
| 2812 | 2793 | if templ_7745c5c3_Err != nil { | |
| 2813 | 2794 | return templ_7745c5c3_Err | |
| 2814 | 2795 | } | |
| 2815 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 266, "\" data-ff-ok=\"") | |
| 2796 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 262, "\" data-ff-ok=\"") | |
| 2816 | 2797 | if templ_7745c5c3_Err != nil { | |
| 2817 | 2798 | return templ_7745c5c3_Err | |
| 2818 | 2799 | } | |
| 2819 | - | var templ_7745c5c3_Var134 string | |
| 2820 | - | templ_7745c5c3_Var134, templ_7745c5c3_Err = templ.ResolveAttributeValue(strconv.FormatBool(v.FFOk)) | |
| 2800 | + | var templ_7745c5c3_Var132 string | |
| 2801 | + | templ_7745c5c3_Var132, templ_7745c5c3_Err = templ.ResolveAttributeValue(strconv.FormatBool(v.FFOk)) | |
| 2821 | 2802 | if templ_7745c5c3_Err != nil { | |
| 2822 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 557, Col: 41} | |
| 2803 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 554, Col: 41} | |
| 2823 | 2804 | } | |
| 2824 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var134) | |
| 2805 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var132) | |
| 2825 | 2806 | if templ_7745c5c3_Err != nil { | |
| 2826 | 2807 | return templ_7745c5c3_Err | |
| 2827 | 2808 | } | |
| 2828 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 267, "\" data-merge-ok=\"") | |
| 2809 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 263, "\" data-merge-ok=\"") | |
| 2829 | 2810 | if templ_7745c5c3_Err != nil { | |
| 2830 | 2811 | return templ_7745c5c3_Err | |
| 2831 | 2812 | } | |
| 2832 | - | var templ_7745c5c3_Var135 string | |
| 2833 | - | templ_7745c5c3_Var135, templ_7745c5c3_Err = templ.ResolveAttributeValue(strconv.FormatBool(v.MergeOk)) | |
| 2813 | + | var templ_7745c5c3_Var133 string | |
| 2814 | + | templ_7745c5c3_Var133, templ_7745c5c3_Err = templ.ResolveAttributeValue(strconv.FormatBool(v.MergeOk)) | |
| 2834 | 2815 | if templ_7745c5c3_Err != nil { | |
| 2835 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 558, Col: 47} | |
| 2816 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 555, Col: 47} | |
| 2836 | 2817 | } | |
| 2837 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var135) | |
| 2818 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var133) | |
| 2838 | 2819 | if templ_7745c5c3_Err != nil { | |
| 2839 | 2820 | return templ_7745c5c3_Err | |
| 2840 | 2821 | } | |
| 2841 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 268, "\" data-ff-reason=\"") | |
| 2822 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 264, "\" data-ff-reason=\"") | |
| 2842 | 2823 | if templ_7745c5c3_Err != nil { | |
| 2843 | 2824 | return templ_7745c5c3_Err | |
| 2844 | 2825 | } | |
| 2845 | - | var templ_7745c5c3_Var136 string | |
| 2846 | - | templ_7745c5c3_Var136, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.FFReason) | |
| 2826 | + | var templ_7745c5c3_Var134 string | |
| 2827 | + | templ_7745c5c3_Var134, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.FFReason) | |
| 2847 | 2828 | if templ_7745c5c3_Err != nil { | |
| 2848 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 559, Col: 29} | |
| 2829 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 556, Col: 29} | |
| 2849 | 2830 | } | |
| 2850 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var136) | |
| 2831 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var134) | |
| 2851 | 2832 | if templ_7745c5c3_Err != nil { | |
| 2852 | 2833 | return templ_7745c5c3_Err | |
| 2853 | 2834 | } | |
| 2854 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 269, "\" data-merge-reason=\"") | |
| 2835 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 265, "\" data-merge-reason=\"") | |
| 2855 | 2836 | if templ_7745c5c3_Err != nil { | |
| 2856 | 2837 | return templ_7745c5c3_Err | |
| 2857 | 2838 | } | |
| 2858 | - | var templ_7745c5c3_Var137 string | |
| 2859 | - | templ_7745c5c3_Var137, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.MergeReason) | |
| 2839 | + | var templ_7745c5c3_Var135 string | |
| 2840 | + | templ_7745c5c3_Var135, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.MergeReason) | |
| 2860 | 2841 | if templ_7745c5c3_Err != nil { | |
| 2861 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 560, Col: 35} | |
| 2842 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 557, Col: 35} | |
| 2862 | 2843 | } | |
| 2863 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var137) | |
| 2844 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var135) | |
| 2864 | 2845 | if templ_7745c5c3_Err != nil { | |
| 2865 | 2846 | return templ_7745c5c3_Err | |
| 2866 | 2847 | } | |
| 2867 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 270, "\"><span class=\"badge\" data-state=\"") | |
| 2848 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 266, "\"><span class=\"badge\" data-state=\"") | |
| 2868 | 2849 | if templ_7745c5c3_Err != nil { | |
| 2869 | 2850 | return templ_7745c5c3_Err | |
| 2870 | 2851 | } | |
| 2871 | - | var templ_7745c5c3_Var138 string | |
| 2872 | - | templ_7745c5c3_Var138, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.State) | |
| 2852 | + | var templ_7745c5c3_Var136 string | |
| 2853 | + | templ_7745c5c3_Var136, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.State) | |
| 2873 | 2854 | if templ_7745c5c3_Err != nil { | |
| 2874 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 562, Col: 42} | |
| 2855 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 559, Col: 42} | |
| 2875 | 2856 | } | |
| 2876 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var138) | |
| 2857 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var136) | |
| 2877 | 2858 | if templ_7745c5c3_Err != nil { | |
| 2878 | 2859 | return templ_7745c5c3_Err | |
| 2879 | 2860 | } | |
| 2880 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 271, "\">") | |
| 2861 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 267, "\">") | |
| 2881 | 2862 | if templ_7745c5c3_Err != nil { | |
| 2882 | 2863 | return templ_7745c5c3_Err | |
| 2883 | 2864 | } | |
| 2884 | - | var templ_7745c5c3_Var139 string | |
| 2885 | - | templ_7745c5c3_Var139, templ_7745c5c3_Err = templ.JoinStringErrs(v.Label) | |
| 2865 | + | var templ_7745c5c3_Var137 string | |
| 2866 | + | templ_7745c5c3_Var137, templ_7745c5c3_Err = templ.JoinStringErrs(v.Label) | |
| 2886 | 2867 | if templ_7745c5c3_Err != nil { | |
| 2887 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 562, Col: 54} | |
| 2868 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 559, Col: 54} | |
| 2888 | 2869 | } | |
| 2889 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var139)) | |
| 2870 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var137)) | |
| 2890 | 2871 | if templ_7745c5c3_Err != nil { | |
| 2891 | 2872 | return templ_7745c5c3_Err | |
| 2892 | 2873 | } | |
| 2893 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 272, "</span> ") | |
| 2874 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 268, "</span> ") | |
| 2894 | 2875 | if templ_7745c5c3_Err != nil { | |
| 2895 | 2876 | return templ_7745c5c3_Err | |
| 2896 | 2877 | } | |
| 2897 | 2878 | if v.Detail != "" { | |
| 2898 | - | var templ_7745c5c3_Var140 string | |
| 2899 | - | templ_7745c5c3_Var140, templ_7745c5c3_Err = templ.JoinStringErrs(" ") | |
| 2879 | + | var templ_7745c5c3_Var138 string | |
| 2880 | + | templ_7745c5c3_Var138, templ_7745c5c3_Err = templ.JoinStringErrs(" ") | |
| 2900 | 2881 | if templ_7745c5c3_Err != nil { | |
| 2901 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 564, Col: 8} | |
| 2882 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 561, Col: 8} | |
| 2902 | 2883 | } | |
| 2903 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var140)) | |
| 2884 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var138)) | |
| 2904 | 2885 | if templ_7745c5c3_Err != nil { | |
| 2905 | 2886 | return templ_7745c5c3_Err | |
| 2906 | 2887 | } | |
| 2907 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 273, "<span class=\"dim\">") | |
| 2888 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 269, "<span class=\"dim\">") | |
| 2908 | 2889 | if templ_7745c5c3_Err != nil { | |
| 2909 | 2890 | return templ_7745c5c3_Err | |
| 2910 | 2891 | } | |
| 2911 | - | var templ_7745c5c3_Var141 string | |
| 2912 | - | templ_7745c5c3_Var141, templ_7745c5c3_Err = templ.JoinStringErrs(v.Detail) | |
| 2892 | + | var templ_7745c5c3_Var139 string | |
| 2893 | + | templ_7745c5c3_Var139, templ_7745c5c3_Err = templ.JoinStringErrs(v.Detail) | |
| 2913 | 2894 | if templ_7745c5c3_Err != nil { | |
| 2914 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 564, Col: 38} | |
| 2895 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 561, Col: 38} | |
| 2915 | 2896 | } | |
| 2916 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var141)) | |
| 2897 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var139)) | |
| 2917 | 2898 | if templ_7745c5c3_Err != nil { | |
| 2918 | 2899 | return templ_7745c5c3_Err | |
| 2919 | 2900 | } | |
| 2920 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 274, "</span>") | |
| 2901 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 270, "</span>") | |
| 2921 | 2902 | if templ_7745c5c3_Err != nil { | |
| 2922 | 2903 | return templ_7745c5c3_Err | |
| 2923 | 2904 | } | |
| 2924 | 2905 | } | |
| 2925 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 275, "</span> ") | |
| 2906 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 271, "</span> ") | |
| 2926 | 2907 | if templ_7745c5c3_Err != nil { | |
| 2927 | 2908 | return templ_7745c5c3_Err | |
| 2928 | 2909 | } | |
| 2929 | 2910 | if len(v.Paths) > 0 { | |
| 2930 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 276, "<ul class=\"mg-paths\" aria-label=\"conflicting files\">") | |
| 2911 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 272, "<ul class=\"mg-paths\" aria-label=\"conflicting files\">") | |
| 2931 | 2912 | if templ_7745c5c3_Err != nil { | |
| 2932 | 2913 | return templ_7745c5c3_Err | |
| 2933 | 2914 | } | |
| 2934 | 2915 | for _, path := range v.Paths { | |
| 2935 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 277, "<li><code>") | |
| 2916 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 273, "<li><code>") | |
| 2936 | 2917 | if templ_7745c5c3_Err != nil { | |
| 2937 | 2918 | return templ_7745c5c3_Err | |
| 2938 | 2919 | } | |
| 2939 | - | var templ_7745c5c3_Var142 string | |
| 2940 | - | templ_7745c5c3_Var142, templ_7745c5c3_Err = templ.JoinStringErrs(path) | |
| 2920 | + | var templ_7745c5c3_Var140 string | |
| 2921 | + | templ_7745c5c3_Var140, templ_7745c5c3_Err = templ.JoinStringErrs(path) | |
| 2941 | 2922 | if templ_7745c5c3_Err != nil { | |
| 2942 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 570, Col: 20} | |
| 2923 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 567, Col: 20} | |
| 2943 | 2924 | } | |
| 2944 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var142)) | |
| 2925 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var140)) | |
| 2945 | 2926 | if templ_7745c5c3_Err != nil { | |
| 2946 | 2927 | return templ_7745c5c3_Err | |
| 2947 | 2928 | } | |
| 2948 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 278, "</code></li>") | |
| 2929 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 274, "</code></li>") | |
| 2949 | 2930 | if templ_7745c5c3_Err != nil { | |
| 2950 | 2931 | return templ_7745c5c3_Err | |
| 2951 | 2932 | } | |
| 2952 | 2933 | } | |
| 2953 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 279, "</ul>") | |
| 2934 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 275, "</ul>") | |
| 2954 | 2935 | if templ_7745c5c3_Err != nil { | |
| 2955 | 2936 | return templ_7745c5c3_Err | |
| 2956 | 2937 | } | |
| 2957 | 2938 | } | |
| 2958 | 2939 | if v.PathsNote != "" { | |
| 2959 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 280, "<p class=\"dim\">") | |
| 2940 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 276, "<p class=\"dim\">") | |
| 2960 | 2941 | if templ_7745c5c3_Err != nil { | |
| 2961 | 2942 | return templ_7745c5c3_Err | |
| 2962 | 2943 | } | |
| 2963 | - | var templ_7745c5c3_Var143 string | |
| 2964 | - | templ_7745c5c3_Var143, templ_7745c5c3_Err = templ.JoinStringErrs(v.PathsNote) | |
| 2944 | + | var templ_7745c5c3_Var141 string | |
| 2945 | + | templ_7745c5c3_Var141, templ_7745c5c3_Err = templ.JoinStringErrs(v.PathsNote) | |
| 2965 | 2946 | if templ_7745c5c3_Err != nil { | |
| 2966 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 575, Col: 30} | |
| 2947 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 572, Col: 30} | |
| 2967 | 2948 | } | |
| 2968 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var143)) | |
| 2949 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var141)) | |
| 2969 | 2950 | if templ_7745c5c3_Err != nil { | |
| 2970 | 2951 | return templ_7745c5c3_Err | |
| 2971 | 2952 | } | |
| 2972 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 281, "</p>") | |
| 2953 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 277, "</p>") | |
| 2973 | 2954 | if templ_7745c5c3_Err != nil { | |
| 2974 | 2955 | return templ_7745c5c3_Err | |
| 2975 | 2956 | } | |
| @@ -2996,12 +2977,12 @@ func mrMergeabilitySlot(v MergeabilityView) templ.Component { | |||
| 2996 | 2977 | }() | |
| 2997 | 2978 | } | |
| 2998 | 2979 | ctx = templ.InitializeContext(ctx) | |
| 2999 | - | templ_7745c5c3_Var144 := templ.GetChildren(ctx) | |
| 3000 | - | if templ_7745c5c3_Var144 == nil { | |
| 3001 | - | templ_7745c5c3_Var144 = templ.NopComponent | |
| 2980 | + | templ_7745c5c3_Var142 := templ.GetChildren(ctx) | |
| 2981 | + | if templ_7745c5c3_Var142 == nil { | |
| 2982 | + | templ_7745c5c3_Var142 = templ.NopComponent | |
| 3002 | 2983 | } | |
| 3003 | 2984 | ctx = templ.ClearChildren(ctx) | |
| 3004 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 282, "<div id=\"mr-mergeability\" class=\"live-slot\" role=\"status\" data-slot>") | |
| 2985 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 278, "<div id=\"mr-mergeability\" class=\"live-slot\" role=\"status\" data-slot>") | |
| 3005 | 2986 | if templ_7745c5c3_Err != nil { | |
| 3006 | 2987 | return templ_7745c5c3_Err | |
| 3007 | 2988 | } | |
| @@ -3009,7 +2990,7 @@ func mrMergeabilitySlot(v MergeabilityView) templ.Component { | |||
| 3009 | 2990 | if templ_7745c5c3_Err != nil { | |
| 3010 | 2991 | return templ_7745c5c3_Err | |
| 3011 | 2992 | } | |
| 3012 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 283, "</div>") | |
| 2993 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 279, "</div>") | |
| 3013 | 2994 | if templ_7745c5c3_Err != nil { | |
| 3014 | 2995 | return templ_7745c5c3_Err | |
| 3015 | 2996 | } | |
| @@ -3034,9 +3015,9 @@ func MRMergeabilityFragment(v MergeabilityView) templ.Component { | |||
| 3034 | 3015 | }() | |
| 3035 | 3016 | } | |
| 3036 | 3017 | ctx = templ.InitializeContext(ctx) | |
| 3037 | - | templ_7745c5c3_Var145 := templ.GetChildren(ctx) | |
| 3038 | - | if templ_7745c5c3_Var145 == nil { | |
| 3039 | - | templ_7745c5c3_Var145 = templ.NopComponent | |
| 3018 | + | templ_7745c5c3_Var143 := templ.GetChildren(ctx) | |
| 3019 | + | if templ_7745c5c3_Var143 == nil { | |
| 3020 | + | templ_7745c5c3_Var143 = templ.NopComponent | |
| 3040 | 3021 | } | |
| 3041 | 3022 | ctx = templ.ClearChildren(ctx) | |
| 3042 | 3023 | templ_7745c5c3_Err = mrMergeabilitySlot(v).Render(ctx, templ_7745c5c3_Buffer) | |
| @@ -3047,8 +3028,8 @@ func MRMergeabilityFragment(v MergeabilityView) templ.Component { | |||
| 3047 | 3028 | }) | |
| 3048 | 3029 | } | |
| 3049 | 3030 | ||
| 3050 | - | // moreMenu is what else the owner does with an open request: mark the head | |
| 3051 | - | // read, close it, merge it from a terminal. | |
| 3031 | + | // moreMenu shows read-only settings to every viewer, and keeps owner actions | |
| 3032 | + | // behind the same merge-box permission as before. | |
| 3052 | 3033 | func moreMenu(p MRPage) templ.Component { | |
| 3053 | 3034 | return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { | |
| 3054 | 3035 | templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context | |
| @@ -3065,79 +3046,142 @@ func moreMenu(p MRPage) templ.Component { | |||
| 3065 | 3046 | }() | |
| 3066 | 3047 | } | |
| 3067 | 3048 | ctx = templ.InitializeContext(ctx) | |
| 3068 | - | templ_7745c5c3_Var146 := templ.GetChildren(ctx) | |
| 3069 | - | if templ_7745c5c3_Var146 == nil { | |
| 3070 | - | templ_7745c5c3_Var146 = templ.NopComponent | |
| 3049 | + | templ_7745c5c3_Var144 := templ.GetChildren(ctx) | |
| 3050 | + | if templ_7745c5c3_Var144 == nil { | |
| 3051 | + | templ_7745c5c3_Var144 = templ.NopComponent | |
| 3071 | 3052 | } | |
| 3072 | 3053 | ctx = templ.ClearChildren(ctx) | |
| 3073 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 284, "<details class=\"menu omenu\"><summary class=\"btn icon\" aria-label=\"More actions\" title=\"more actions\">⋯</summary><div class=\"menu-pop\" role=\"group\" aria-label=\"More actions\">") | |
| 3054 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 280, "<details class=\"menu omenu\"><summary class=\"btn icon\" aria-label=\"More actions\" title=\"more actions\">⋯</summary><div class=\"menu-pop\" role=\"group\" aria-label=\"More actions\"><section class=\"merge-settings\"><h2>Merge settings</h2><dl class=\"kv\"><dt>modes</dt><dd>") | |
| 3074 | 3055 | if templ_7745c5c3_Err != nil { | |
| 3075 | 3056 | return templ_7745c5c3_Err | |
| 3076 | 3057 | } | |
| 3077 | - | if p.Box.CanMarkRead { | |
| 3078 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 285, "<form method=\"post\" action=\"") | |
| 3058 | + | var templ_7745c5c3_Var145 string | |
| 3059 | + | templ_7745c5c3_Var145, templ_7745c5c3_Err = templ.JoinStringErrs(strings.Join(p.Modes, ", ")) | |
| 3060 | + | if templ_7745c5c3_Err != nil { | |
| 3061 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 599, Col: 38} | |
| 3062 | + | } | |
| 3063 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var145)) | |
| 3064 | + | if templ_7745c5c3_Err != nil { | |
| 3065 | + | return templ_7745c5c3_Err | |
| 3066 | + | } | |
| 3067 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 281, "</dd><dt>checks</dt><dd>") | |
| 3068 | + | if templ_7745c5c3_Err != nil { | |
| 3069 | + | return templ_7745c5c3_Err | |
| 3070 | + | } | |
| 3071 | + | if p.ChecksBlock { | |
| 3072 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 282, "failing ones block the merge") | |
| 3079 | 3073 | if templ_7745c5c3_Err != nil { | |
| 3080 | 3074 | return templ_7745c5c3_Err | |
| 3081 | 3075 | } | |
| 3082 | - | var templ_7745c5c3_Var147 templ.SafeURL | |
| 3083 | - | templ_7745c5c3_Var147, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.ReadAction)) | |
| 3084 | - | if templ_7745c5c3_Err != nil { | |
| 3085 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 599, Col: 64} | |
| 3086 | - | } | |
| 3087 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var147)) | |
| 3076 | + | } else { | |
| 3077 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 283, "do not block the merge") | |
| 3088 | 3078 | if templ_7745c5c3_Err != nil { | |
| 3089 | 3079 | return templ_7745c5c3_Err | |
| 3090 | 3080 | } | |
| 3091 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 286, "\"><input type=\"hidden\" name=\"head_id\" value=\"") | |
| 3081 | + | } | |
| 3082 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 284, "</dd></dl></section>") | |
| 3083 | + | if templ_7745c5c3_Err != nil { | |
| 3084 | + | return templ_7745c5c3_Err | |
| 3085 | + | } | |
| 3086 | + | if p.Box != nil { | |
| 3087 | + | if p.Box.Signed { | |
| 3088 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 285, "<p class=\"d-note\" id=\"mr-signing\">squash and merge commits are signed with ermite's own key (generated on first start). ") | |
| 3089 | + | if templ_7745c5c3_Err != nil { | |
| 3090 | + | return templ_7745c5c3_Err | |
| 3091 | + | } | |
| 3092 | + | if p.Box.Fingerprint != "" { | |
| 3093 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 286, "fingerprint <code>") | |
| 3094 | + | if templ_7745c5c3_Err != nil { | |
| 3095 | + | return templ_7745c5c3_Err | |
| 3096 | + | } | |
| 3097 | + | var templ_7745c5c3_Var146 string | |
| 3098 | + | templ_7745c5c3_Var146, templ_7745c5c3_Err = templ.JoinStringErrs(p.Box.Fingerprint) | |
| 3099 | + | if templ_7745c5c3_Err != nil { | |
| 3100 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 615, Col: 44} | |
| 3101 | + | } | |
| 3102 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var146)) | |
| 3103 | + | if templ_7745c5c3_Err != nil { | |
| 3104 | + | return templ_7745c5c3_Err | |
| 3105 | + | } | |
| 3106 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 287, "</code> ") | |
| 3107 | + | if templ_7745c5c3_Err != nil { | |
| 3108 | + | return templ_7745c5c3_Err | |
| 3109 | + | } | |
| 3110 | + | } | |
| 3111 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 288, "<code>ermite signing-key show</code> prints it.</p>") | |
| 3112 | + | if templ_7745c5c3_Err != nil { | |
| 3113 | + | return templ_7745c5c3_Err | |
| 3114 | + | } | |
| 3115 | + | } | |
| 3116 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 289, " ") | |
| 3092 | 3117 | if templ_7745c5c3_Err != nil { | |
| 3093 | 3118 | return templ_7745c5c3_Err | |
| 3094 | 3119 | } | |
| 3095 | - | var templ_7745c5c3_Var148 string | |
| 3096 | - | templ_7745c5c3_Var148, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Box.Head) | |
| 3097 | - | if templ_7745c5c3_Err != nil { | |
| 3098 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 600, Col: 59} | |
| 3120 | + | if p.Box.CanMarkRead { | |
| 3121 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 290, "<form method=\"post\" action=\"") | |
| 3122 | + | if templ_7745c5c3_Err != nil { | |
| 3123 | + | return templ_7745c5c3_Err | |
| 3124 | + | } | |
| 3125 | + | var templ_7745c5c3_Var147 templ.SafeURL | |
| 3126 | + | templ_7745c5c3_Var147, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.ReadAction)) | |
| 3127 | + | if templ_7745c5c3_Err != nil { | |
| 3128 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 621, Col: 65} | |
| 3129 | + | } | |
| 3130 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var147)) | |
| 3131 | + | if templ_7745c5c3_Err != nil { | |
| 3132 | + | return templ_7745c5c3_Err | |
| 3133 | + | } | |
| 3134 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 291, "\"><input type=\"hidden\" name=\"head_id\" value=\"") | |
| 3135 | + | if templ_7745c5c3_Err != nil { | |
| 3136 | + | return templ_7745c5c3_Err | |
| 3137 | + | } | |
| 3138 | + | var templ_7745c5c3_Var148 string | |
| 3139 | + | templ_7745c5c3_Var148, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Box.Head) | |
| 3140 | + | if templ_7745c5c3_Err != nil { | |
| 3141 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 622, Col: 60} | |
| 3142 | + | } | |
| 3143 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var148) | |
| 3144 | + | if templ_7745c5c3_Err != nil { | |
| 3145 | + | return templ_7745c5c3_Err | |
| 3146 | + | } | |
| 3147 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 292, "\"> <button type=\"submit\" title=\"the next visit can show only what changed after this head\" class=\"btn\" aria-keyshortcuts=\"Shift+R\" data-read>Mark read <kbd aria-hidden=\"true\">R</kbd></button></form>") | |
| 3148 | + | if templ_7745c5c3_Err != nil { | |
| 3149 | + | return templ_7745c5c3_Err | |
| 3150 | + | } | |
| 3099 | 3151 | } | |
| 3100 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var148) | |
| 3152 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 293, " <form method=\"post\" action=\"") | |
| 3101 | 3153 | if templ_7745c5c3_Err != nil { | |
| 3102 | 3154 | return templ_7745c5c3_Err | |
| 3103 | 3155 | } | |
| 3104 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 287, "\"> <button type=\"submit\" title=\"the next visit can show only what changed after this head\" class=\"btn\" aria-keyshortcuts=\"Shift+R\" data-read>Mark read <kbd aria-hidden=\"true\">R</kbd></button></form>") | |
| 3156 | + | var templ_7745c5c3_Var149 templ.SafeURL | |
| 3157 | + | templ_7745c5c3_Var149, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.CloseAction)) | |
| 3105 | 3158 | if templ_7745c5c3_Err != nil { | |
| 3106 | - | return templ_7745c5c3_Err | |
| 3159 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 626, Col: 65} | |
| 3107 | 3160 | } | |
| 3108 | - | } | |
| 3109 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 288, "<form method=\"post\" action=\"") | |
| 3110 | - | if templ_7745c5c3_Err != nil { | |
| 3111 | - | return templ_7745c5c3_Err | |
| 3112 | - | } | |
| 3113 | - | var templ_7745c5c3_Var149 templ.SafeURL | |
| 3114 | - | templ_7745c5c3_Var149, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.CloseAction)) | |
| 3115 | - | if templ_7745c5c3_Err != nil { | |
| 3116 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 604, Col: 64} | |
| 3117 | - | } | |
| 3118 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var149)) | |
| 3119 | - | if templ_7745c5c3_Err != nil { | |
| 3120 | - | return templ_7745c5c3_Err | |
| 3121 | - | } | |
| 3122 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 289, "\"><button type=\"submit\" title=\"close without merging; the branch is kept\" class=\"btn danger\">Close</button></form>") | |
| 3123 | - | if templ_7745c5c3_Err != nil { | |
| 3124 | - | return templ_7745c5c3_Err | |
| 3125 | - | } | |
| 3126 | - | if !p.Box.HeadGone && p.Box.ReadyAction == "" { | |
| 3127 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 290, "<details class=\"d-or\"><summary class=\"mute\">or from a terminal</summary>") | |
| 3161 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var149)) | |
| 3128 | 3162 | if templ_7745c5c3_Err != nil { | |
| 3129 | 3163 | return templ_7745c5c3_Err | |
| 3130 | 3164 | } | |
| 3131 | - | templ_7745c5c3_Err = CloneBlock(p.Box.CLI).Render(ctx, templ_7745c5c3_Buffer) | |
| 3165 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 294, "\"><button type=\"submit\" title=\"close without merging; the branch is kept\" class=\"btn danger\">Close</button></form>") | |
| 3132 | 3166 | if templ_7745c5c3_Err != nil { | |
| 3133 | 3167 | return templ_7745c5c3_Err | |
| 3134 | 3168 | } | |
| 3135 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 291, "</details>") | |
| 3136 | - | if templ_7745c5c3_Err != nil { | |
| 3137 | - | return templ_7745c5c3_Err | |
| 3169 | + | if !p.Box.HeadGone && p.Box.ReadyAction == "" { | |
| 3170 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 295, "<details class=\"d-or\"><summary class=\"mute\">or from a terminal</summary>") | |
| 3171 | + | if templ_7745c5c3_Err != nil { | |
| 3172 | + | return templ_7745c5c3_Err | |
| 3173 | + | } | |
| 3174 | + | templ_7745c5c3_Err = CloneBlock(p.Box.CLI).Render(ctx, templ_7745c5c3_Buffer) | |
| 3175 | + | if templ_7745c5c3_Err != nil { | |
| 3176 | + | return templ_7745c5c3_Err | |
| 3177 | + | } | |
| 3178 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 296, "</details>") | |
| 3179 | + | if templ_7745c5c3_Err != nil { | |
| 3180 | + | return templ_7745c5c3_Err | |
| 3181 | + | } | |
| 3138 | 3182 | } | |
| 3139 | 3183 | } | |
| 3140 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 292, "</div></details>") | |
| 3184 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 297, "</div></details>") | |
| 3141 | 3185 | if templ_7745c5c3_Err != nil { | |
| 3142 | 3186 | return templ_7745c5c3_Err | |
| 3143 | 3187 | } | |
| @@ -3178,263 +3222,263 @@ func Compare(l Layout, p ComparePage) templ.Component { | |||
| 3178 | 3222 | }() | |
| 3179 | 3223 | } | |
| 3180 | 3224 | ctx = templ.InitializeContext(ctx) | |
| 3181 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 293, "<header class=\"show mr-h\"><h1>") | |
| 3225 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 298, "<header class=\"show mr-h\"><h1>") | |
| 3182 | 3226 | if templ_7745c5c3_Err != nil { | |
| 3183 | 3227 | return templ_7745c5c3_Err | |
| 3184 | 3228 | } | |
| 3185 | 3229 | var templ_7745c5c3_Var152 string | |
| 3186 | 3230 | templ_7745c5c3_Var152, templ_7745c5c3_Err = templ.JoinStringErrs(p.Source) | |
| 3187 | 3231 | if templ_7745c5c3_Err != nil { | |
| 3188 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 620, Col: 17} | |
| 3232 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 643, Col: 17} | |
| 3189 | 3233 | } | |
| 3190 | 3234 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var152)) | |
| 3191 | 3235 | if templ_7745c5c3_Err != nil { | |
| 3192 | 3236 | return templ_7745c5c3_Err | |
| 3193 | 3237 | } | |
| 3194 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 294, " → ") | |
| 3238 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 299, " → ") | |
| 3195 | 3239 | if templ_7745c5c3_Err != nil { | |
| 3196 | 3240 | return templ_7745c5c3_Err | |
| 3197 | 3241 | } | |
| 3198 | 3242 | var templ_7745c5c3_Var153 string | |
| 3199 | 3243 | templ_7745c5c3_Var153, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | |
| 3200 | 3244 | if templ_7745c5c3_Err != nil { | |
| 3201 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 620, Col: 34} | |
| 3245 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 643, Col: 34} | |
| 3202 | 3246 | } | |
| 3203 | 3247 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var153)) | |
| 3204 | 3248 | if templ_7745c5c3_Err != nil { | |
| 3205 | 3249 | return templ_7745c5c3_Err | |
| 3206 | 3250 | } | |
| 3207 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 295, "</h1><dl class=\"kv show-kv\"><dt>branch</dt><dd><a href=\"") | |
| 3251 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 300, "</h1><dl class=\"kv show-kv\"><dt>branch</dt><dd><a href=\"") | |
| 3208 | 3252 | if templ_7745c5c3_Err != nil { | |
| 3209 | 3253 | return templ_7745c5c3_Err | |
| 3210 | 3254 | } | |
| 3211 | 3255 | var templ_7745c5c3_Var154 templ.SafeURL | |
| 3212 | 3256 | templ_7745c5c3_Var154, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.SourceHref)) | |
| 3213 | 3257 | if templ_7745c5c3_Err != nil { | |
| 3214 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 623, Col: 45} | |
| 3258 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 646, Col: 45} | |
| 3215 | 3259 | } | |
| 3216 | 3260 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var154)) | |
| 3217 | 3261 | if templ_7745c5c3_Err != nil { | |
| 3218 | 3262 | return templ_7745c5c3_Err | |
| 3219 | 3263 | } | |
| 3220 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 296, "\">") | |
| 3264 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 301, "\">") | |
| 3221 | 3265 | if templ_7745c5c3_Err != nil { | |
| 3222 | 3266 | return templ_7745c5c3_Err | |
| 3223 | 3267 | } | |
| 3224 | 3268 | var templ_7745c5c3_Var155 string | |
| 3225 | 3269 | templ_7745c5c3_Var155, templ_7745c5c3_Err = templ.JoinStringErrs(p.Source) | |
| 3226 | 3270 | if templ_7745c5c3_Err != nil { | |
| 3227 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 623, Col: 58} | |
| 3271 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 646, Col: 58} | |
| 3228 | 3272 | } | |
| 3229 | 3273 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var155)) | |
| 3230 | 3274 | if templ_7745c5c3_Err != nil { | |
| 3231 | 3275 | return templ_7745c5c3_Err | |
| 3232 | 3276 | } | |
| 3233 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 297, "</a></dd><dt>target</dt><dd><a href=\"") | |
| 3277 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 302, "</a></dd><dt>target</dt><dd><a href=\"") | |
| 3234 | 3278 | if templ_7745c5c3_Err != nil { | |
| 3235 | 3279 | return templ_7745c5c3_Err | |
| 3236 | 3280 | } | |
| 3237 | 3281 | var templ_7745c5c3_Var156 templ.SafeURL | |
| 3238 | 3282 | templ_7745c5c3_Var156, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.TargetHref)) | |
| 3239 | 3283 | if templ_7745c5c3_Err != nil { | |
| 3240 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 625, Col: 45} | |
| 3284 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 648, Col: 45} | |
| 3241 | 3285 | } | |
| 3242 | 3286 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var156)) | |
| 3243 | 3287 | if templ_7745c5c3_Err != nil { | |
| 3244 | 3288 | return templ_7745c5c3_Err | |
| 3245 | 3289 | } | |
| 3246 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 298, "\">") | |
| 3290 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 303, "\">") | |
| 3247 | 3291 | if templ_7745c5c3_Err != nil { | |
| 3248 | 3292 | return templ_7745c5c3_Err | |
| 3249 | 3293 | } | |
| 3250 | 3294 | var templ_7745c5c3_Var157 string | |
| 3251 | 3295 | templ_7745c5c3_Var157, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | |
| 3252 | 3296 | if templ_7745c5c3_Err != nil { | |
| 3253 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 625, Col: 58} | |
| 3297 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 648, Col: 58} | |
| 3254 | 3298 | } | |
| 3255 | 3299 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var157)) | |
| 3256 | 3300 | if templ_7745c5c3_Err != nil { | |
| 3257 | 3301 | return templ_7745c5c3_Err | |
| 3258 | 3302 | } | |
| 3259 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 299, "</a></dd><dt>ahead</dt><dd>") | |
| 3303 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 304, "</a></dd><dt>ahead</dt><dd>") | |
| 3260 | 3304 | if templ_7745c5c3_Err != nil { | |
| 3261 | 3305 | return templ_7745c5c3_Err | |
| 3262 | 3306 | } | |
| 3263 | 3307 | var templ_7745c5c3_Var158 string | |
| 3264 | 3308 | templ_7745c5c3_Var158, templ_7745c5c3_Err = templ.JoinStringErrs(p.AheadText) | |
| 3265 | 3309 | if templ_7745c5c3_Err != nil { | |
| 3266 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 627, Col: 21} | |
| 3310 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 650, Col: 21} | |
| 3267 | 3311 | } | |
| 3268 | 3312 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var158)) | |
| 3269 | 3313 | if templ_7745c5c3_Err != nil { | |
| 3270 | 3314 | return templ_7745c5c3_Err | |
| 3271 | 3315 | } | |
| 3272 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 300, "</dd></dl></header>") | |
| 3316 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 305, "</dd></dl></header>") | |
| 3273 | 3317 | if templ_7745c5c3_Err != nil { | |
| 3274 | 3318 | return templ_7745c5c3_Err | |
| 3275 | 3319 | } | |
| 3276 | 3320 | if p.Note != "" { | |
| 3277 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 301, "<p class=\"notice\">") | |
| 3321 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 306, "<p class=\"notice\">") | |
| 3278 | 3322 | if templ_7745c5c3_Err != nil { | |
| 3279 | 3323 | return templ_7745c5c3_Err | |
| 3280 | 3324 | } | |
| 3281 | 3325 | var templ_7745c5c3_Var159 string | |
| 3282 | 3326 | templ_7745c5c3_Var159, templ_7745c5c3_Err = templ.JoinStringErrs(p.Note) | |
| 3283 | 3327 | if templ_7745c5c3_Err != nil { | |
| 3284 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 631, Col: 29} | |
| 3328 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 654, Col: 29} | |
| 3285 | 3329 | } | |
| 3286 | 3330 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var159)) | |
| 3287 | 3331 | if templ_7745c5c3_Err != nil { | |
| 3288 | 3332 | return templ_7745c5c3_Err | |
| 3289 | 3333 | } | |
| 3290 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 302, "</p>") | |
| 3334 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 307, "</p>") | |
| 3291 | 3335 | if templ_7745c5c3_Err != nil { | |
| 3292 | 3336 | return templ_7745c5c3_Err | |
| 3293 | 3337 | } | |
| 3294 | 3338 | } | |
| 3295 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 303, " ") | |
| 3339 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 308, " ") | |
| 3296 | 3340 | if templ_7745c5c3_Err != nil { | |
| 3297 | 3341 | return templ_7745c5c3_Err | |
| 3298 | 3342 | } | |
| 3299 | 3343 | if p.Existing != nil { | |
| 3300 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 304, "<p class=\"notice\">an open merge request already covers these branches: <a href=\"") | |
| 3344 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 309, "<p class=\"notice\">an open merge request already covers these branches: <a href=\"") | |
| 3301 | 3345 | if templ_7745c5c3_Err != nil { | |
| 3302 | 3346 | return templ_7745c5c3_Err | |
| 3303 | 3347 | } | |
| 3304 | 3348 | var templ_7745c5c3_Var160 templ.SafeURL | |
| 3305 | 3349 | templ_7745c5c3_Var160, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Existing.Href)) | |
| 3306 | 3350 | if templ_7745c5c3_Err != nil { | |
| 3307 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 634, Col: 114} | |
| 3351 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 657, Col: 114} | |
| 3308 | 3352 | } | |
| 3309 | 3353 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var160)) | |
| 3310 | 3354 | if templ_7745c5c3_Err != nil { | |
| 3311 | 3355 | return templ_7745c5c3_Err | |
| 3312 | 3356 | } | |
| 3313 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 305, "\">") | |
| 3357 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 310, "\">") | |
| 3314 | 3358 | if templ_7745c5c3_Err != nil { | |
| 3315 | 3359 | return templ_7745c5c3_Err | |
| 3316 | 3360 | } | |
| 3317 | 3361 | var templ_7745c5c3_Var161 string | |
| 3318 | 3362 | templ_7745c5c3_Var161, templ_7745c5c3_Err = templ.JoinStringErrs(p.Existing.Label) | |
| 3319 | 3363 | if templ_7745c5c3_Err != nil { | |
| 3320 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 634, Col: 135} | |
| 3364 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 657, Col: 135} | |
| 3321 | 3365 | } | |
| 3322 | 3366 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var161)) | |
| 3323 | 3367 | if templ_7745c5c3_Err != nil { | |
| 3324 | 3368 | return templ_7745c5c3_Err | |
| 3325 | 3369 | } | |
| 3326 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 306, "</a></p>") | |
| 3370 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 311, "</a></p>") | |
| 3327 | 3371 | if templ_7745c5c3_Err != nil { | |
| 3328 | 3372 | return templ_7745c5c3_Err | |
| 3329 | 3373 | } | |
| 3330 | 3374 | } | |
| 3331 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 307, " ") | |
| 3375 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 312, " ") | |
| 3332 | 3376 | if templ_7745c5c3_Err != nil { | |
| 3333 | 3377 | return templ_7745c5c3_Err | |
| 3334 | 3378 | } | |
| 3335 | 3379 | if p.Create != nil { | |
| 3336 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 308, "<form class=\"cform create\" method=\"post\" action=\"") | |
| 3380 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 313, "<form class=\"cform create\" method=\"post\" action=\"") | |
| 3337 | 3381 | if templ_7745c5c3_Err != nil { | |
| 3338 | 3382 | return templ_7745c5c3_Err | |
| 3339 | 3383 | } | |
| 3340 | 3384 | var templ_7745c5c3_Var162 templ.SafeURL | |
| 3341 | 3385 | templ_7745c5c3_Var162, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Create.Action)) | |
| 3342 | 3386 | if templ_7745c5c3_Err != nil { | |
| 3343 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 637, Col: 83} | |
| 3387 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 660, Col: 83} | |
| 3344 | 3388 | } | |
| 3345 | 3389 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var162)) | |
| 3346 | 3390 | if templ_7745c5c3_Err != nil { | |
| 3347 | 3391 | return templ_7745c5c3_Err | |
| 3348 | 3392 | } | |
| 3349 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 309, "\"><input type=\"hidden\" name=\"source\" value=\"") | |
| 3393 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 314, "\"><input type=\"hidden\" name=\"source\" value=\"") | |
| 3350 | 3394 | if templ_7745c5c3_Err != nil { | |
| 3351 | 3395 | return templ_7745c5c3_Err | |
| 3352 | 3396 | } | |
| 3353 | 3397 | var templ_7745c5c3_Var163 string | |
| 3354 | 3398 | templ_7745c5c3_Var163, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Create.Source) | |
| 3355 | 3399 | if templ_7745c5c3_Err != nil { | |
| 3356 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 638, Col: 62} | |
| 3400 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 661, Col: 62} | |
| 3357 | 3401 | } | |
| 3358 | 3402 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var163) | |
| 3359 | 3403 | if templ_7745c5c3_Err != nil { | |
| 3360 | 3404 | return templ_7745c5c3_Err | |
| 3361 | 3405 | } | |
| 3362 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 310, "\"> <input type=\"hidden\" name=\"target\" value=\"") | |
| 3406 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 315, "\"> <input type=\"hidden\" name=\"target\" value=\"") | |
| 3363 | 3407 | if templ_7745c5c3_Err != nil { | |
| 3364 | 3408 | return templ_7745c5c3_Err | |
| 3365 | 3409 | } | |
| 3366 | 3410 | var templ_7745c5c3_Var164 string | |
| 3367 | 3411 | templ_7745c5c3_Var164, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Create.Target) | |
| 3368 | 3412 | if templ_7745c5c3_Err != nil { | |
| 3369 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 639, Col: 62} | |
| 3413 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 662, Col: 62} | |
| 3370 | 3414 | } | |
| 3371 | 3415 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var164) | |
| 3372 | 3416 | if templ_7745c5c3_Err != nil { | |
| 3373 | 3417 | return templ_7745c5c3_Err | |
| 3374 | 3418 | } | |
| 3375 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 311, "\"> <label for=\"mr-title\">title</label> <input id=\"mr-title\" name=\"title\" type=\"text\" maxlength=\"120\" required value=\"") | |
| 3419 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 316, "\"> <label for=\"mr-title\">title</label> <input id=\"mr-title\" name=\"title\" type=\"text\" maxlength=\"120\" required value=\"") | |
| 3376 | 3420 | if templ_7745c5c3_Err != nil { | |
| 3377 | 3421 | return templ_7745c5c3_Err | |
| 3378 | 3422 | } | |
| 3379 | 3423 | var templ_7745c5c3_Var165 string | |
| 3380 | 3424 | templ_7745c5c3_Var165, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Create.Title) | |
| 3381 | 3425 | if templ_7745c5c3_Err != nil { | |
| 3382 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 641, Col: 97} | |
| 3426 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 664, Col: 97} | |
| 3383 | 3427 | } | |
| 3384 | 3428 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var165) | |
| 3385 | 3429 | if templ_7745c5c3_Err != nil { | |
| 3386 | 3430 | return templ_7745c5c3_Err | |
| 3387 | 3431 | } | |
| 3388 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 312, "\" autocomplete=\"off\"> <label for=\"mr-desc\">description</label> <textarea id=\"mr-desc\" name=\"description\" rows=\"4\" maxlength=\"8000\" placeholder=\"Markdown, optional\"></textarea><div class=\"f-btns\"><button type=\"submit\" class=\"btn primary\">Create merge request</button></div></form>") | |
| 3432 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 317, "\" autocomplete=\"off\"> <label for=\"mr-desc\">description</label> <textarea id=\"mr-desc\" name=\"description\" rows=\"4\" maxlength=\"8000\" placeholder=\"Markdown, optional\"></textarea><div class=\"f-btns\"><button type=\"submit\" class=\"btn primary\">Create merge request</button></div></form>") | |
| 3389 | 3433 | if templ_7745c5c3_Err != nil { | |
| 3390 | 3434 | return templ_7745c5c3_Err | |
| 3391 | 3435 | } | |
| 3392 | 3436 | } | |
| 3393 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 313, " ") | |
| 3437 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 318, " ") | |
| 3394 | 3438 | if templ_7745c5c3_Err != nil { | |
| 3395 | 3439 | return templ_7745c5c3_Err | |
| 3396 | 3440 | } | |
| 3397 | 3441 | if p.HasDiff { | |
| 3398 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 314, "<div class=\"diff-tools\" role=\"group\" aria-label=\"Diff view\"><span class=\"dim\">") | |
| 3442 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 319, "<div class=\"diff-tools\" role=\"group\" aria-label=\"Diff view\"><span class=\"dim\">") | |
| 3399 | 3443 | if templ_7745c5c3_Err != nil { | |
| 3400 | 3444 | return templ_7745c5c3_Err | |
| 3401 | 3445 | } | |
| 3402 | 3446 | var templ_7745c5c3_Var166 string | |
| 3403 | 3447 | templ_7745c5c3_Var166, templ_7745c5c3_Err = templ.JoinStringErrs(plural(p.NFiles, "file", "files")) | |
| 3404 | 3448 | if templ_7745c5c3_Err != nil { | |
| 3405 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 651, Col: 57} | |
| 3449 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 674, Col: 57} | |
| 3406 | 3450 | } | |
| 3407 | 3451 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var166)) | |
| 3408 | 3452 | if templ_7745c5c3_Err != nil { | |
| 3409 | 3453 | return templ_7745c5c3_Err | |
| 3410 | 3454 | } | |
| 3411 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 315, " · <span class=\"plus\">+") | |
| 3455 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 320, " · <span class=\"plus\">+") | |
| 3412 | 3456 | if templ_7745c5c3_Err != nil { | |
| 3413 | 3457 | return templ_7745c5c3_Err | |
| 3414 | 3458 | } | |
| 3415 | 3459 | var templ_7745c5c3_Var167 string | |
| 3416 | 3460 | templ_7745c5c3_Var167, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Adds)) | |
| 3417 | 3461 | if templ_7745c5c3_Err != nil { | |
| 3418 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 651, Col: 97} | |
| 3462 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 674, Col: 97} | |
| 3419 | 3463 | } | |
| 3420 | 3464 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var167)) | |
| 3421 | 3465 | if templ_7745c5c3_Err != nil { | |
| 3422 | 3466 | return templ_7745c5c3_Err | |
| 3423 | 3467 | } | |
| 3424 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 316, "</span> <span class=\"minus\">-") | |
| 3468 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 321, "</span> <span class=\"minus\">-") | |
| 3425 | 3469 | if templ_7745c5c3_Err != nil { | |
| 3426 | 3470 | return templ_7745c5c3_Err | |
| 3427 | 3471 | } | |
| 3428 | 3472 | var templ_7745c5c3_Var168 string | |
| 3429 | 3473 | templ_7745c5c3_Var168, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Dels)) | |
| 3430 | 3474 | if templ_7745c5c3_Err != nil { | |
| 3431 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 651, Col: 142} | |
| 3475 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 674, Col: 142} | |
| 3432 | 3476 | } | |
| 3433 | 3477 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var168)) | |
| 3434 | 3478 | if templ_7745c5c3_Err != nil { | |
| 3435 | 3479 | return templ_7745c5c3_Err | |
| 3436 | 3480 | } | |
| 3437 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 317, "</span></span> <span class=\"grow\"></span>") | |
| 3481 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 322, "</span></span> <span class=\"grow\"></span>") | |
| 3438 | 3482 | if templ_7745c5c3_Err != nil { | |
| 3439 | 3483 | return templ_7745c5c3_Err | |
| 3440 | 3484 | } | |
| @@ -3442,64 +3486,64 @@ func Compare(l Layout, p ComparePage) templ.Component { | |||
| 3442 | 3486 | if templ_7745c5c3_Err != nil { | |
| 3443 | 3487 | return templ_7745c5c3_Err | |
| 3444 | 3488 | } | |
| 3445 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 318, "</div>") | |
| 3489 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 323, "</div>") | |
| 3446 | 3490 | if templ_7745c5c3_Err != nil { | |
| 3447 | 3491 | return templ_7745c5c3_Err | |
| 3448 | 3492 | } | |
| 3449 | 3493 | if p.Invisible { | |
| 3450 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 319, "<p class=\"notice\">this diff holds invisible characters (direction controls, zero-width characters). They are shown as <span class=\"inv\"><U+XXXX></span> markers, never applied.</p>") | |
| 3494 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 324, "<p class=\"notice\">this diff holds invisible characters (direction controls, zero-width characters). They are shown as <span class=\"inv\"><U+XXXX></span> markers, never applied.</p>") | |
| 3451 | 3495 | if templ_7745c5c3_Err != nil { | |
| 3452 | 3496 | return templ_7745c5c3_Err | |
| 3453 | 3497 | } | |
| 3454 | 3498 | } | |
| 3455 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 320, " <div id=\"diffs\"") | |
| 3499 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 325, " <div id=\"diffs\"") | |
| 3456 | 3500 | if templ_7745c5c3_Err != nil { | |
| 3457 | 3501 | return templ_7745c5c3_Err | |
| 3458 | 3502 | } | |
| 3459 | 3503 | if p.Both { | |
| 3460 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 321, " data-diff=\"") | |
| 3504 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 326, " data-diff=\"") | |
| 3461 | 3505 | if templ_7745c5c3_Err != nil { | |
| 3462 | 3506 | return templ_7745c5c3_Err | |
| 3463 | 3507 | } | |
| 3464 | 3508 | var templ_7745c5c3_Var169 string | |
| 3465 | 3509 | templ_7745c5c3_Var169, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.View) | |
| 3466 | 3510 | if templ_7745c5c3_Err != nil { | |
| 3467 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 664, Col: 23} | |
| 3511 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 687, Col: 23} | |
| 3468 | 3512 | } | |
| 3469 | 3513 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var169) | |
| 3470 | 3514 | if templ_7745c5c3_Err != nil { | |
| 3471 | 3515 | return templ_7745c5c3_Err | |
| 3472 | 3516 | } | |
| 3473 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 322, "\"") | |
| 3517 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 327, "\"") | |
| 3474 | 3518 | if templ_7745c5c3_Err != nil { | |
| 3475 | 3519 | return templ_7745c5c3_Err | |
| 3476 | 3520 | } | |
| 3477 | 3521 | } else { | |
| 3478 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 323, " data-view=\"") | |
| 3522 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 328, " data-view=\"") | |
| 3479 | 3523 | if templ_7745c5c3_Err != nil { | |
| 3480 | 3524 | return templ_7745c5c3_Err | |
| 3481 | 3525 | } | |
| 3482 | 3526 | var templ_7745c5c3_Var170 string | |
| 3483 | 3527 | templ_7745c5c3_Var170, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.View) | |
| 3484 | 3528 | if templ_7745c5c3_Err != nil { | |
| 3485 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 666, Col: 23} | |
| 3529 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 689, Col: 23} | |
| 3486 | 3530 | } | |
| 3487 | 3531 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var170) | |
| 3488 | 3532 | if templ_7745c5c3_Err != nil { | |
| 3489 | 3533 | return templ_7745c5c3_Err | |
| 3490 | 3534 | } | |
| 3491 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 324, "\"") | |
| 3535 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 329, "\"") | |
| 3492 | 3536 | if templ_7745c5c3_Err != nil { | |
| 3493 | 3537 | return templ_7745c5c3_Err | |
| 3494 | 3538 | } | |
| 3495 | 3539 | } | |
| 3496 | 3540 | if p.Both && !p.Pinned { | |
| 3497 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 325, " hx-live=\"this.dataset.diff = sessionStorage.getItem('diff') || this.dataset.diff\"") | |
| 3541 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 330, " hx-live=\"this.dataset.diff = sessionStorage.getItem('diff') || this.dataset.diff\"") | |
| 3498 | 3542 | if templ_7745c5c3_Err != nil { | |
| 3499 | 3543 | return templ_7745c5c3_Err | |
| 3500 | 3544 | } | |
| 3501 | 3545 | } | |
| 3502 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 326, ">") | |
| 3546 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 331, ">") | |
| 3503 | 3547 | if templ_7745c5c3_Err != nil { | |
| 3504 | 3548 | return templ_7745c5c3_Err | |
| 3505 | 3549 | } | |
| @@ -3509,7 +3553,7 @@ func Compare(l Layout, p ComparePage) templ.Component { | |||
| 3509 | 3553 | return templ_7745c5c3_Err | |
| 3510 | 3554 | } | |
| 3511 | 3555 | } | |
| 3512 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 327, "</div>") | |
| 3556 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 332, "</div>") | |
| 3513 | 3557 | if templ_7745c5c3_Err != nil { | |
| 3514 | 3558 | return templ_7745c5c3_Err | |
| 3515 | 3559 | } | |
| @@ -3545,77 +3589,77 @@ func compareRail(p ComparePage) templ.Component { | |||
| 3545 | 3589 | templ_7745c5c3_Var171 = templ.NopComponent | |
| 3546 | 3590 | } | |
| 3547 | 3591 | ctx = templ.ClearChildren(ctx) | |
| 3548 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 328, "<section aria-labelledby=\"r-ahead\"><h2 id=\"r-ahead\">Commits <span class=\"count\">") | |
| 3592 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 333, "<section aria-labelledby=\"r-ahead\"><h2 id=\"r-ahead\">Commits <span class=\"count\">") | |
| 3549 | 3593 | if templ_7745c5c3_Err != nil { | |
| 3550 | 3594 | return templ_7745c5c3_Err | |
| 3551 | 3595 | } | |
| 3552 | 3596 | var templ_7745c5c3_Var172 string | |
| 3553 | 3597 | templ_7745c5c3_Var172, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(len(p.Ahead))) | |
| 3554 | 3598 | if templ_7745c5c3_Err != nil { | |
| 3555 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 682, Col: 67} | |
| 3599 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 705, Col: 67} | |
| 3556 | 3600 | } | |
| 3557 | 3601 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var172)) | |
| 3558 | 3602 | if templ_7745c5c3_Err != nil { | |
| 3559 | 3603 | return templ_7745c5c3_Err | |
| 3560 | 3604 | } | |
| 3561 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 329, "</span></h2><ul class=\"pcommits\">") | |
| 3605 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 334, "</span></h2><ul class=\"pcommits\">") | |
| 3562 | 3606 | if templ_7745c5c3_Err != nil { | |
| 3563 | 3607 | return templ_7745c5c3_Err | |
| 3564 | 3608 | } | |
| 3565 | 3609 | for _, c := range p.Ahead { | |
| 3566 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 330, "<li><a href=\"") | |
| 3610 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 335, "<li><a href=\"") | |
| 3567 | 3611 | if templ_7745c5c3_Err != nil { | |
| 3568 | 3612 | return templ_7745c5c3_Err | |
| 3569 | 3613 | } | |
| 3570 | 3614 | var templ_7745c5c3_Var173 templ.SafeURL | |
| 3571 | 3615 | templ_7745c5c3_Var173, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(c.CHref)) | |
| 3572 | 3616 | if templ_7745c5c3_Err != nil { | |
| 3573 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 686, Col: 37} | |
| 3617 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 709, Col: 37} | |
| 3574 | 3618 | } | |
| 3575 | 3619 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var173)) | |
| 3576 | 3620 | if templ_7745c5c3_Err != nil { | |
| 3577 | 3621 | return templ_7745c5c3_Err | |
| 3578 | 3622 | } | |
| 3579 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 331, "\">") | |
| 3623 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 336, "\">") | |
| 3580 | 3624 | if templ_7745c5c3_Err != nil { | |
| 3581 | 3625 | return templ_7745c5c3_Err | |
| 3582 | 3626 | } | |
| 3583 | 3627 | var templ_7745c5c3_Var174 string | |
| 3584 | 3628 | templ_7745c5c3_Var174, templ_7745c5c3_Err = templ.JoinStringErrs(c.Short) | |
| 3585 | 3629 | if templ_7745c5c3_Err != nil { | |
| 3586 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 686, Col: 49} | |
| 3630 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 709, Col: 49} | |
| 3587 | 3631 | } | |
| 3588 | 3632 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var174)) | |
| 3589 | 3633 | if templ_7745c5c3_Err != nil { | |
| 3590 | 3634 | return templ_7745c5c3_Err | |
| 3591 | 3635 | } | |
| 3592 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 332, "</a> <span class=\"s\">") | |
| 3636 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 337, "</a> <span class=\"s\">") | |
| 3593 | 3637 | if templ_7745c5c3_Err != nil { | |
| 3594 | 3638 | return templ_7745c5c3_Err | |
| 3595 | 3639 | } | |
| 3596 | 3640 | var templ_7745c5c3_Var175 string | |
| 3597 | 3641 | templ_7745c5c3_Var175, templ_7745c5c3_Err = templ.JoinStringErrs(c.Subject) | |
| 3598 | 3642 | if templ_7745c5c3_Err != nil { | |
| 3599 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 687, Col: 32} | |
| 3643 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 710, Col: 32} | |
| 3600 | 3644 | } | |
| 3601 | 3645 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var175)) | |
| 3602 | 3646 | if templ_7745c5c3_Err != nil { | |
| 3603 | 3647 | return templ_7745c5c3_Err | |
| 3604 | 3648 | } | |
| 3605 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 333, "</span> <span class=\"mute\">") | |
| 3649 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 338, "</span> <span class=\"mute\">") | |
| 3606 | 3650 | if templ_7745c5c3_Err != nil { | |
| 3607 | 3651 | return templ_7745c5c3_Err | |
| 3608 | 3652 | } | |
| 3609 | 3653 | var templ_7745c5c3_Var176 string | |
| 3610 | 3654 | templ_7745c5c3_Var176, templ_7745c5c3_Err = templ.JoinStringErrs(c.Author) | |
| 3611 | 3655 | if templ_7745c5c3_Err != nil { | |
| 3612 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 689, Col: 16} | |
| 3656 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 712, Col: 16} | |
| 3613 | 3657 | } | |
| 3614 | 3658 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var176)) | |
| 3615 | 3659 | if templ_7745c5c3_Err != nil { | |
| 3616 | 3660 | return templ_7745c5c3_Err | |
| 3617 | 3661 | } | |
| 3618 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 334, " ") | |
| 3662 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 339, " ") | |
| 3619 | 3663 | if templ_7745c5c3_Err != nil { | |
| 3620 | 3664 | return templ_7745c5c3_Err | |
| 3621 | 3665 | } | |
| @@ -3623,90 +3667,90 @@ func compareRail(p ComparePage) templ.Component { | |||
| 3623 | 3667 | var templ_7745c5c3_Var177 string | |
| 3624 | 3668 | templ_7745c5c3_Var177, templ_7745c5c3_Err = templ.JoinStringErrs(" · ") | |
| 3625 | 3669 | if templ_7745c5c3_Err != nil { | |
| 3626 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 691, Col: 15} | |
| 3670 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 714, Col: 15} | |
| 3627 | 3671 | } | |
| 3628 | 3672 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var177)) | |
| 3629 | 3673 | if templ_7745c5c3_Err != nil { | |
| 3630 | 3674 | return templ_7745c5c3_Err | |
| 3631 | 3675 | } | |
| 3632 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 335, "<time datetime=\"") | |
| 3676 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 340, "<time datetime=\"") | |
| 3633 | 3677 | if templ_7745c5c3_Err != nil { | |
| 3634 | 3678 | return templ_7745c5c3_Err | |
| 3635 | 3679 | } | |
| 3636 | 3680 | var templ_7745c5c3_Var178 string | |
| 3637 | 3681 | templ_7745c5c3_Var178, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.WhenAt) | |
| 3638 | 3682 | if templ_7745c5c3_Err != nil { | |
| 3639 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 691, Col: 42} | |
| 3683 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 714, Col: 42} | |
| 3640 | 3684 | } | |
| 3641 | 3685 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var178) | |
| 3642 | 3686 | if templ_7745c5c3_Err != nil { | |
| 3643 | 3687 | return templ_7745c5c3_Err | |
| 3644 | 3688 | } | |
| 3645 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 336, "\">") | |
| 3689 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 341, "\">") | |
| 3646 | 3690 | if templ_7745c5c3_Err != nil { | |
| 3647 | 3691 | return templ_7745c5c3_Err | |
| 3648 | 3692 | } | |
| 3649 | 3693 | var templ_7745c5c3_Var179 string | |
| 3650 | 3694 | templ_7745c5c3_Var179, templ_7745c5c3_Err = templ.JoinStringErrs(c.When) | |
| 3651 | 3695 | if templ_7745c5c3_Err != nil { | |
| 3652 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 691, Col: 53} | |
| 3696 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 714, Col: 53} | |
| 3653 | 3697 | } | |
| 3654 | 3698 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var179)) | |
| 3655 | 3699 | if templ_7745c5c3_Err != nil { | |
| 3656 | 3700 | return templ_7745c5c3_Err | |
| 3657 | 3701 | } | |
| 3658 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 337, "</time>") | |
| 3702 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 342, "</time>") | |
| 3659 | 3703 | if templ_7745c5c3_Err != nil { | |
| 3660 | 3704 | return templ_7745c5c3_Err | |
| 3661 | 3705 | } | |
| 3662 | 3706 | } | |
| 3663 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 338, "</span></li>") | |
| 3707 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 343, "</span></li>") | |
| 3664 | 3708 | if templ_7745c5c3_Err != nil { | |
| 3665 | 3709 | return templ_7745c5c3_Err | |
| 3666 | 3710 | } | |
| 3667 | 3711 | } | |
| 3668 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 339, "</ul>") | |
| 3712 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 344, "</ul>") | |
| 3669 | 3713 | if templ_7745c5c3_Err != nil { | |
| 3670 | 3714 | return templ_7745c5c3_Err | |
| 3671 | 3715 | } | |
| 3672 | 3716 | if len(p.Ahead) == 0 { | |
| 3673 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 340, "<p class=\"dim\">no commit ahead of ") | |
| 3717 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 345, "<p class=\"dim\">no commit ahead of ") | |
| 3674 | 3718 | if templ_7745c5c3_Err != nil { | |
| 3675 | 3719 | return templ_7745c5c3_Err | |
| 3676 | 3720 | } | |
| 3677 | 3721 | var templ_7745c5c3_Var180 string | |
| 3678 | 3722 | templ_7745c5c3_Var180, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | |
| 3679 | 3723 | if templ_7745c5c3_Err != nil { | |
| 3680 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 698, Col: 47} | |
| 3724 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 721, Col: 47} | |
| 3681 | 3725 | } | |
| 3682 | 3726 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var180)) | |
| 3683 | 3727 | if templ_7745c5c3_Err != nil { | |
| 3684 | 3728 | return templ_7745c5c3_Err | |
| 3685 | 3729 | } | |
| 3686 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 341, ".</p>") | |
| 3730 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 346, ".</p>") | |
| 3687 | 3731 | if templ_7745c5c3_Err != nil { | |
| 3688 | 3732 | return templ_7745c5c3_Err | |
| 3689 | 3733 | } | |
| 3690 | 3734 | } | |
| 3691 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 342, "</section>") | |
| 3735 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 347, "</section>") | |
| 3692 | 3736 | if templ_7745c5c3_Err != nil { | |
| 3693 | 3737 | return templ_7745c5c3_Err | |
| 3694 | 3738 | } | |
| 3695 | 3739 | if p.HasDiff { | |
| 3696 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 343, "<section aria-labelledby=\"r-files\"><h2 id=\"r-files\">Files <span class=\"count\">") | |
| 3740 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 348, "<section aria-labelledby=\"r-files\"><h2 id=\"r-files\">Files <span class=\"count\">") | |
| 3697 | 3741 | if templ_7745c5c3_Err != nil { | |
| 3698 | 3742 | return templ_7745c5c3_Err | |
| 3699 | 3743 | } | |
| 3700 | 3744 | var templ_7745c5c3_Var181 string | |
| 3701 | 3745 | templ_7745c5c3_Var181, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(len(p.Files))) | |
| 3702 | 3746 | if templ_7745c5c3_Err != nil { | |
| 3703 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 703, Col: 66} | |
| 3747 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 726, Col: 66} | |
| 3704 | 3748 | } | |
| 3705 | 3749 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var181)) | |
| 3706 | 3750 | if templ_7745c5c3_Err != nil { | |
| 3707 | 3751 | return templ_7745c5c3_Err | |
| 3708 | 3752 | } | |
| 3709 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 344, "</span></h2>") | |
| 3753 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 349, "</span></h2>") | |
| 3710 | 3754 | if templ_7745c5c3_Err != nil { | |
| 3711 | 3755 | return templ_7745c5c3_Err | |
| 3712 | 3756 | } | |
| @@ -3714,12 +3758,12 @@ func compareRail(p ComparePage) templ.Component { | |||
| 3714 | 3758 | if templ_7745c5c3_Err != nil { | |
| 3715 | 3759 | return templ_7745c5c3_Err | |
| 3716 | 3760 | } | |
| 3717 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 345, "</section>") | |
| 3761 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 350, "</section>") | |
| 3718 | 3762 | if templ_7745c5c3_Err != nil { | |
| 3719 | 3763 | return templ_7745c5c3_Err | |
| 3720 | 3764 | } | |
| 3721 | 3765 | } | |
| 3722 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 346, "<section aria-labelledby=\"r-cli\"><h2 id=\"r-cli\">From a terminal</h2>") | |
| 3766 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 351, "<section aria-labelledby=\"r-cli\"><h2 id=\"r-cli\">From a terminal</h2>") | |
| 3723 | 3767 | if templ_7745c5c3_Err != nil { | |
| 3724 | 3768 | return templ_7745c5c3_Err | |
| 3725 | 3769 | } | |
| @@ -3727,7 +3771,7 @@ func compareRail(p ComparePage) templ.Component { | |||
| 3727 | 3771 | if templ_7745c5c3_Err != nil { | |
| 3728 | 3772 | return templ_7745c5c3_Err | |
| 3729 | 3773 | } | |
| 3730 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 347, "</section>") | |
| 3774 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 352, "</section>") | |
| 3731 | 3775 | if templ_7745c5c3_Err != nil { | |
| 3732 | 3776 | return templ_7745c5c3_Err | |
| 3733 | 3777 | } | |
| @@ -808,6 +808,10 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||||
| 808 | return templ_7745c5c3_Err | 808 | return templ_7745c5c3_Err | ||
| 809 | } | 809 | } | ||
| 810 | } | 810 | } | ||
| 811 | + | templ_7745c5c3_Err = mrFooter(p).Render(ctx, templ_7745c5c3_Buffer) | |||
| 812 | + | if templ_7745c5c3_Err != nil { | |||
| 813 | + | return templ_7745c5c3_Err | |||
| 814 | + | } | |||
| 811 | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 71, "</section>") | 815 | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 71, "</section>") | ||
| 812 | if templ_7745c5c3_Err != nil { | 816 | if templ_7745c5c3_Err != nil { | ||
| 813 | return templ_7745c5c3_Err | 817 | return templ_7745c5c3_Err | ||
| @@ -820,7 +824,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||||
| 820 | var templ_7745c5c3_Var42 string | 824 | var templ_7745c5c3_Var42 string | ||
| 821 | templ_7745c5c3_Var42, templ_7745c5c3_Err = templ.JoinStringErrs(p.Deleting) | 825 | templ_7745c5c3_Var42, templ_7745c5c3_Err = templ.JoinStringErrs(p.Deleting) | ||
| 822 | if templ_7745c5c3_Err != nil { | 826 | if templ_7745c5c3_Err != nil { | ||
| 823 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 152, Col: 64} | 827 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 153, Col: 64} |
| 824 | } | 828 | } | ||
| 825 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var42)) | 829 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var42)) | ||
| 826 | if templ_7745c5c3_Err != nil { | 830 | if templ_7745c5c3_Err != nil { | ||
| @@ -843,7 +847,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||||
| 843 | var templ_7745c5c3_Var43 string | 847 | var templ_7745c5c3_Var43 string | ||
| 844 | templ_7745c5c3_Var43, templ_7745c5c3_Err = templ.JoinStringErrs(p.MergeError) | 848 | templ_7745c5c3_Var43, templ_7745c5c3_Err = templ.JoinStringErrs(p.MergeError) | ||
| 845 | if templ_7745c5c3_Err != nil { | 849 | if templ_7745c5c3_Err != nil { | ||
| 846 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 155, Col: 47} | 850 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 156, Col: 47} |
| 847 | } | 851 | } | ||
| 848 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var43)) | 852 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var43)) | ||
| 849 | if templ_7745c5c3_Err != nil { | 853 | if templ_7745c5c3_Err != nil { | ||
| @@ -874,7 +878,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||||
| 874 | var templ_7745c5c3_Var44 templ.SafeURL | 878 | var templ_7745c5c3_Var44 templ.SafeURL | ||
| 875 | templ_7745c5c3_Var44, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Since.AllHref)) | 879 | templ_7745c5c3_Var44, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Since.AllHref)) | ||
| 876 | if templ_7745c5c3_Err != nil { | 880 | if templ_7745c5c3_Err != nil { | ||
| 877 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 161, Col: 42} | 881 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 162, Col: 42} |
| 878 | } | 882 | } | ||
| 879 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var44)) | 883 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var44)) | ||
| 880 | if templ_7745c5c3_Err != nil { | 884 | if templ_7745c5c3_Err != nil { | ||
| @@ -897,7 +901,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||||
| 897 | var templ_7745c5c3_Var45 string | 901 | var templ_7745c5c3_Var45 string | ||
| 898 | templ_7745c5c3_Var45, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | 902 | templ_7745c5c3_Var45, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | ||
| 899 | if templ_7745c5c3_Err != nil { | 903 | if templ_7745c5c3_Err != nil { | ||
| 900 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 165, Col: 49} | 904 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 166, Col: 49} |
| 901 | } | 905 | } | ||
| 902 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var45)) | 906 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var45)) | ||
| 903 | if templ_7745c5c3_Err != nil { | 907 | if templ_7745c5c3_Err != nil { | ||
| @@ -910,7 +914,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||||
| 910 | var templ_7745c5c3_Var46 templ.SafeURL | 914 | var templ_7745c5c3_Var46 templ.SafeURL | ||
| 911 | templ_7745c5c3_Var46, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Since.SinceHref)) | 915 | templ_7745c5c3_Var46, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Since.SinceHref)) | ||
| 912 | if templ_7745c5c3_Err != nil { | 916 | if templ_7745c5c3_Err != nil { | ||
| 913 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 167, Col: 44} | 917 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 168, Col: 44} |
| 914 | } | 918 | } | ||
| 915 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var46)) | 919 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var46)) | ||
| 916 | if templ_7745c5c3_Err != nil { | 920 | if templ_7745c5c3_Err != nil { | ||
| @@ -933,7 +937,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||||
| 933 | var templ_7745c5c3_Var47 string | 937 | var templ_7745c5c3_Var47 string | ||
| 934 | templ_7745c5c3_Var47, templ_7745c5c3_Err = templ.JoinStringErrs(p.Since.ReadShort) | 938 | templ_7745c5c3_Var47, templ_7745c5c3_Err = templ.JoinStringErrs(p.Since.ReadShort) | ||
| 935 | if templ_7745c5c3_Err != nil { | 939 | if templ_7745c5c3_Err != nil { | ||
| 936 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 171, Col: 64} | 940 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 172, Col: 64} |
| 937 | } | 941 | } | ||
| 938 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var47)) | 942 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var47)) | ||
| 939 | if templ_7745c5c3_Err != nil { | 943 | if templ_7745c5c3_Err != nil { | ||
| @@ -946,7 +950,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||||
| 946 | var templ_7745c5c3_Var48 string | 950 | var templ_7745c5c3_Var48 string | ||
| 947 | templ_7745c5c3_Var48, templ_7745c5c3_Err = templ.JoinStringErrs(p.Since.HeadShort) | 951 | templ_7745c5c3_Var48, templ_7745c5c3_Err = templ.JoinStringErrs(p.Since.HeadShort) | ||
| 948 | if templ_7745c5c3_Err != nil { | 952 | if templ_7745c5c3_Err != nil { | ||
| 949 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 171, Col: 90} | 953 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 172, Col: 90} |
| 950 | } | 954 | } | ||
| 951 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var48)) | 955 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var48)) | ||
| 952 | if templ_7745c5c3_Err != nil { | 956 | if templ_7745c5c3_Err != nil { | ||
| @@ -969,7 +973,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||||
| 969 | var templ_7745c5c3_Var49 string | 973 | var templ_7745c5c3_Var49 string | ||
| 970 | templ_7745c5c3_Var49, templ_7745c5c3_Err = templ.JoinStringErrs(p.SinceNote) | 974 | templ_7745c5c3_Var49, templ_7745c5c3_Err = templ.JoinStringErrs(p.SinceNote) | ||
| 971 | if templ_7745c5c3_Err != nil { | 975 | if templ_7745c5c3_Err != nil { | ||
| 972 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 175, Col: 34} | 976 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 176, Col: 34} |
| 973 | } | 977 | } | ||
| 974 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var49)) | 978 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var49)) | ||
| 975 | if templ_7745c5c3_Err != nil { | 979 | if templ_7745c5c3_Err != nil { | ||
| @@ -1010,7 +1014,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||||
| 1010 | var templ_7745c5c3_Var50 string | 1014 | var templ_7745c5c3_Var50 string | ||
| 1011 | templ_7745c5c3_Var50, templ_7745c5c3_Err = templ.JoinStringErrs(p.Note) | 1015 | templ_7745c5c3_Var50, templ_7745c5c3_Err = templ.JoinStringErrs(p.Note) | ||
| 1012 | if templ_7745c5c3_Err != nil { | 1016 | if templ_7745c5c3_Err != nil { | ||
| 1013 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 185, Col: 29} | 1017 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 186, Col: 29} |
| 1014 | } | 1018 | } | ||
| 1015 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var50)) | 1019 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var50)) | ||
| 1016 | if templ_7745c5c3_Err != nil { | 1020 | if templ_7745c5c3_Err != nil { | ||
| @@ -1033,7 +1037,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||||
| 1033 | var templ_7745c5c3_Var51 string | 1037 | var templ_7745c5c3_Var51 string | ||
| 1034 | templ_7745c5c3_Var51, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Canonical) | 1038 | templ_7745c5c3_Var51, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Canonical) | ||
| 1035 | if templ_7745c5c3_Err != nil { | 1039 | if templ_7745c5c3_Err != nil { | ||
| 1036 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 191, Col: 32} | 1040 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 192, Col: 32} |
| 1037 | } | 1041 | } | ||
| 1038 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var51) | 1042 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var51) | ||
| 1039 | if templ_7745c5c3_Err != nil { | 1043 | if templ_7745c5c3_Err != nil { | ||
| @@ -1052,7 +1056,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||||
| 1052 | var templ_7745c5c3_Var52 string | 1056 | var templ_7745c5c3_Var52 string | ||
| 1053 | templ_7745c5c3_Var52, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.View) | 1057 | templ_7745c5c3_Var52, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.View) | ||
| 1054 | if templ_7745c5c3_Err != nil { | 1058 | if templ_7745c5c3_Err != nil { | ||
| 1055 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 194, Col: 22} | 1059 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 195, Col: 22} |
| 1056 | } | 1060 | } | ||
| 1057 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var52) | 1061 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var52) | ||
| 1058 | if templ_7745c5c3_Err != nil { | 1062 | if templ_7745c5c3_Err != nil { | ||
| @@ -1070,7 +1074,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||||
| 1070 | var templ_7745c5c3_Var53 string | 1074 | var templ_7745c5c3_Var53 string | ||
| 1071 | templ_7745c5c3_Var53, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.View) | 1075 | templ_7745c5c3_Var53, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.View) | ||
| 1072 | if templ_7745c5c3_Err != nil { | 1076 | if templ_7745c5c3_Err != nil { | ||
| 1073 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 196, Col: 22} | 1077 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 197, Col: 22} |
| 1074 | } | 1078 | } | ||
| 1075 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var53) | 1079 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var53) | ||
| 1076 | if templ_7745c5c3_Err != nil { | 1080 | if templ_7745c5c3_Err != nil { | ||
| @@ -1110,7 +1114,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||||
| 1110 | var templ_7745c5c3_Var54 string | 1114 | var templ_7745c5c3_Var54 string | ||
| 1111 | templ_7745c5c3_Var54, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.NUnresolved)) | 1115 | templ_7745c5c3_Var54, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.NUnresolved)) | ||
| 1112 | if templ_7745c5c3_Err != nil { | 1116 | if templ_7745c5c3_Err != nil { | ||
| 1113 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 209, Col: 97} | 1117 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 210, Col: 97} |
| 1114 | } | 1118 | } | ||
| 1115 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var54)) | 1119 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var54)) | ||
| 1116 | if templ_7745c5c3_Err != nil { | 1120 | if templ_7745c5c3_Err != nil { | ||
| @@ -1123,7 +1127,7 @@ func MergeRequest(l Layout, p MRPage) templ.Component { | |||||
| 1123 | var templ_7745c5c3_Var55 string | 1127 | var templ_7745c5c3_Var55 string | ||
| 1124 | templ_7745c5c3_Var55, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.NComments)) | 1128 | templ_7745c5c3_Var55, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.NComments)) | ||
| 1125 | if templ_7745c5c3_Err != nil { | 1129 | if templ_7745c5c3_Err != nil { | ||
| 1126 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 209, Col: 126} | 1130 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 210, Col: 126} |
| 1127 | } | 1131 | } | ||
| 1128 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var55)) | 1132 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var55)) | ||
| 1129 | if templ_7745c5c3_Err != nil { | 1133 | if templ_7745c5c3_Err != nil { | ||
| @@ -1204,7 +1208,7 @@ func branchLink(name, href string) templ.Component { | |||||
| 1204 | var templ_7745c5c3_Var57 templ.SafeURL | 1208 | var templ_7745c5c3_Var57 templ.SafeURL | ||
| 1205 | templ_7745c5c3_Var57, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(href)) | 1209 | templ_7745c5c3_Var57, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(href)) | ||
| 1206 | if templ_7745c5c3_Err != nil { | 1210 | if templ_7745c5c3_Err != nil { | ||
| 1207 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 227, Col: 31} | 1211 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 228, Col: 31} |
| 1208 | } | 1212 | } | ||
| 1209 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var57)) | 1213 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var57)) | ||
| 1210 | if templ_7745c5c3_Err != nil { | 1214 | if templ_7745c5c3_Err != nil { | ||
| @@ -1217,7 +1221,7 @@ func branchLink(name, href string) templ.Component { | |||||
| 1217 | var templ_7745c5c3_Var58 string | 1221 | var templ_7745c5c3_Var58 string | ||
| 1218 | templ_7745c5c3_Var58, templ_7745c5c3_Err = templ.JoinStringErrs(name) | 1222 | templ_7745c5c3_Var58, templ_7745c5c3_Err = templ.JoinStringErrs(name) | ||
| 1219 | if templ_7745c5c3_Err != nil { | 1223 | if templ_7745c5c3_Err != nil { | ||
| 1220 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 227, Col: 40} | 1224 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 228, Col: 40} |
| 1221 | } | 1225 | } | ||
| 1222 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var58)) | 1226 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var58)) | ||
| 1223 | if templ_7745c5c3_Err != nil { | 1227 | if templ_7745c5c3_Err != nil { | ||
| @@ -1231,7 +1235,7 @@ func branchLink(name, href string) templ.Component { | |||||
| 1231 | var templ_7745c5c3_Var59 string | 1235 | var templ_7745c5c3_Var59 string | ||
| 1232 | templ_7745c5c3_Var59, templ_7745c5c3_Err = templ.JoinStringErrs(name) | 1236 | templ_7745c5c3_Var59, templ_7745c5c3_Err = templ.JoinStringErrs(name) | ||
| 1233 | if templ_7745c5c3_Err != nil { | 1237 | if templ_7745c5c3_Err != nil { | ||
| 1234 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 229, Col: 8} | 1238 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 230, Col: 8} |
| 1235 | } | 1239 | } | ||
| 1236 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var59)) | 1240 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var59)) | ||
| 1237 | if templ_7745c5c3_Err != nil { | 1241 | if templ_7745c5c3_Err != nil { | ||
| @@ -1312,7 +1316,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||||
| 1312 | var templ_7745c5c3_Var62 string | 1316 | var templ_7745c5c3_Var62 string | ||
| 1313 | templ_7745c5c3_Var62, templ_7745c5c3_Err = templ.ResolveAttributeValue("c" + c.ID + suffix) | 1317 | templ_7745c5c3_Var62, templ_7745c5c3_Err = templ.ResolveAttributeValue("c" + c.ID + suffix) | ||
| 1314 | if templ_7745c5c3_Err != nil { | 1318 | if templ_7745c5c3_Err != nil { | ||
| 1315 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 248, Col: 42} | 1319 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 249, Col: 42} |
| 1316 | } | 1320 | } | ||
| 1317 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var62) | 1321 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var62) | ||
| 1318 | if templ_7745c5c3_Err != nil { | 1322 | if templ_7745c5c3_Err != nil { | ||
| @@ -1325,7 +1329,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||||
| 1325 | var templ_7745c5c3_Var63 string | 1329 | var templ_7745c5c3_Var63 string | ||
| 1326 | templ_7745c5c3_Var63, templ_7745c5c3_Err = templ.ResolveAttributeValue(boolText(c.Resolved)) | 1330 | templ_7745c5c3_Var63, templ_7745c5c3_Err = templ.ResolveAttributeValue(boolText(c.Resolved)) | ||
| 1327 | if templ_7745c5c3_Err != nil { | 1331 | if templ_7745c5c3_Err != nil { | ||
| 1328 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 248, Col: 81} | 1332 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 249, Col: 81} |
| 1329 | } | 1333 | } | ||
| 1330 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var63) | 1334 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var63) | ||
| 1331 | if templ_7745c5c3_Err != nil { | 1335 | if templ_7745c5c3_Err != nil { | ||
| @@ -1348,7 +1352,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||||
| 1348 | var templ_7745c5c3_Var64 string | 1352 | var templ_7745c5c3_Var64 string | ||
| 1349 | templ_7745c5c3_Var64, templ_7745c5c3_Err = templ.JoinStringErrs(c.Author) | 1353 | templ_7745c5c3_Var64, templ_7745c5c3_Err = templ.JoinStringErrs(c.Author) | ||
| 1350 | if templ_7745c5c3_Err != nil { | 1354 | if templ_7745c5c3_Err != nil { | ||
| 1351 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 250, Col: 33} | 1355 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 251, Col: 33} |
| 1352 | } | 1356 | } | ||
| 1353 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var64)) | 1357 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var64)) | ||
| 1354 | if templ_7745c5c3_Err != nil { | 1358 | if templ_7745c5c3_Err != nil { | ||
| @@ -1362,7 +1366,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||||
| 1362 | var templ_7745c5c3_Var65 string | 1366 | var templ_7745c5c3_Var65 string | ||
| 1363 | templ_7745c5c3_Var65, templ_7745c5c3_Err = templ.JoinStringErrs(" ") | 1367 | templ_7745c5c3_Var65, templ_7745c5c3_Err = templ.JoinStringErrs(" ") | ||
| 1364 | if templ_7745c5c3_Err != nil { | 1368 | if templ_7745c5c3_Err != nil { | ||
| 1365 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 252, Col: 9} | 1369 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 253, Col: 9} |
| 1366 | } | 1370 | } | ||
| 1367 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var65)) | 1371 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var65)) | ||
| 1368 | if templ_7745c5c3_Err != nil { | 1372 | if templ_7745c5c3_Err != nil { | ||
| @@ -1375,7 +1379,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||||
| 1375 | var templ_7745c5c3_Var66 string | 1379 | var templ_7745c5c3_Var66 string | ||
| 1376 | templ_7745c5c3_Var66, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.WhenAt) | 1380 | templ_7745c5c3_Var66, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.WhenAt) | ||
| 1377 | if templ_7745c5c3_Err != nil { | 1381 | if templ_7745c5c3_Err != nil { | ||
| 1378 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 252, Col: 49} | 1382 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 253, Col: 49} |
| 1379 | } | 1383 | } | ||
| 1380 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var66) | 1384 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var66) | ||
| 1381 | if templ_7745c5c3_Err != nil { | 1385 | if templ_7745c5c3_Err != nil { | ||
| @@ -1388,7 +1392,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||||
| 1388 | var templ_7745c5c3_Var67 string | 1392 | var templ_7745c5c3_Var67 string | ||
| 1389 | templ_7745c5c3_Var67, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.Abs) | 1393 | templ_7745c5c3_Var67, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.Abs) | ||
| 1390 | if templ_7745c5c3_Err != nil { | 1394 | if templ_7745c5c3_Err != nil { | ||
| 1391 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 252, Col: 65} | 1395 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 253, Col: 65} |
| 1392 | } | 1396 | } | ||
| 1393 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var67) | 1397 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var67) | ||
| 1394 | if templ_7745c5c3_Err != nil { | 1398 | if templ_7745c5c3_Err != nil { | ||
| @@ -1401,7 +1405,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||||
| 1401 | var templ_7745c5c3_Var68 string | 1405 | var templ_7745c5c3_Var68 string | ||
| 1402 | templ_7745c5c3_Var68, templ_7745c5c3_Err = templ.JoinStringErrs(c.When) | 1406 | templ_7745c5c3_Var68, templ_7745c5c3_Err = templ.JoinStringErrs(c.When) | ||
| 1403 | if templ_7745c5c3_Err != nil { | 1407 | if templ_7745c5c3_Err != nil { | ||
| 1404 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 252, Col: 76} | 1408 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 253, Col: 76} |
| 1405 | } | 1409 | } | ||
| 1406 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var68)) | 1410 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var68)) | ||
| 1407 | if templ_7745c5c3_Err != nil { | 1411 | if templ_7745c5c3_Err != nil { | ||
| @@ -1416,7 +1420,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||||
| 1416 | var templ_7745c5c3_Var69 string | 1420 | var templ_7745c5c3_Var69 string | ||
| 1417 | templ_7745c5c3_Var69, templ_7745c5c3_Err = templ.JoinStringErrs(" ") | 1421 | templ_7745c5c3_Var69, templ_7745c5c3_Err = templ.JoinStringErrs(" ") | ||
| 1418 | if templ_7745c5c3_Err != nil { | 1422 | if templ_7745c5c3_Err != nil { | ||
| 1419 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 255, Col: 9} | 1423 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 256, Col: 9} |
| 1420 | } | 1424 | } | ||
| 1421 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var69)) | 1425 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var69)) | ||
| 1422 | if templ_7745c5c3_Err != nil { | 1426 | if templ_7745c5c3_Err != nil { | ||
| @@ -1431,7 +1435,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||||
| 1431 | var templ_7745c5c3_Var70 string | 1435 | var templ_7745c5c3_Var70 string | ||
| 1432 | templ_7745c5c3_Var70, templ_7745c5c3_Err = templ.JoinStringErrs(" ") | 1436 | templ_7745c5c3_Var70, templ_7745c5c3_Err = templ.JoinStringErrs(" ") | ||
| 1433 | if templ_7745c5c3_Err != nil { | 1437 | if templ_7745c5c3_Err != nil { | ||
| 1434 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 258, Col: 9} | 1438 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 259, Col: 9} |
| 1435 | } | 1439 | } | ||
| 1436 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var70)) | 1440 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var70)) | ||
| 1437 | if templ_7745c5c3_Err != nil { | 1441 | if templ_7745c5c3_Err != nil { | ||
| @@ -1446,7 +1450,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||||
| 1446 | var templ_7745c5c3_Var71 string | 1450 | var templ_7745c5c3_Var71 string | ||
| 1447 | templ_7745c5c3_Var71, templ_7745c5c3_Err = templ.JoinStringErrs(" ") | 1451 | templ_7745c5c3_Var71, templ_7745c5c3_Err = templ.JoinStringErrs(" ") | ||
| 1448 | if templ_7745c5c3_Err != nil { | 1452 | if templ_7745c5c3_Err != nil { | ||
| 1449 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 261, Col: 9} | 1453 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 262, Col: 9} |
| 1450 | } | 1454 | } | ||
| 1451 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var71)) | 1455 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var71)) | ||
| 1452 | if templ_7745c5c3_Err != nil { | 1456 | if templ_7745c5c3_Err != nil { | ||
| @@ -1459,7 +1463,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||||
| 1459 | var templ_7745c5c3_Var72 string | 1463 | var templ_7745c5c3_Var72 string | ||
| 1460 | templ_7745c5c3_Var72, templ_7745c5c3_Err = templ.JoinStringErrs(c.Where) | 1464 | templ_7745c5c3_Var72, templ_7745c5c3_Err = templ.JoinStringErrs(c.Where) | ||
| 1461 | if templ_7745c5c3_Err != nil { | 1465 | if templ_7745c5c3_Err != nil { | ||
| 1462 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 261, Col: 47} | 1466 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 262, Col: 47} |
| 1463 | } | 1467 | } | ||
| 1464 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var72)) | 1468 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var72)) | ||
| 1465 | if templ_7745c5c3_Err != nil { | 1469 | if templ_7745c5c3_Err != nil { | ||
| @@ -1534,7 +1538,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||||
| 1534 | var templ_7745c5c3_Var73 string | 1538 | var templ_7745c5c3_Var73 string | ||
| 1535 | templ_7745c5c3_Var73, templ_7745c5c3_Err = templ.JoinStringErrs(c.Verdict) | 1539 | templ_7745c5c3_Var73, templ_7745c5c3_Err = templ.JoinStringErrs(c.Verdict) | ||
| 1536 | if templ_7745c5c3_Err != nil { | 1540 | if templ_7745c5c3_Err != nil { | ||
| 1537 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 285, Col: 36} | 1541 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 286, Col: 36} |
| 1538 | } | 1542 | } | ||
| 1539 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var73)) | 1543 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var73)) | ||
| 1540 | if templ_7745c5c3_Err != nil { | 1544 | if templ_7745c5c3_Err != nil { | ||
| @@ -1553,7 +1557,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||||
| 1553 | var templ_7745c5c3_Var74 string | 1557 | var templ_7745c5c3_Var74 string | ||
| 1554 | templ_7745c5c3_Var74, templ_7745c5c3_Err = templ.JoinStringErrs(c.Range) | 1558 | templ_7745c5c3_Var74, templ_7745c5c3_Err = templ.JoinStringErrs(c.Range) | ||
| 1555 | if templ_7745c5c3_Err != nil { | 1559 | if templ_7745c5c3_Err != nil { | ||
| 1556 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 288, Col: 31} | 1560 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 289, Col: 31} |
| 1557 | } | 1561 | } | ||
| 1558 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var74)) | 1562 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var74)) | ||
| 1559 | if templ_7745c5c3_Err != nil { | 1563 | if templ_7745c5c3_Err != nil { | ||
| @@ -1572,7 +1576,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||||
| 1572 | var templ_7745c5c3_Var75 string | 1576 | var templ_7745c5c3_Var75 string | ||
| 1573 | templ_7745c5c3_Var75, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.Quote) | 1577 | templ_7745c5c3_Var75, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.Quote) | ||
| 1574 | if templ_7745c5c3_Err != nil { | 1578 | if templ_7745c5c3_Err != nil { | ||
| 1575 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 291, Col: 65} | 1579 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 292, Col: 65} |
| 1576 | } | 1580 | } | ||
| 1577 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var75) | 1581 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var75) | ||
| 1578 | if templ_7745c5c3_Err != nil { | 1582 | if templ_7745c5c3_Err != nil { | ||
| @@ -1591,7 +1595,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||||
| 1591 | var templ_7745c5c3_Var76 templ.SafeURL | 1595 | var templ_7745c5c3_Var76 templ.SafeURL | ||
| 1592 | templ_7745c5c3_Var76, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(c.Edit.Action)) | 1596 | templ_7745c5c3_Var76, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(c.Edit.Action)) | ||
| 1593 | if templ_7745c5c3_Err != nil { | 1597 | if templ_7745c5c3_Err != nil { | ||
| 1594 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 294, Col: 92} | 1598 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 295, Col: 92} |
| 1595 | } | 1599 | } | ||
| 1596 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var76)) | 1600 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var76)) | ||
| 1597 | if templ_7745c5c3_Err != nil { | 1601 | if templ_7745c5c3_Err != nil { | ||
| @@ -1604,7 +1608,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||||
| 1604 | var templ_7745c5c3_Var77 string | 1608 | var templ_7745c5c3_Var77 string | ||
| 1605 | templ_7745c5c3_Var77, templ_7745c5c3_Err = templ.ResolveAttributeValue(itoa(c.Edit.From)) | 1609 | templ_7745c5c3_Var77, templ_7745c5c3_Err = templ.ResolveAttributeValue(itoa(c.Edit.From)) | ||
| 1606 | if templ_7745c5c3_Err != nil { | 1610 | if templ_7745c5c3_Err != nil { | ||
| 1607 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 294, Col: 153} | 1611 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 295, Col: 153} |
| 1608 | } | 1612 | } | ||
| 1609 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var77) | 1613 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var77) | ||
| 1610 | if templ_7745c5c3_Err != nil { | 1614 | if templ_7745c5c3_Err != nil { | ||
| @@ -1617,7 +1621,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||||
| 1617 | var templ_7745c5c3_Var78 string | 1621 | var templ_7745c5c3_Var78 string | ||
| 1618 | templ_7745c5c3_Var78, templ_7745c5c3_Err = templ.JoinStringErrs(c.Edit.Text) | 1622 | templ_7745c5c3_Var78, templ_7745c5c3_Err = templ.JoinStringErrs(c.Edit.Text) | ||
| 1619 | if templ_7745c5c3_Err != nil { | 1623 | if templ_7745c5c3_Err != nil { | ||
| 1620 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 294, Col: 209} | 1624 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 295, Col: 209} |
| 1621 | } | 1625 | } | ||
| 1622 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var78)) | 1626 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var78)) | ||
| 1623 | if templ_7745c5c3_Err != nil { | 1627 | if templ_7745c5c3_Err != nil { | ||
| @@ -1636,7 +1640,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||||
| 1636 | var templ_7745c5c3_Var79 templ.SafeURL | 1640 | var templ_7745c5c3_Var79 templ.SafeURL | ||
| 1637 | templ_7745c5c3_Var79, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(c.Delete.Action)) | 1641 | templ_7745c5c3_Var79, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(c.Delete.Action)) | ||
| 1638 | if templ_7745c5c3_Err != nil { | 1642 | if templ_7745c5c3_Err != nil { | ||
| 1639 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 297, Col: 96} | 1643 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 298, Col: 96} |
| 1640 | } | 1644 | } | ||
| 1641 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var79)) | 1645 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var79)) | ||
| 1642 | if templ_7745c5c3_Err != nil { | 1646 | if templ_7745c5c3_Err != nil { | ||
| @@ -1649,7 +1653,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||||
| 1649 | var templ_7745c5c3_Var80 string | 1653 | var templ_7745c5c3_Var80 string | ||
| 1650 | templ_7745c5c3_Var80, templ_7745c5c3_Err = templ.ResolveAttributeValue(itoa(c.Delete.From)) | 1654 | templ_7745c5c3_Var80, templ_7745c5c3_Err = templ.ResolveAttributeValue(itoa(c.Delete.From)) | ||
| 1651 | if templ_7745c5c3_Err != nil { | 1655 | if templ_7745c5c3_Err != nil { | ||
| 1652 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 297, Col: 159} | 1656 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 298, Col: 159} |
| 1653 | } | 1657 | } | ||
| 1654 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var80) | 1658 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var80) | ||
| 1655 | if templ_7745c5c3_Err != nil { | 1659 | if templ_7745c5c3_Err != nil { | ||
| @@ -1688,7 +1692,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||||
| 1688 | var templ_7745c5c3_Var81 templ.SafeURL | 1692 | var templ_7745c5c3_Var81 templ.SafeURL | ||
| 1689 | templ_7745c5c3_Var81, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(c.Resolve.Action)) | 1693 | templ_7745c5c3_Var81, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(c.Resolve.Action)) | ||
| 1690 | if templ_7745c5c3_Err != nil { | 1694 | if templ_7745c5c3_Err != nil { | ||
| 1691 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 308, Col: 77} | 1695 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 309, Col: 77} |
| 1692 | } | 1696 | } | ||
| 1693 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var81)) | 1697 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var81)) | ||
| 1694 | if templ_7745c5c3_Err != nil { | 1698 | if templ_7745c5c3_Err != nil { | ||
| @@ -1701,7 +1705,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||||
| 1701 | var templ_7745c5c3_Var82 string | 1705 | var templ_7745c5c3_Var82 string | ||
| 1702 | templ_7745c5c3_Var82, templ_7745c5c3_Err = templ.ResolveAttributeValue(boolText(c.Resolve.Value)) | 1706 | templ_7745c5c3_Var82, templ_7745c5c3_Err = templ.ResolveAttributeValue(boolText(c.Resolve.Value)) | ||
| 1703 | if templ_7745c5c3_Err != nil { | 1707 | if templ_7745c5c3_Err != nil { | ||
| 1704 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 309, Col: 74} | 1708 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 310, Col: 74} |
| 1705 | } | 1709 | } | ||
| 1706 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var82) | 1710 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var82) | ||
| 1707 | if templ_7745c5c3_Err != nil { | 1711 | if templ_7745c5c3_Err != nil { | ||
| @@ -1719,7 +1723,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||||
| 1719 | var templ_7745c5c3_Var83 string | 1723 | var templ_7745c5c3_Var83 string | ||
| 1720 | templ_7745c5c3_Var83, templ_7745c5c3_Err = templ.ResolveAttributeValue(itoa(c.Resolve.From)) | 1724 | templ_7745c5c3_Var83, templ_7745c5c3_Err = templ.ResolveAttributeValue(itoa(c.Resolve.From)) | ||
| 1721 | if templ_7745c5c3_Err != nil { | 1725 | if templ_7745c5c3_Err != nil { | ||
| 1722 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 311, Col: 66} | 1726 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 312, Col: 66} |
| 1723 | } | 1727 | } | ||
| 1724 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var83) | 1728 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var83) | ||
| 1725 | if templ_7745c5c3_Err != nil { | 1729 | if templ_7745c5c3_Err != nil { | ||
| @@ -1737,7 +1741,7 @@ func commentView(c CommentView, suffix string) templ.Component { | |||||
| 1737 | var templ_7745c5c3_Var84 string | 1741 | var templ_7745c5c3_Var84 string | ||
| 1738 | templ_7745c5c3_Var84, templ_7745c5c3_Err = templ.JoinStringErrs(c.Resolve.Label) | 1742 | templ_7745c5c3_Var84, templ_7745c5c3_Err = templ.JoinStringErrs(c.Resolve.Label) | ||
| 1739 | if templ_7745c5c3_Err != nil { | 1743 | if templ_7745c5c3_Err != nil { | ||
| 1740 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 313, Col: 55} | 1744 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 314, Col: 55} |
| 1741 | } | 1745 | } | ||
| 1742 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var84)) | 1746 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var84)) | ||
| 1743 | if templ_7745c5c3_Err != nil { | 1747 | if templ_7745c5c3_Err != nil { | ||
| @@ -1792,7 +1796,7 @@ func commentForm(f CommentForm, suffix string) templ.Component { | |||||
| 1792 | var templ_7745c5c3_Var86 templ.SafeURL | 1796 | var templ_7745c5c3_Var86 templ.SafeURL | ||
| 1793 | templ_7745c5c3_Var86, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(f.Action)) | 1797 | templ_7745c5c3_Var86, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(f.Action)) | ||
| 1794 | if templ_7745c5c3_Err != nil { | 1798 | if templ_7745c5c3_Err != nil { | ||
| 1795 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 328, Col: 67} | 1799 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 329, Col: 67} |
| 1796 | } | 1800 | } | ||
| 1797 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var86)) | 1801 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var86)) | ||
| 1798 | if templ_7745c5c3_Err != nil { | 1802 | if templ_7745c5c3_Err != nil { | ||
| @@ -1805,7 +1809,7 @@ func commentForm(f CommentForm, suffix string) templ.Component { | |||||
| 1805 | var templ_7745c5c3_Var87 string | 1809 | var templ_7745c5c3_Var87 string | ||
| 1806 | templ_7745c5c3_Var87, templ_7745c5c3_Err = templ.ResolveAttributeValue(f.ID + suffix) | 1810 | templ_7745c5c3_Var87, templ_7745c5c3_Err = templ.ResolveAttributeValue(f.ID + suffix) | ||
| 1807 | if templ_7745c5c3_Err != nil { | 1811 | if templ_7745c5c3_Err != nil { | ||
| 1808 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 329, Col: 28} | 1812 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 330, Col: 28} |
| 1809 | } | 1813 | } | ||
| 1810 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var87) | 1814 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var87) | ||
| 1811 | if templ_7745c5c3_Err != nil { | 1815 | if templ_7745c5c3_Err != nil { | ||
| @@ -1818,7 +1822,7 @@ func commentForm(f CommentForm, suffix string) templ.Component { | |||||
| 1818 | var templ_7745c5c3_Var88 string | 1822 | var templ_7745c5c3_Var88 string | ||
| 1819 | templ_7745c5c3_Var88, templ_7745c5c3_Err = templ.JoinStringErrs(f.Title) | 1823 | templ_7745c5c3_Var88, templ_7745c5c3_Err = templ.JoinStringErrs(f.Title) | ||
| 1820 | if templ_7745c5c3_Err != nil { | 1824 | if templ_7745c5c3_Err != nil { | ||
| 1821 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 329, Col: 40} | 1825 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 330, Col: 40} |
| 1822 | } | 1826 | } | ||
| 1823 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var88)) | 1827 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var88)) | ||
| 1824 | if templ_7745c5c3_Err != nil { | 1828 | if templ_7745c5c3_Err != nil { | ||
| @@ -1831,7 +1835,7 @@ func commentForm(f CommentForm, suffix string) templ.Component { | |||||
| 1831 | var templ_7745c5c3_Var89 string | 1835 | var templ_7745c5c3_Var89 string | ||
| 1832 | templ_7745c5c3_Var89, templ_7745c5c3_Err = templ.ResolveAttributeValue(f.ID + suffix) | 1836 | templ_7745c5c3_Var89, templ_7745c5c3_Err = templ.ResolveAttributeValue(f.ID + suffix) | ||
| 1833 | if templ_7745c5c3_Err != nil { | 1837 | if templ_7745c5c3_Err != nil { | ||
| 1834 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 331, Col: 21} | 1838 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 332, Col: 21} |
| 1835 | } | 1839 | } | ||
| 1836 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var89) | 1840 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var89) | ||
| 1837 | if templ_7745c5c3_Err != nil { | 1841 | if templ_7745c5c3_Err != nil { | ||
| @@ -1870,7 +1874,7 @@ func commentForm(f CommentForm, suffix string) templ.Component { | |||||
| 1870 | var templ_7745c5c3_Var90 string | 1874 | var templ_7745c5c3_Var90 string | ||
| 1871 | templ_7745c5c3_Var90, templ_7745c5c3_Err = templ.ResolveAttributeValue(f.Path) | 1875 | templ_7745c5c3_Var90, templ_7745c5c3_Err = templ.ResolveAttributeValue(f.Path) | ||
| 1872 | if templ_7745c5c3_Err != nil { | 1876 | if templ_7745c5c3_Err != nil { | ||
| 1873 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 346, Col: 50} | 1877 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 347, Col: 50} |
| 1874 | } | 1878 | } | ||
| 1875 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var90) | 1879 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var90) | ||
| 1876 | if templ_7745c5c3_Err != nil { | 1880 | if templ_7745c5c3_Err != nil { | ||
| @@ -1883,7 +1887,7 @@ func commentForm(f CommentForm, suffix string) templ.Component { | |||||
| 1883 | var templ_7745c5c3_Var91 string | 1887 | var templ_7745c5c3_Var91 string | ||
| 1884 | templ_7745c5c3_Var91, templ_7745c5c3_Err = templ.ResolveAttributeValue(f.Line) | 1888 | templ_7745c5c3_Var91, templ_7745c5c3_Err = templ.ResolveAttributeValue(f.Line) | ||
| 1885 | if templ_7745c5c3_Err != nil { | 1889 | if templ_7745c5c3_Err != nil { | ||
| 1886 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 347, Col: 50} | 1890 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 348, Col: 50} |
| 1887 | } | 1891 | } | ||
| 1888 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var91) | 1892 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var91) | ||
| 1889 | if templ_7745c5c3_Err != nil { | 1893 | if templ_7745c5c3_Err != nil { | ||
| @@ -1896,7 +1900,7 @@ func commentForm(f CommentForm, suffix string) templ.Component { | |||||
| 1896 | var templ_7745c5c3_Var92 string | 1900 | var templ_7745c5c3_Var92 string | ||
| 1897 | templ_7745c5c3_Var92, templ_7745c5c3_Err = templ.ResolveAttributeValue(f.Side) | 1901 | templ_7745c5c3_Var92, templ_7745c5c3_Err = templ.ResolveAttributeValue(f.Side) | ||
| 1898 | if templ_7745c5c3_Err != nil { | 1902 | if templ_7745c5c3_Err != nil { | ||
| 1899 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 348, Col: 50} | 1903 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 349, Col: 50} |
| 1900 | } | 1904 | } | ||
| 1901 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var92) | 1905 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var92) | ||
| 1902 | if templ_7745c5c3_Err != nil { | 1906 | if templ_7745c5c3_Err != nil { | ||
| @@ -1909,7 +1913,7 @@ func commentForm(f CommentForm, suffix string) templ.Component { | |||||
| 1909 | var templ_7745c5c3_Var93 string | 1913 | var templ_7745c5c3_Var93 string | ||
| 1910 | templ_7745c5c3_Var93, templ_7745c5c3_Err = templ.ResolveAttributeValue(f.StartLine) | 1914 | templ_7745c5c3_Var93, templ_7745c5c3_Err = templ.ResolveAttributeValue(f.StartLine) | ||
| 1911 | if templ_7745c5c3_Err != nil { | 1915 | if templ_7745c5c3_Err != nil { | ||
| 1912 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 349, Col: 86} | 1916 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 350, Col: 86} |
| 1913 | } | 1917 | } | ||
| 1914 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var93) | 1918 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var93) | ||
| 1915 | if templ_7745c5c3_Err != nil { | 1919 | if templ_7745c5c3_Err != nil { | ||
| @@ -1928,7 +1932,7 @@ func commentForm(f CommentForm, suffix string) templ.Component { | |||||
| 1928 | var templ_7745c5c3_Var94 string | 1932 | var templ_7745c5c3_Var94 string | ||
| 1929 | templ_7745c5c3_Var94, templ_7745c5c3_Err = templ.ResolveAttributeValue(f.ReplyTo) | 1933 | templ_7745c5c3_Var94, templ_7745c5c3_Err = templ.ResolveAttributeValue(f.ReplyTo) | ||
| 1930 | if templ_7745c5c3_Err != nil { | 1934 | if templ_7745c5c3_Err != nil { | ||
| 1931 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 352, Col: 57} | 1935 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 353, Col: 57} |
| 1932 | } | 1936 | } | ||
| 1933 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var94) | 1937 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var94) | ||
| 1934 | if templ_7745c5c3_Err != nil { | 1938 | if templ_7745c5c3_Err != nil { | ||
| @@ -1953,7 +1957,7 @@ func commentForm(f CommentForm, suffix string) templ.Component { | |||||
| 1953 | var templ_7745c5c3_Var95 string | 1957 | var templ_7745c5c3_Var95 string | ||
| 1954 | templ_7745c5c3_Var95, templ_7745c5c3_Err = templ.ResolveAttributeValue(itoa(f.From)) | 1958 | templ_7745c5c3_Var95, templ_7745c5c3_Err = templ.ResolveAttributeValue(itoa(f.From)) | ||
| 1955 | if templ_7745c5c3_Err != nil { | 1959 | if templ_7745c5c3_Err != nil { | ||
| 1956 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 358, Col: 56} | 1960 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 359, Col: 56} |
| 1957 | } | 1961 | } | ||
| 1958 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var95) | 1962 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var95) | ||
| 1959 | if templ_7745c5c3_Err != nil { | 1963 | if templ_7745c5c3_Err != nil { | ||
| @@ -1976,7 +1980,7 @@ func commentForm(f CommentForm, suffix string) templ.Component { | |||||
| 1976 | var templ_7745c5c3_Var96 templ.SafeURL | 1980 | var templ_7745c5c3_Var96 templ.SafeURL | ||
| 1977 | templ_7745c5c3_Var96, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(f.Cancel)) | 1981 | templ_7745c5c3_Var96, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(f.Cancel)) | ||
| 1978 | if templ_7745c5c3_Err != nil { | 1982 | if templ_7745c5c3_Err != nil { | ||
| 1979 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 363, Col: 49} | 1983 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 364, Col: 49} |
| 1980 | } | 1984 | } | ||
| 1981 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var96)) | 1985 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var96)) | ||
| 1982 | if templ_7745c5c3_Err != nil { | 1986 | if templ_7745c5c3_Err != nil { | ||
| @@ -1995,7 +1999,7 @@ func commentForm(f CommentForm, suffix string) templ.Component { | |||||
| 1995 | }) | 1999 | }) | ||
| 1996 | } | 2000 | } | ||
| 1997 | 2001 | ||||
| 1998 | - | func mrRail(p MRPage) templ.Component { | 2002 | + | func mrFooter(p MRPage) templ.Component { |
| 1999 | return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { | 2003 | return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { | ||
| 2000 | templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context | 2004 | templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context | ||
| 2001 | if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { | 2005 | if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { | ||
| @@ -2016,312 +2020,349 @@ func mrRail(p MRPage) templ.Component { | |||||
| 2016 | templ_7745c5c3_Var97 = templ.NopComponent | 2020 | templ_7745c5c3_Var97 = templ.NopComponent | ||
| 2017 | } | 2021 | } | ||
| 2018 | ctx = templ.ClearChildren(ctx) | 2022 | ctx = templ.ClearChildren(ctx) | ||
| 2019 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 185, "<section aria-labelledby=\"r-files\" class=\"r-files\"><h2 id=\"r-files\">Files <span class=\"count\">") | 2023 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 185, "<footer class=\"mr-footer\"><details id=\"mr-panels\"><summary>Commits <span class=\"count\">") |
| 2020 | if templ_7745c5c3_Err != nil { | 2024 | if templ_7745c5c3_Err != nil { | ||
| 2021 | return templ_7745c5c3_Err | 2025 | return templ_7745c5c3_Err | ||
| 2022 | } | 2026 | } | ||
| 2023 | var templ_7745c5c3_Var98 string | 2027 | var templ_7745c5c3_Var98 string | ||
| 2024 | - | templ_7745c5c3_Var98, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(len(p.Files))) | 2028 | + | templ_7745c5c3_Var98, templ_7745c5c3_Err = templ.JoinStringErrs(p.CommitCount) |
| 2025 | if templ_7745c5c3_Err != nil { | 2029 | if templ_7745c5c3_Err != nil { | ||
| 2026 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 372, Col: 49} | 2030 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 373, Col: 55} |
| 2027 | } | 2031 | } | ||
| 2028 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var98)) | 2032 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var98)) | ||
| 2029 | if templ_7745c5c3_Err != nil { | 2033 | if templ_7745c5c3_Err != nil { | ||
| 2030 | return templ_7745c5c3_Err | 2034 | return templ_7745c5c3_Err | ||
| 2031 | } | 2035 | } | ||
| 2032 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 186, "</span><kbd aria-hidden=\"true\">g f</kbd> <button type=\"button\" class=\"btn icon fold\" data-js aria-expanded=\"true\" title=\"fold the list of files\" hx-on:click=\"ermiteMR.foldFiles()\"><span class=\"ico i-chevron\" aria-hidden=\"true\"></span><span class=\"sr\">fold the list of files</span></button></h2>") | 2036 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 186, "</span> · Checks</summary><nav data-mr-tabs aria-label=\"Branch details\"><a id=\"mr-tab-commits\" href=\"#mr-commits\">Commits <span class=\"count\">") |
| 2033 | if templ_7745c5c3_Err != nil { | 2037 | if templ_7745c5c3_Err != nil { | ||
| 2034 | return templ_7745c5c3_Err | 2038 | return templ_7745c5c3_Err | ||
| 2035 | } | 2039 | } | ||
| 2036 | - | templ_7745c5c3_Err = FileList(p.Files).Render(ctx, templ_7745c5c3_Buffer) | 2040 | + | var templ_7745c5c3_Var99 string |
| 2041 | + | templ_7745c5c3_Var99, templ_7745c5c3_Err = templ.JoinStringErrs(p.CommitCount) | |||
| 2037 | if templ_7745c5c3_Err != nil { | 2042 | if templ_7745c5c3_Err != nil { | ||
| 2038 | - | return templ_7745c5c3_Err | 2043 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 375, Col: 89} |
| 2039 | } | 2044 | } | ||
| 2040 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 187, "</section>") | 2045 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var99)) |
| 2041 | if templ_7745c5c3_Err != nil { | 2046 | if templ_7745c5c3_Err != nil { | ||
| 2042 | return templ_7745c5c3_Err | 2047 | return templ_7745c5c3_Err | ||
| 2043 | } | 2048 | } | ||
| 2044 | - | if len(p.Verdicts) > 0 { | 2049 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 187, "</span></a> <a id=\"mr-tab-checks\" href=\"#mr-checks\">") |
| 2045 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 188, "<section><h2>Verdicts</h2><ul>") | |||
| 2046 | - | if templ_7745c5c3_Err != nil { | |||
| 2047 | - | return templ_7745c5c3_Err | |||
| 2048 | - | } | |||
| 2049 | - | for _, v := range p.Verdicts { | |||
| 2050 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 189, "<li><a href=\"") | |||
| 2051 | - | if templ_7745c5c3_Err != nil { | |||
| 2052 | - | return templ_7745c5c3_Err | |||
| 2053 | - | } | |||
| 2054 | - | var templ_7745c5c3_Var99 templ.SafeURL | |||
| 2055 | - | templ_7745c5c3_Var99, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(v.Href)) | |||
| 2056 | - | if templ_7745c5c3_Err != nil { | |||
| 2057 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 385, Col: 37} | |||
| 2058 | - | } | |||
| 2059 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var99)) | |||
| 2060 | - | if templ_7745c5c3_Err != nil { | |||
| 2061 | - | return templ_7745c5c3_Err | |||
| 2062 | - | } | |||
| 2063 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 190, "\">") | |||
| 2064 | - | if templ_7745c5c3_Err != nil { | |||
| 2065 | - | return templ_7745c5c3_Err | |||
| 2066 | - | } | |||
| 2067 | - | var templ_7745c5c3_Var100 string | |||
| 2068 | - | templ_7745c5c3_Var100, templ_7745c5c3_Err = templ.JoinStringErrs(v.Author) | |||
| 2069 | - | if templ_7745c5c3_Err != nil { | |||
| 2070 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 385, Col: 50} | |||
| 2071 | - | } | |||
| 2072 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var100)) | |||
| 2073 | - | if templ_7745c5c3_Err != nil { | |||
| 2074 | - | return templ_7745c5c3_Err | |||
| 2075 | - | } | |||
| 2076 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 191, ": ") | |||
| 2077 | - | if templ_7745c5c3_Err != nil { | |||
| 2078 | - | return templ_7745c5c3_Err | |||
| 2079 | - | } | |||
| 2080 | - | var templ_7745c5c3_Var101 string | |||
| 2081 | - | templ_7745c5c3_Var101, templ_7745c5c3_Err = templ.JoinStringErrs(v.Label) | |||
| 2082 | - | if templ_7745c5c3_Err != nil { | |||
| 2083 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 385, Col: 63} | |||
| 2084 | - | } | |||
| 2085 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var101)) | |||
| 2086 | - | if templ_7745c5c3_Err != nil { | |||
| 2087 | - | return templ_7745c5c3_Err | |||
| 2088 | - | } | |||
| 2089 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 192, "</a> ") | |||
| 2090 | - | if templ_7745c5c3_Err != nil { | |||
| 2091 | - | return templ_7745c5c3_Err | |||
| 2092 | - | } | |||
| 2093 | - | if v.Stale { | |||
| 2094 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 193, "<span class=\"mute\">(stale)</span>") | |||
| 2095 | - | if templ_7745c5c3_Err != nil { | |||
| 2096 | - | return templ_7745c5c3_Err | |||
| 2097 | - | } | |||
| 2098 | - | } | |||
| 2099 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 194, "</li>") | |||
| 2100 | - | if templ_7745c5c3_Err != nil { | |||
| 2101 | - | return templ_7745c5c3_Err | |||
| 2102 | - | } | |||
| 2103 | - | } | |||
| 2104 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 195, "</ul></section>") | |||
| 2105 | - | if templ_7745c5c3_Err != nil { | |||
| 2106 | - | return templ_7745c5c3_Err | |||
| 2107 | - | } | |||
| 2108 | - | } | |||
| 2109 | - | templ_7745c5c3_Err = MRChecks(p.Checks).Render(ctx, templ_7745c5c3_Buffer) | |||
| 2110 | if templ_7745c5c3_Err != nil { | 2050 | if templ_7745c5c3_Err != nil { | ||
| 2111 | return templ_7745c5c3_Err | 2051 | return templ_7745c5c3_Err | ||
| 2112 | } | 2052 | } | ||
| 2113 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 196, "<section aria-labelledby=\"r-commits\"><h2 id=\"r-commits\">Commits <span class=\"count\">") | 2053 | + | var templ_7745c5c3_Var100 string |
| 2054 | + | templ_7745c5c3_Var100, templ_7745c5c3_Err = templ.JoinStringErrs("Checks ") | |||
| 2114 | if templ_7745c5c3_Err != nil { | 2055 | if templ_7745c5c3_Err != nil { | ||
| 2115 | - | return templ_7745c5c3_Err | 2056 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 377, Col: 16} |
| 2116 | } | 2057 | } | ||
| 2117 | - | var templ_7745c5c3_Var102 string | 2058 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var100)) |
| 2118 | - | templ_7745c5c3_Var102, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(len(p.Commits))) | |||
| 2119 | if templ_7745c5c3_Err != nil { | 2059 | if templ_7745c5c3_Err != nil { | ||
| 2120 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 396, Col: 71} | 2060 | + | return templ_7745c5c3_Err |
| 2121 | } | 2061 | } | ||
| 2122 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var102)) | 2062 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 188, " <span data-checks-label>") |
| 2123 | if templ_7745c5c3_Err != nil { | 2063 | if templ_7745c5c3_Err != nil { | ||
| 2124 | return templ_7745c5c3_Err | 2064 | return templ_7745c5c3_Err | ||
| 2125 | } | 2065 | } | ||
| 2126 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 197, "</span></h2><ul class=\"pcommits\">") | 2066 | + | if p.ChecksSum.Total > 0 { |
| 2067 | + | var templ_7745c5c3_Var101 string | |||
| 2068 | + | templ_7745c5c3_Var101, templ_7745c5c3_Err = templ.JoinStringErrs(p.ChecksSum.Title) | |||
| 2069 | + | if templ_7745c5c3_Err != nil { | |||
| 2070 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 380, Col: 26} | |||
| 2071 | + | } | |||
| 2072 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var101)) | |||
| 2073 | + | if templ_7745c5c3_Err != nil { | |||
| 2074 | + | return templ_7745c5c3_Err | |||
| 2075 | + | } | |||
| 2076 | + | } else { | |||
| 2077 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 189, "no checks") | |||
| 2078 | + | if templ_7745c5c3_Err != nil { | |||
| 2079 | + | return templ_7745c5c3_Err | |||
| 2080 | + | } | |||
| 2081 | + | } | |||
| 2082 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 190, "</span></a></nav><div id=\"mr-commits\" data-mr-panel aria-labelledby=\"mr-tab-commits\"><table class=\"mr-commits\"><thead><tr><th>Commit</th><th>Subject</th><th>Author</th><th>Date</th><th>Signature</th><th>Status</th></tr></thead> <tbody>") | |||
| 2127 | if templ_7745c5c3_Err != nil { | 2083 | if templ_7745c5c3_Err != nil { | ||
| 2128 | return templ_7745c5c3_Err | 2084 | return templ_7745c5c3_Err | ||
| 2129 | } | 2085 | } | ||
| 2130 | for _, c := range p.Commits { | 2086 | for _, c := range p.Commits { | ||
| 2131 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 198, "<li") | 2087 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 191, "<tr") |
| 2132 | if templ_7745c5c3_Err != nil { | 2088 | if templ_7745c5c3_Err != nil { | ||
| 2133 | return templ_7745c5c3_Err | 2089 | return templ_7745c5c3_Err | ||
| 2134 | } | 2090 | } | ||
| 2135 | if c.New { | 2091 | if c.New { | ||
| 2136 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 199, " data-new") | 2092 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 192, " data-new") |
| 2137 | if templ_7745c5c3_Err != nil { | 2093 | if templ_7745c5c3_Err != nil { | ||
| 2138 | return templ_7745c5c3_Err | 2094 | return templ_7745c5c3_Err | ||
| 2139 | } | 2095 | } | ||
| 2140 | } | 2096 | } | ||
| 2141 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 200, "><a href=\"") | 2097 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 193, "><td><a href=\"") |
| 2142 | if templ_7745c5c3_Err != nil { | 2098 | if templ_7745c5c3_Err != nil { | ||
| 2143 | return templ_7745c5c3_Err | 2099 | return templ_7745c5c3_Err | ||
| 2144 | } | 2100 | } | ||
| 2145 | - | var templ_7745c5c3_Var103 templ.SafeURL | 2101 | + | var templ_7745c5c3_Var102 templ.SafeURL |
| 2146 | - | templ_7745c5c3_Var103, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(c.Href)) | 2102 | + | templ_7745c5c3_Var102, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(c.Href)) |
| 2147 | if templ_7745c5c3_Err != nil { | 2103 | if templ_7745c5c3_Err != nil { | ||
| 2148 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 400, Col: 36} | 2104 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 393, Col: 43} |
| 2149 | } | 2105 | } | ||
| 2150 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var103)) | 2106 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var102)) |
| 2151 | if templ_7745c5c3_Err != nil { | 2107 | if templ_7745c5c3_Err != nil { | ||
| 2152 | return templ_7745c5c3_Err | 2108 | return templ_7745c5c3_Err | ||
| 2153 | } | 2109 | } | ||
| 2154 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 201, "\">") | 2110 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 194, "\">") |
| 2155 | if templ_7745c5c3_Err != nil { | 2111 | if templ_7745c5c3_Err != nil { | ||
| 2156 | return templ_7745c5c3_Err | 2112 | return templ_7745c5c3_Err | ||
| 2157 | } | 2113 | } | ||
| 2158 | - | var templ_7745c5c3_Var104 string | 2114 | + | var templ_7745c5c3_Var103 string |
| 2159 | - | templ_7745c5c3_Var104, templ_7745c5c3_Err = templ.JoinStringErrs(c.Short) | 2115 | + | templ_7745c5c3_Var103, templ_7745c5c3_Err = templ.JoinStringErrs(c.Short) |
| 2160 | if templ_7745c5c3_Err != nil { | 2116 | if templ_7745c5c3_Err != nil { | ||
| 2161 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 400, Col: 48} | 2117 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 393, Col: 55} |
| 2162 | } | 2118 | } | ||
| 2163 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var104)) | 2119 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var103)) |
| 2164 | if templ_7745c5c3_Err != nil { | 2120 | if templ_7745c5c3_Err != nil { | ||
| 2165 | return templ_7745c5c3_Err | 2121 | return templ_7745c5c3_Err | ||
| 2166 | } | 2122 | } | ||
| 2167 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 202, "</a> <span class=\"s\">") | 2123 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 195, "</a></td><td>") |
| 2168 | if templ_7745c5c3_Err != nil { | 2124 | if templ_7745c5c3_Err != nil { | ||
| 2169 | return templ_7745c5c3_Err | 2125 | return templ_7745c5c3_Err | ||
| 2170 | } | 2126 | } | ||
| 2171 | - | var templ_7745c5c3_Var105 string | 2127 | + | var templ_7745c5c3_Var104 string |
| 2172 | - | templ_7745c5c3_Var105, templ_7745c5c3_Err = templ.JoinStringErrs(c.Subject) | 2128 | + | templ_7745c5c3_Var104, templ_7745c5c3_Err = templ.JoinStringErrs(c.Subject) |
| 2173 | if templ_7745c5c3_Err != nil { | 2129 | if templ_7745c5c3_Err != nil { | ||
| 2174 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 401, Col: 32} | 2130 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 394, Col: 23} |
| 2175 | } | 2131 | } | ||
| 2176 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var105)) | 2132 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var104)) |
| 2177 | if templ_7745c5c3_Err != nil { | 2133 | if templ_7745c5c3_Err != nil { | ||
| 2178 | return templ_7745c5c3_Err | 2134 | return templ_7745c5c3_Err | ||
| 2179 | } | 2135 | } | ||
| 2180 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 203, "</span> ") | 2136 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 196, "</td><td>") |
| 2181 | if templ_7745c5c3_Err != nil { | 2137 | if templ_7745c5c3_Err != nil { | ||
| 2182 | return templ_7745c5c3_Err | 2138 | return templ_7745c5c3_Err | ||
| 2183 | } | 2139 | } | ||
| 2184 | - | if c.Sig != nil { | 2140 | + | var templ_7745c5c3_Var105 string |
| 2185 | - | templ_7745c5c3_Err = signaturePill(c.Sig).Render(ctx, templ_7745c5c3_Buffer) | 2141 | + | templ_7745c5c3_Var105, templ_7745c5c3_Err = templ.JoinStringErrs(c.Author) |
| 2186 | - | if templ_7745c5c3_Err != nil { | |||
| 2187 | - | return templ_7745c5c3_Err | |||
| 2188 | - | } | |||
| 2189 | - | } | |||
| 2190 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 204, "<span class=\"mute\">") | |||
| 2191 | - | if templ_7745c5c3_Err != nil { | |||
| 2192 | - | return templ_7745c5c3_Err | |||
| 2193 | - | } | |||
| 2194 | - | var templ_7745c5c3_Var106 string | |||
| 2195 | - | templ_7745c5c3_Var106, templ_7745c5c3_Err = templ.JoinStringErrs(c.Author) | |||
| 2196 | if templ_7745c5c3_Err != nil { | 2142 | if templ_7745c5c3_Err != nil { | ||
| 2197 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 406, Col: 16} | 2143 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 395, Col: 22} |
| 2198 | } | 2144 | } | ||
| 2199 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var106)) | 2145 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var105)) |
| 2200 | if templ_7745c5c3_Err != nil { | 2146 | if templ_7745c5c3_Err != nil { | ||
| 2201 | return templ_7745c5c3_Err | 2147 | return templ_7745c5c3_Err | ||
| 2202 | } | 2148 | } | ||
| 2203 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 205, " ") | 2149 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 197, "</td><td>") |
| 2204 | if templ_7745c5c3_Err != nil { | 2150 | if templ_7745c5c3_Err != nil { | ||
| 2205 | return templ_7745c5c3_Err | 2151 | return templ_7745c5c3_Err | ||
| 2206 | } | 2152 | } | ||
| 2207 | if c.WhenAt != "" { | 2153 | if c.WhenAt != "" { | ||
| 2208 | - | var templ_7745c5c3_Var107 string | 2154 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 198, "<time datetime=\"") |
| 2209 | - | templ_7745c5c3_Var107, templ_7745c5c3_Err = templ.JoinStringErrs(" · ") | |||
| 2210 | - | if templ_7745c5c3_Err != nil { | |||
| 2211 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 408, Col: 15} | |||
| 2212 | - | } | |||
| 2213 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var107)) | |||
| 2214 | if templ_7745c5c3_Err != nil { | 2155 | if templ_7745c5c3_Err != nil { | ||
| 2215 | return templ_7745c5c3_Err | 2156 | return templ_7745c5c3_Err | ||
| 2216 | } | 2157 | } | ||
| 2217 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 206, "<time datetime=\"") | 2158 | + | var templ_7745c5c3_Var106 string |
| 2159 | + | templ_7745c5c3_Var106, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.WhenAt) | |||
| 2218 | if templ_7745c5c3_Err != nil { | 2160 | if templ_7745c5c3_Err != nil { | ||
| 2219 | - | return templ_7745c5c3_Err | 2161 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 398, Col: 35} |
| 2220 | } | 2162 | } | ||
| 2221 | - | var templ_7745c5c3_Var108 string | 2163 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var106) |
| 2222 | - | templ_7745c5c3_Var108, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.WhenAt) | |||
| 2223 | - | if templ_7745c5c3_Err != nil { | |||
| 2224 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 408, Col: 42} | |||
| 2225 | - | } | |||
| 2226 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var108) | |||
| 2227 | if templ_7745c5c3_Err != nil { | 2164 | if templ_7745c5c3_Err != nil { | ||
| 2228 | return templ_7745c5c3_Err | 2165 | return templ_7745c5c3_Err | ||
| 2229 | } | 2166 | } | ||
| 2230 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 207, "\">") | 2167 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 199, "\">") |
| 2231 | if templ_7745c5c3_Err != nil { | 2168 | if templ_7745c5c3_Err != nil { | ||
| 2232 | return templ_7745c5c3_Err | 2169 | return templ_7745c5c3_Err | ||
| 2233 | } | 2170 | } | ||
| 2234 | - | var templ_7745c5c3_Var109 string | 2171 | + | var templ_7745c5c3_Var107 string |
| 2235 | - | templ_7745c5c3_Var109, templ_7745c5c3_Err = templ.JoinStringErrs(c.When) | 2172 | + | templ_7745c5c3_Var107, templ_7745c5c3_Err = templ.JoinStringErrs(c.When) |
| 2236 | if templ_7745c5c3_Err != nil { | 2173 | if templ_7745c5c3_Err != nil { | ||
| 2237 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 408, Col: 53} | 2174 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 398, Col: 46} |
| 2238 | } | 2175 | } | ||
| 2239 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var109)) | 2176 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var107)) |
| 2240 | if templ_7745c5c3_Err != nil { | 2177 | if templ_7745c5c3_Err != nil { | ||
| 2241 | return templ_7745c5c3_Err | 2178 | return templ_7745c5c3_Err | ||
| 2242 | } | 2179 | } | ||
| 2243 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 208, "</time> ") | 2180 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 200, "</time>") |
| 2244 | if templ_7745c5c3_Err != nil { | 2181 | if templ_7745c5c3_Err != nil { | ||
| 2245 | return templ_7745c5c3_Err | 2182 | return templ_7745c5c3_Err | ||
| 2246 | } | 2183 | } | ||
| 2247 | } | 2184 | } | ||
| 2248 | - | if c.New { | 2185 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 201, "</td><td>") |
| 2249 | - | var templ_7745c5c3_Var110 string | 2186 | + | if templ_7745c5c3_Err != nil { |
| 2250 | - | templ_7745c5c3_Var110, templ_7745c5c3_Err = templ.JoinStringErrs(" · new") | 2187 | + | return templ_7745c5c3_Err |
| 2188 | + | } | |||
| 2189 | + | if c.Sig != nil { | |||
| 2190 | + | templ_7745c5c3_Err = signaturePill(c.Sig).Render(ctx, templ_7745c5c3_Buffer) | |||
| 2251 | if templ_7745c5c3_Err != nil { | 2191 | if templ_7745c5c3_Err != nil { | ||
| 2252 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 411, Col: 18} | 2192 | + | return templ_7745c5c3_Err |
| 2253 | } | 2193 | } | ||
| 2254 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var110)) | 2194 | + | } |
| 2195 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 202, "</td><td>") | |||
| 2196 | + | if templ_7745c5c3_Err != nil { | |||
| 2197 | + | return templ_7745c5c3_Err | |||
| 2198 | + | } | |||
| 2199 | + | if c.New { | |||
| 2200 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 203, "<span>new</span>") | |||
| 2255 | if templ_7745c5c3_Err != nil { | 2201 | if templ_7745c5c3_Err != nil { | ||
| 2256 | return templ_7745c5c3_Err | 2202 | return templ_7745c5c3_Err | ||
| 2257 | } | 2203 | } | ||
| 2258 | } | 2204 | } | ||
| 2259 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 209, "</span></li>") | 2205 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 204, "</td></tr>") |
| 2260 | if templ_7745c5c3_Err != nil { | 2206 | if templ_7745c5c3_Err != nil { | ||
| 2261 | return templ_7745c5c3_Err | 2207 | return templ_7745c5c3_Err | ||
| 2262 | } | 2208 | } | ||
| 2263 | } | 2209 | } | ||
| 2264 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 210, "</ul>") | 2210 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 205, "</tbody></table>") |
| 2265 | if templ_7745c5c3_Err != nil { | 2211 | if templ_7745c5c3_Err != nil { | ||
| 2266 | return templ_7745c5c3_Err | 2212 | return templ_7745c5c3_Err | ||
| 2267 | } | 2213 | } | ||
| 2268 | if len(p.Commits) == 0 { | 2214 | if len(p.Commits) == 0 { | ||
| 2269 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 211, "<p class=\"dim\">no commit to merge.</p>") | 2215 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 206, "<p class=\"dim\">no commit to merge.</p>") |
| 2270 | if templ_7745c5c3_Err != nil { | 2216 | if templ_7745c5c3_Err != nil { | ||
| 2271 | return templ_7745c5c3_Err | 2217 | return templ_7745c5c3_Err | ||
| 2272 | } | 2218 | } | ||
| 2273 | } | 2219 | } | ||
| 2274 | if p.CommitsNote != "" { | 2220 | if p.CommitsNote != "" { | ||
| 2275 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 212, "<p class=\"note\">") | 2221 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 207, "<p class=\"note\">") |
| 2276 | if templ_7745c5c3_Err != nil { | 2222 | if templ_7745c5c3_Err != nil { | ||
| 2277 | return templ_7745c5c3_Err | 2223 | return templ_7745c5c3_Err | ||
| 2278 | } | 2224 | } | ||
| 2279 | - | var templ_7745c5c3_Var111 string | 2225 | + | var templ_7745c5c3_Var108 string |
| 2280 | - | templ_7745c5c3_Var111, templ_7745c5c3_Err = templ.JoinStringErrs(p.CommitsNote) | 2226 | + | templ_7745c5c3_Var108, templ_7745c5c3_Err = templ.JoinStringErrs(p.CommitsNote) |
| 2281 | if templ_7745c5c3_Err != nil { | 2227 | if templ_7745c5c3_Err != nil { | ||
| 2282 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 421, Col: 34} | 2228 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 419, Col: 36} |
| 2283 | } | 2229 | } | ||
| 2284 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var111)) | 2230 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var108)) |
| 2285 | if templ_7745c5c3_Err != nil { | 2231 | if templ_7745c5c3_Err != nil { | ||
| 2286 | return templ_7745c5c3_Err | 2232 | return templ_7745c5c3_Err | ||
| 2287 | } | 2233 | } | ||
| 2288 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 213, "</p>") | 2234 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 208, "</p>") |
| 2289 | if templ_7745c5c3_Err != nil { | 2235 | if templ_7745c5c3_Err != nil { | ||
| 2290 | return templ_7745c5c3_Err | 2236 | return templ_7745c5c3_Err | ||
| 2291 | } | 2237 | } | ||
| 2292 | } | 2238 | } | ||
| 2293 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 214, "</section><section aria-labelledby=\"r-settings\"><h2 id=\"r-settings\">Settings</h2><dl class=\"kv\"><dt>modes</dt><dd>") | 2239 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 209, "</div><div id=\"mr-checks-panel\" data-mr-panel aria-labelledby=\"mr-tab-checks\">") |
| 2294 | if templ_7745c5c3_Err != nil { | 2240 | if templ_7745c5c3_Err != nil { | ||
| 2295 | return templ_7745c5c3_Err | 2241 | return templ_7745c5c3_Err | ||
| 2296 | } | 2242 | } | ||
| 2297 | - | var templ_7745c5c3_Var112 string | 2243 | + | templ_7745c5c3_Err = MRChecks(p.Checks).Render(ctx, templ_7745c5c3_Buffer) |
| 2298 | - | templ_7745c5c3_Var112, templ_7745c5c3_Err = templ.JoinStringErrs(strings.Join(p.Modes, ", ")) | |||
| 2299 | if templ_7745c5c3_Err != nil { | 2244 | if templ_7745c5c3_Err != nil { | ||
| 2300 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 428, Col: 36} | 2245 | + | return templ_7745c5c3_Err |
| 2246 | + | } | |||
| 2247 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 210, "</div></details></footer>") | |||
| 2248 | + | if templ_7745c5c3_Err != nil { | |||
| 2249 | + | return templ_7745c5c3_Err | |||
| 2250 | + | } | |||
| 2251 | + | return nil | |||
| 2252 | + | }) | |||
| 2253 | + | } | |||
| 2254 | + | ||||
| 2255 | + | func mrRail(p MRPage) templ.Component { | |||
| 2256 | + | return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { | |||
| 2257 | + | templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context | |||
| 2258 | + | if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { | |||
| 2259 | + | return templ_7745c5c3_CtxErr | |||
| 2301 | } | 2260 | } | ||
| 2302 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var112)) | 2261 | + | templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) |
| 2262 | + | if !templ_7745c5c3_IsBuffer { | |||
| 2263 | + | defer func() { | |||
| 2264 | + | templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) | |||
| 2265 | + | if templ_7745c5c3_Err == nil { | |||
| 2266 | + | templ_7745c5c3_Err = templ_7745c5c3_BufErr | |||
| 2267 | + | } | |||
| 2268 | + | }() | |||
| 2269 | + | } | |||
| 2270 | + | ctx = templ.InitializeContext(ctx) | |||
| 2271 | + | templ_7745c5c3_Var109 := templ.GetChildren(ctx) | |||
| 2272 | + | if templ_7745c5c3_Var109 == nil { | |||
| 2273 | + | templ_7745c5c3_Var109 = templ.NopComponent | |||
| 2274 | + | } | |||
| 2275 | + | ctx = templ.ClearChildren(ctx) | |||
| 2276 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 211, "<section aria-labelledby=\"r-files\" class=\"r-files\"><h2 id=\"r-files\">Files <span class=\"count\">") | |||
| 2303 | if templ_7745c5c3_Err != nil { | 2277 | if templ_7745c5c3_Err != nil { | ||
| 2304 | return templ_7745c5c3_Err | 2278 | return templ_7745c5c3_Err | ||
| 2305 | } | 2279 | } | ||
| 2306 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 215, "</dd><dt>checks</dt><dd>") | 2280 | + | var templ_7745c5c3_Var110 string |
| 2281 | + | templ_7745c5c3_Var110, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(len(p.Files))) | |||
| 2282 | + | if templ_7745c5c3_Err != nil { | |||
| 2283 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 432, Col: 49} | |||
| 2284 | + | } | |||
| 2285 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var110)) | |||
| 2307 | if templ_7745c5c3_Err != nil { | 2286 | if templ_7745c5c3_Err != nil { | ||
| 2308 | return templ_7745c5c3_Err | 2287 | return templ_7745c5c3_Err | ||
| 2309 | } | 2288 | } | ||
| 2310 | - | if p.ChecksBlock { | 2289 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 212, "</span><kbd aria-hidden=\"true\">g f</kbd> <button type=\"button\" class=\"btn icon fold\" data-js aria-expanded=\"true\" title=\"fold the list of files\" hx-on:click=\"ermiteMR.foldFiles()\"><span class=\"ico i-chevron\" aria-hidden=\"true\"></span><span class=\"sr\">fold the list of files</span></button></h2>") |
| 2311 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 216, "failing ones block the merge") | 2290 | + | if templ_7745c5c3_Err != nil { |
| 2291 | + | return templ_7745c5c3_Err | |||
| 2292 | + | } | |||
| 2293 | + | templ_7745c5c3_Err = FileList(p.Files).Render(ctx, templ_7745c5c3_Buffer) | |||
| 2294 | + | if templ_7745c5c3_Err != nil { | |||
| 2295 | + | return templ_7745c5c3_Err | |||
| 2296 | + | } | |||
| 2297 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 213, "</section>") | |||
| 2298 | + | if templ_7745c5c3_Err != nil { | |||
| 2299 | + | return templ_7745c5c3_Err | |||
| 2300 | + | } | |||
| 2301 | + | if len(p.Verdicts) > 0 { | |||
| 2302 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 214, "<section><h2>Verdicts</h2><ul>") | |||
| 2312 | if templ_7745c5c3_Err != nil { | 2303 | if templ_7745c5c3_Err != nil { | ||
| 2313 | return templ_7745c5c3_Err | 2304 | return templ_7745c5c3_Err | ||
| 2314 | } | 2305 | } | ||
| 2315 | - | } else { | 2306 | + | for _, v := range p.Verdicts { |
| 2316 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 217, "do not block the merge") | 2307 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 215, "<li><a href=\"") |
| 2308 | + | if templ_7745c5c3_Err != nil { | |||
| 2309 | + | return templ_7745c5c3_Err | |||
| 2310 | + | } | |||
| 2311 | + | var templ_7745c5c3_Var111 templ.SafeURL | |||
| 2312 | + | templ_7745c5c3_Var111, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(v.Href)) | |||
| 2313 | + | if templ_7745c5c3_Err != nil { | |||
| 2314 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 445, Col: 37} | |||
| 2315 | + | } | |||
| 2316 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var111)) | |||
| 2317 | + | if templ_7745c5c3_Err != nil { | |||
| 2318 | + | return templ_7745c5c3_Err | |||
| 2319 | + | } | |||
| 2320 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 216, "\">") | |||
| 2321 | + | if templ_7745c5c3_Err != nil { | |||
| 2322 | + | return templ_7745c5c3_Err | |||
| 2323 | + | } | |||
| 2324 | + | var templ_7745c5c3_Var112 string | |||
| 2325 | + | templ_7745c5c3_Var112, templ_7745c5c3_Err = templ.JoinStringErrs(v.Author) | |||
| 2326 | + | if templ_7745c5c3_Err != nil { | |||
| 2327 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 445, Col: 50} | |||
| 2328 | + | } | |||
| 2329 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var112)) | |||
| 2330 | + | if templ_7745c5c3_Err != nil { | |||
| 2331 | + | return templ_7745c5c3_Err | |||
| 2332 | + | } | |||
| 2333 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 217, ": ") | |||
| 2334 | + | if templ_7745c5c3_Err != nil { | |||
| 2335 | + | return templ_7745c5c3_Err | |||
| 2336 | + | } | |||
| 2337 | + | var templ_7745c5c3_Var113 string | |||
| 2338 | + | templ_7745c5c3_Var113, templ_7745c5c3_Err = templ.JoinStringErrs(v.Label) | |||
| 2339 | + | if templ_7745c5c3_Err != nil { | |||
| 2340 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 445, Col: 63} | |||
| 2341 | + | } | |||
| 2342 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var113)) | |||
| 2343 | + | if templ_7745c5c3_Err != nil { | |||
| 2344 | + | return templ_7745c5c3_Err | |||
| 2345 | + | } | |||
| 2346 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 218, "</a> ") | |||
| 2347 | + | if templ_7745c5c3_Err != nil { | |||
| 2348 | + | return templ_7745c5c3_Err | |||
| 2349 | + | } | |||
| 2350 | + | if v.Stale { | |||
| 2351 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 219, "<span class=\"mute\">(stale)</span>") | |||
| 2352 | + | if templ_7745c5c3_Err != nil { | |||
| 2353 | + | return templ_7745c5c3_Err | |||
| 2354 | + | } | |||
| 2355 | + | } | |||
| 2356 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 220, "</li>") | |||
| 2357 | + | if templ_7745c5c3_Err != nil { | |||
| 2358 | + | return templ_7745c5c3_Err | |||
| 2359 | + | } | |||
| 2360 | + | } | |||
| 2361 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 221, "</ul></section>") | |||
| 2317 | if templ_7745c5c3_Err != nil { | 2362 | if templ_7745c5c3_Err != nil { | ||
| 2318 | return templ_7745c5c3_Err | 2363 | return templ_7745c5c3_Err | ||
| 2319 | } | 2364 | } | ||
| 2320 | } | 2365 | } | ||
| 2321 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 218, "</dd></dl></section>") | |||
| 2322 | - | if templ_7745c5c3_Err != nil { | |||
| 2323 | - | return templ_7745c5c3_Err | |||
| 2324 | - | } | |||
| 2325 | return nil | 2366 | return nil | ||
| 2326 | }) | 2367 | }) | ||
| 2327 | } | 2368 | } | ||
| @@ -2346,51 +2387,51 @@ func mrBar(p MRPage) templ.Component { | |||||
| 2346 | }() | 2387 | }() | ||
| 2347 | } | 2388 | } | ||
| 2348 | ctx = templ.InitializeContext(ctx) | 2389 | ctx = templ.InitializeContext(ctx) | ||
| 2349 | - | templ_7745c5c3_Var113 := templ.GetChildren(ctx) | 2390 | + | templ_7745c5c3_Var114 := templ.GetChildren(ctx) |
| 2350 | - | if templ_7745c5c3_Var113 == nil { | 2391 | + | if templ_7745c5c3_Var114 == nil { |
| 2351 | - | templ_7745c5c3_Var113 = templ.NopComponent | 2392 | + | templ_7745c5c3_Var114 = templ.NopComponent |
| 2352 | } | 2393 | } | ||
| 2353 | ctx = templ.ClearChildren(ctx) | 2394 | ctx = templ.ClearChildren(ctx) | ||
| 2354 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 219, "<div class=\"diff-tools mr-bar\" role=\"group\" aria-label=\"Diff view and merge\"><span class=\"dim\">") | 2395 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 222, "<div class=\"diff-tools mr-bar\" role=\"group\" aria-label=\"Diff view and merge\"><span class=\"dim\">") |
| 2355 | if templ_7745c5c3_Err != nil { | 2396 | if templ_7745c5c3_Err != nil { | ||
| 2356 | return templ_7745c5c3_Err | 2397 | return templ_7745c5c3_Err | ||
| 2357 | } | 2398 | } | ||
| 2358 | - | var templ_7745c5c3_Var114 string | 2399 | + | var templ_7745c5c3_Var115 string |
| 2359 | - | templ_7745c5c3_Var114, templ_7745c5c3_Err = templ.JoinStringErrs(plural(p.NFiles, "file", "files")) | 2400 | + | templ_7745c5c3_Var115, templ_7745c5c3_Err = templ.JoinStringErrs(plural(p.NFiles, "file", "files")) |
| 2360 | if templ_7745c5c3_Err != nil { | 2401 | if templ_7745c5c3_Err != nil { | ||
| 2361 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 447, Col: 55} | 2402 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 462, Col: 55} |
| 2362 | } | 2403 | } | ||
| 2363 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var114)) | 2404 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var115)) |
| 2364 | if templ_7745c5c3_Err != nil { | 2405 | if templ_7745c5c3_Err != nil { | ||
| 2365 | return templ_7745c5c3_Err | 2406 | return templ_7745c5c3_Err | ||
| 2366 | } | 2407 | } | ||
| 2367 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 220, " · <span class=\"plus\">+") | 2408 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 223, " · <span class=\"plus\">+") |
| 2368 | if templ_7745c5c3_Err != nil { | 2409 | if templ_7745c5c3_Err != nil { | ||
| 2369 | return templ_7745c5c3_Err | 2410 | return templ_7745c5c3_Err | ||
| 2370 | } | 2411 | } | ||
| 2371 | - | var templ_7745c5c3_Var115 string | 2412 | + | var templ_7745c5c3_Var116 string |
| 2372 | - | templ_7745c5c3_Var115, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Adds)) | 2413 | + | templ_7745c5c3_Var116, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Adds)) |
| 2373 | if templ_7745c5c3_Err != nil { | 2414 | if templ_7745c5c3_Err != nil { | ||
| 2374 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 447, Col: 95} | 2415 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 462, Col: 95} |
| 2375 | } | 2416 | } | ||
| 2376 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var115)) | 2417 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var116)) |
| 2377 | if templ_7745c5c3_Err != nil { | 2418 | if templ_7745c5c3_Err != nil { | ||
| 2378 | return templ_7745c5c3_Err | 2419 | return templ_7745c5c3_Err | ||
| 2379 | } | 2420 | } | ||
| 2380 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 221, "</span> <span class=\"minus\">-") | 2421 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 224, "</span> <span class=\"minus\">-") |
| 2381 | if templ_7745c5c3_Err != nil { | 2422 | if templ_7745c5c3_Err != nil { | ||
| 2382 | return templ_7745c5c3_Err | 2423 | return templ_7745c5c3_Err | ||
| 2383 | } | 2424 | } | ||
| 2384 | - | var templ_7745c5c3_Var116 string | 2425 | + | var templ_7745c5c3_Var117 string |
| 2385 | - | templ_7745c5c3_Var116, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Dels)) | 2426 | + | templ_7745c5c3_Var117, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Dels)) |
| 2386 | if templ_7745c5c3_Err != nil { | 2427 | if templ_7745c5c3_Err != nil { | ||
| 2387 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 447, Col: 140} | 2428 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 462, Col: 140} |
| 2388 | } | 2429 | } | ||
| 2389 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var116)) | 2430 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var117)) |
| 2390 | if templ_7745c5c3_Err != nil { | 2431 | if templ_7745c5c3_Err != nil { | ||
| 2391 | return templ_7745c5c3_Err | 2432 | return templ_7745c5c3_Err | ||
| 2392 | } | 2433 | } | ||
| 2393 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 222, "</span></span>") | 2434 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 225, "</span></span>") |
| 2394 | if templ_7745c5c3_Err != nil { | 2435 | if templ_7745c5c3_Err != nil { | ||
| 2395 | return templ_7745c5c3_Err | 2436 | return templ_7745c5c3_Err | ||
| 2396 | } | 2437 | } | ||
| @@ -2398,7 +2439,7 @@ func mrBar(p MRPage) templ.Component { | |||||
| 2398 | if templ_7745c5c3_Err != nil { | 2439 | if templ_7745c5c3_Err != nil { | ||
| 2399 | return templ_7745c5c3_Err | 2440 | return templ_7745c5c3_Err | ||
| 2400 | } | 2441 | } | ||
| 2401 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 223, "<span class=\"grow\"></span>") | 2442 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 226, "<span class=\"grow\"></span>") |
| 2402 | if templ_7745c5c3_Err != nil { | 2443 | if templ_7745c5c3_Err != nil { | ||
| 2403 | return templ_7745c5c3_Err | 2444 | return templ_7745c5c3_Err | ||
| 2404 | } | 2445 | } | ||
| @@ -2411,16 +2452,12 @@ func mrBar(p MRPage) templ.Component { | |||||
| 2411 | if templ_7745c5c3_Err != nil { | 2452 | if templ_7745c5c3_Err != nil { | ||
| 2412 | return templ_7745c5c3_Err | 2453 | return templ_7745c5c3_Err | ||
| 2413 | } | 2454 | } | ||
| 2414 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 224, " ") | |||
| 2415 | - | if templ_7745c5c3_Err != nil { | |||
| 2416 | - | return templ_7745c5c3_Err | |||
| 2417 | - | } | |||
| 2418 | - | templ_7745c5c3_Err = moreMenu(p).Render(ctx, templ_7745c5c3_Buffer) | |||
| 2419 | - | if templ_7745c5c3_Err != nil { | |||
| 2420 | - | return templ_7745c5c3_Err | |||
| 2421 | - | } | |||
| 2422 | } | 2455 | } | ||
| 2423 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 225, "</div>") | 2456 | + | templ_7745c5c3_Err = moreMenu(p).Render(ctx, templ_7745c5c3_Buffer) |
| 2457 | + | if templ_7745c5c3_Err != nil { | |||
| 2458 | + | return templ_7745c5c3_Err | |||
| 2459 | + | } | |||
| 2460 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 227, "</div>") | |||
| 2424 | if templ_7745c5c3_Err != nil { | 2461 | if templ_7745c5c3_Err != nil { | ||
| 2425 | return templ_7745c5c3_Err | 2462 | return templ_7745c5c3_Err | ||
| 2426 | } | 2463 | } | ||
| @@ -2452,84 +2489,57 @@ func mergeMenu(p MRPage) templ.Component { | |||||
| 2452 | }() | 2489 | }() | ||
| 2453 | } | 2490 | } | ||
| 2454 | ctx = templ.InitializeContext(ctx) | 2491 | ctx = templ.InitializeContext(ctx) | ||
| 2455 | - | templ_7745c5c3_Var117 := templ.GetChildren(ctx) | 2492 | + | templ_7745c5c3_Var118 := templ.GetChildren(ctx) |
| 2456 | - | if templ_7745c5c3_Var117 == nil { | 2493 | + | if templ_7745c5c3_Var118 == nil { |
| 2457 | - | templ_7745c5c3_Var117 = templ.NopComponent | 2494 | + | templ_7745c5c3_Var118 = templ.NopComponent |
| 2458 | } | 2495 | } | ||
| 2459 | ctx = templ.ClearChildren(ctx) | 2496 | ctx = templ.ClearChildren(ctx) | ||
| 2460 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 226, "<details class=\"menu mmenu\" id=\"merge-menu\" data-state=\"open\"") | 2497 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 228, "<details class=\"menu mmenu\" id=\"merge-menu\" data-state=\"open\"") |
| 2461 | if templ_7745c5c3_Err != nil { | 2498 | if templ_7745c5c3_Err != nil { | ||
| 2462 | return templ_7745c5c3_Err | 2499 | return templ_7745c5c3_Err | ||
| 2463 | } | 2500 | } | ||
| 2464 | if p.Box.Error != "" { | 2501 | if p.Box.Error != "" { | ||
| 2465 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 227, " open") | 2502 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 229, " open") |
| 2466 | if templ_7745c5c3_Err != nil { | 2503 | if templ_7745c5c3_Err != nil { | ||
| 2467 | return templ_7745c5c3_Err | 2504 | return templ_7745c5c3_Err | ||
| 2468 | } | 2505 | } | ||
| 2469 | } | 2506 | } | ||
| 2470 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 228, "><summary class=\"btn primary\" aria-keyshortcuts=\"Shift+M\">") | 2507 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 230, "><summary class=\"btn primary\" aria-keyshortcuts=\"Shift+M\">") |
| 2471 | if templ_7745c5c3_Err != nil { | 2508 | if templ_7745c5c3_Err != nil { | ||
| 2472 | return templ_7745c5c3_Err | 2509 | return templ_7745c5c3_Err | ||
| 2473 | } | 2510 | } | ||
| 2474 | if p.Box.ReadyAction != "" { | 2511 | if p.Box.ReadyAction != "" { | ||
| 2475 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 229, "Draft ") | 2512 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 231, "Draft ") |
| 2476 | if templ_7745c5c3_Err != nil { | 2513 | if templ_7745c5c3_Err != nil { | ||
| 2477 | return templ_7745c5c3_Err | 2514 | return templ_7745c5c3_Err | ||
| 2478 | } | 2515 | } | ||
| 2479 | } else { | 2516 | } else { | ||
| 2480 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 230, "Merge ") | 2517 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 232, "Merge ") |
| 2481 | if templ_7745c5c3_Err != nil { | 2518 | if templ_7745c5c3_Err != nil { | ||
| 2482 | return templ_7745c5c3_Err | 2519 | return templ_7745c5c3_Err | ||
| 2483 | } | 2520 | } | ||
| 2484 | } | 2521 | } | ||
| 2485 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 231, "<kbd aria-hidden=\"true\">M</kbd></summary><div class=\"menu-pop\" role=\"group\" aria-label=\"Merge\"><dl class=\"kv\"><dt>head</dt><dd>") | 2522 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 233, "<kbd aria-hidden=\"true\">M</kbd></summary><div class=\"menu-pop\" role=\"group\" aria-label=\"Merge\">") |
| 2486 | if templ_7745c5c3_Err != nil { | 2523 | if templ_7745c5c3_Err != nil { | ||
| 2487 | return templ_7745c5c3_Err | 2524 | return templ_7745c5c3_Err | ||
| 2488 | } | 2525 | } | ||
| 2489 | if p.Box.HeadGone { | 2526 | if p.Box.HeadGone { | ||
| 2490 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 232, "gone: the source branch was deleted") | 2527 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 234, "<p class=\"dim\">the source branch was deleted</p>") |
| 2491 | - | if templ_7745c5c3_Err != nil { | |||
| 2492 | - | return templ_7745c5c3_Err | |||
| 2493 | - | } | |||
| 2494 | - | } else { | |||
| 2495 | - | var templ_7745c5c3_Var118 string | |||
| 2496 | - | templ_7745c5c3_Var118, templ_7745c5c3_Err = templ.JoinStringErrs(p.HeadShort) | |||
| 2497 | - | if templ_7745c5c3_Err != nil { | |||
| 2498 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 483, Col: 19} | |||
| 2499 | - | } | |||
| 2500 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var118)) | |||
| 2501 | if templ_7745c5c3_Err != nil { | 2528 | if templ_7745c5c3_Err != nil { | ||
| 2502 | return templ_7745c5c3_Err | 2529 | return templ_7745c5c3_Err | ||
| 2503 | } | 2530 | } | ||
| 2504 | } | 2531 | } | ||
| 2505 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 233, "</dd><dt>into</dt><dd>") | |||
| 2506 | - | if templ_7745c5c3_Err != nil { | |||
| 2507 | - | return templ_7745c5c3_Err | |||
| 2508 | - | } | |||
| 2509 | - | var templ_7745c5c3_Var119 string | |||
| 2510 | - | templ_7745c5c3_Var119, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | |||
| 2511 | - | if templ_7745c5c3_Err != nil { | |||
| 2512 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 487, Col: 18} | |||
| 2513 | - | } | |||
| 2514 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var119)) | |||
| 2515 | - | if templ_7745c5c3_Err != nil { | |||
| 2516 | - | return templ_7745c5c3_Err | |||
| 2517 | - | } | |||
| 2518 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 234, "</dd></dl>") | |||
| 2519 | - | if templ_7745c5c3_Err != nil { | |||
| 2520 | - | return templ_7745c5c3_Err | |||
| 2521 | - | } | |||
| 2522 | if p.Box.Error != "" { | 2532 | if p.Box.Error != "" { | ||
| 2523 | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 235, "<p class=\"d-err\" role=\"alert\">") | 2533 | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 235, "<p class=\"d-err\" role=\"alert\">") | ||
| 2524 | if templ_7745c5c3_Err != nil { | 2534 | if templ_7745c5c3_Err != nil { | ||
| 2525 | return templ_7745c5c3_Err | 2535 | return templ_7745c5c3_Err | ||
| 2526 | } | 2536 | } | ||
| 2527 | - | var templ_7745c5c3_Var120 string | 2537 | + | var templ_7745c5c3_Var119 string |
| 2528 | - | templ_7745c5c3_Var120, templ_7745c5c3_Err = templ.JoinStringErrs(p.Box.Error) | 2538 | + | templ_7745c5c3_Var119, templ_7745c5c3_Err = templ.JoinStringErrs(p.Box.Error) |
| 2529 | if templ_7745c5c3_Err != nil { | 2539 | if templ_7745c5c3_Err != nil { | ||
| 2530 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 490, Col: 47} | 2540 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 496, Col: 47} |
| 2531 | } | 2541 | } | ||
| 2532 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var120)) | 2542 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var119)) |
| 2533 | if templ_7745c5c3_Err != nil { | 2543 | if templ_7745c5c3_Err != nil { | ||
| 2534 | return templ_7745c5c3_Err | 2544 | return templ_7745c5c3_Err | ||
| 2535 | } | 2545 | } | ||
| @@ -2543,12 +2553,12 @@ func mergeMenu(p MRPage) templ.Component { | |||||
| 2543 | if templ_7745c5c3_Err != nil { | 2553 | if templ_7745c5c3_Err != nil { | ||
| 2544 | return templ_7745c5c3_Err | 2554 | return templ_7745c5c3_Err | ||
| 2545 | } | 2555 | } | ||
| 2546 | - | var templ_7745c5c3_Var121 templ.SafeURL | 2556 | + | var templ_7745c5c3_Var120 templ.SafeURL |
| 2547 | - | templ_7745c5c3_Var121, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.ReadyAction)) | 2557 | + | templ_7745c5c3_Var120, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.ReadyAction)) |
| 2548 | if templ_7745c5c3_Err != nil { | 2558 | if templ_7745c5c3_Err != nil { | ||
| 2549 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 494, Col: 80} | 2559 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 500, Col: 80} |
| 2550 | } | 2560 | } | ||
| 2551 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var121)) | 2561 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var120)) |
| 2552 | if templ_7745c5c3_Err != nil { | 2562 | if templ_7745c5c3_Err != nil { | ||
| 2553 | return templ_7745c5c3_Err | 2563 | return templ_7745c5c3_Err | ||
| 2554 | } | 2564 | } | ||
| @@ -2565,12 +2575,12 @@ func mergeMenu(p MRPage) templ.Component { | |||||
| 2565 | if templ_7745c5c3_Err != nil { | 2575 | if templ_7745c5c3_Err != nil { | ||
| 2566 | return templ_7745c5c3_Err | 2576 | return templ_7745c5c3_Err | ||
| 2567 | } | 2577 | } | ||
| 2568 | - | var templ_7745c5c3_Var122 templ.SafeURL | 2578 | + | var templ_7745c5c3_Var121 templ.SafeURL |
| 2569 | - | templ_7745c5c3_Var122, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.MergeAction)) | 2579 | + | templ_7745c5c3_Var121, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.MergeAction)) |
| 2570 | if templ_7745c5c3_Err != nil { | 2580 | if templ_7745c5c3_Err != nil { | ||
| 2571 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 499, Col: 80} | 2581 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 505, Col: 80} |
| 2572 | } | 2582 | } | ||
| 2573 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var122)) | 2583 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var121)) |
| 2574 | if templ_7745c5c3_Err != nil { | 2584 | if templ_7745c5c3_Err != nil { | ||
| 2575 | return templ_7745c5c3_Err | 2585 | return templ_7745c5c3_Err | ||
| 2576 | } | 2586 | } | ||
| @@ -2578,12 +2588,12 @@ func mergeMenu(p MRPage) templ.Component { | |||||
| 2578 | if templ_7745c5c3_Err != nil { | 2588 | if templ_7745c5c3_Err != nil { | ||
| 2579 | return templ_7745c5c3_Err | 2589 | return templ_7745c5c3_Err | ||
| 2580 | } | 2590 | } | ||
| 2581 | - | var templ_7745c5c3_Var123 string | 2591 | + | var templ_7745c5c3_Var122 string |
| 2582 | - | templ_7745c5c3_Var123, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Box.Head) | 2592 | + | templ_7745c5c3_Var122, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Box.Head) |
| 2583 | if templ_7745c5c3_Err != nil { | 2593 | if templ_7745c5c3_Err != nil { | ||
| 2584 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 500, Col: 59} | 2594 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 506, Col: 59} |
| 2585 | } | 2595 | } | ||
| 2586 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var123) | 2596 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var122) |
| 2587 | if templ_7745c5c3_Err != nil { | 2597 | if templ_7745c5c3_Err != nil { | ||
| 2588 | return templ_7745c5c3_Err | 2598 | return templ_7745c5c3_Err | ||
| 2589 | } | 2599 | } | ||
| @@ -2596,12 +2606,12 @@ func mergeMenu(p MRPage) templ.Component { | |||||
| 2596 | if templ_7745c5c3_Err != nil { | 2606 | if templ_7745c5c3_Err != nil { | ||
| 2597 | return templ_7745c5c3_Err | 2607 | return templ_7745c5c3_Err | ||
| 2598 | } | 2608 | } | ||
| 2599 | - | var templ_7745c5c3_Var124 string | 2609 | + | var templ_7745c5c3_Var123 string |
| 2600 | - | templ_7745c5c3_Var124, templ_7745c5c3_Err = templ.ResolveAttributeValue(m.Value) | 2610 | + | templ_7745c5c3_Var123, templ_7745c5c3_Err = templ.ResolveAttributeValue(m.Value) |
| 2601 | if templ_7745c5c3_Err != nil { | 2611 | if templ_7745c5c3_Err != nil { | ||
| 2602 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 508, Col: 24} | 2612 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 514, Col: 24} |
| 2603 | } | 2613 | } | ||
| 2604 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var124) | 2614 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var123) |
| 2605 | if templ_7745c5c3_Err != nil { | 2615 | if templ_7745c5c3_Err != nil { | ||
| 2606 | return templ_7745c5c3_Err | 2616 | return templ_7745c5c3_Err | ||
| 2607 | } | 2617 | } | ||
| @@ -2625,12 +2635,12 @@ func mergeMenu(p MRPage) templ.Component { | |||||
| 2625 | if templ_7745c5c3_Err != nil { | 2635 | if templ_7745c5c3_Err != nil { | ||
| 2626 | return templ_7745c5c3_Err | 2636 | return templ_7745c5c3_Err | ||
| 2627 | } | 2637 | } | ||
| 2628 | - | var templ_7745c5c3_Var125 string | 2638 | + | var templ_7745c5c3_Var124 string |
| 2629 | - | templ_7745c5c3_Var125, templ_7745c5c3_Err = templ.ResolveAttributeValue(m.Reason) | 2639 | + | templ_7745c5c3_Var124, templ_7745c5c3_Err = templ.ResolveAttributeValue(m.Reason) |
| 2630 | if templ_7745c5c3_Err != nil { | 2640 | if templ_7745c5c3_Err != nil { | ||
| 2631 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 511, Col: 25} | 2641 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 517, Col: 25} |
| 2632 | } | 2642 | } | ||
| 2633 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var125) | 2643 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var124) |
| 2634 | if templ_7745c5c3_Err != nil { | 2644 | if templ_7745c5c3_Err != nil { | ||
| 2635 | return templ_7745c5c3_Err | 2645 | return templ_7745c5c3_Err | ||
| 2636 | } | 2646 | } | ||
| @@ -2638,12 +2648,12 @@ func mergeMenu(p MRPage) templ.Component { | |||||
| 2638 | if templ_7745c5c3_Err != nil { | 2648 | if templ_7745c5c3_Err != nil { | ||
| 2639 | return templ_7745c5c3_Err | 2649 | return templ_7745c5c3_Err | ||
| 2640 | } | 2650 | } | ||
| 2641 | - | var templ_7745c5c3_Var126 string | 2651 | + | var templ_7745c5c3_Var125 string |
| 2642 | - | templ_7745c5c3_Var126, templ_7745c5c3_Err = templ.JoinStringErrs(m.Label) | 2652 | + | templ_7745c5c3_Var125, templ_7745c5c3_Err = templ.JoinStringErrs(m.Label) |
| 2643 | if templ_7745c5c3_Err != nil { | 2653 | if templ_7745c5c3_Err != nil { | ||
| 2644 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 515, Col: 17} | 2654 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 521, Col: 17} |
| 2645 | } | 2655 | } | ||
| 2646 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var126)) | 2656 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var125)) |
| 2647 | if templ_7745c5c3_Err != nil { | 2657 | if templ_7745c5c3_Err != nil { | ||
| 2648 | return templ_7745c5c3_Err | 2658 | return templ_7745c5c3_Err | ||
| 2649 | } | 2659 | } | ||
| @@ -2656,12 +2666,12 @@ func mergeMenu(p MRPage) templ.Component { | |||||
| 2656 | if templ_7745c5c3_Err != nil { | 2666 | if templ_7745c5c3_Err != nil { | ||
| 2657 | return templ_7745c5c3_Err | 2667 | return templ_7745c5c3_Err | ||
| 2658 | } | 2668 | } | ||
| 2659 | - | var templ_7745c5c3_Var127 string | 2669 | + | var templ_7745c5c3_Var126 string |
| 2660 | - | templ_7745c5c3_Var127, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(i + 1)) | 2670 | + | templ_7745c5c3_Var126, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(i + 1)) |
| 2661 | if templ_7745c5c3_Err != nil { | 2671 | if templ_7745c5c3_Err != nil { | ||
| 2662 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 517, Col: 46} | 2672 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 523, Col: 46} |
| 2663 | } | 2673 | } | ||
| 2664 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var127)) | 2674 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var126)) |
| 2665 | if templ_7745c5c3_Err != nil { | 2675 | if templ_7745c5c3_Err != nil { | ||
| 2666 | return templ_7745c5c3_Err | 2676 | return templ_7745c5c3_Err | ||
| 2667 | } | 2677 | } | ||
| @@ -2679,96 +2689,67 @@ func mergeMenu(p MRPage) templ.Component { | |||||
| 2679 | if templ_7745c5c3_Err != nil { | 2689 | if templ_7745c5c3_Err != nil { | ||
| 2680 | return templ_7745c5c3_Err | 2690 | return templ_7745c5c3_Err | ||
| 2681 | } | 2691 | } | ||
| 2682 | - | if p.Box.Signed { | |||
| 2683 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 253, "<p class=\"d-note\" id=\"mr-signing\">squash and merge commits are signed with ermite's own key (generated on first start). ") | |||
| 2684 | - | if templ_7745c5c3_Err != nil { | |||
| 2685 | - | return templ_7745c5c3_Err | |||
| 2686 | - | } | |||
| 2687 | - | if p.Box.Fingerprint != "" { | |||
| 2688 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 254, "fingerprint <code>") | |||
| 2689 | - | if templ_7745c5c3_Err != nil { | |||
| 2690 | - | return templ_7745c5c3_Err | |||
| 2691 | - | } | |||
| 2692 | - | var templ_7745c5c3_Var128 string | |||
| 2693 | - | templ_7745c5c3_Var128, templ_7745c5c3_Err = templ.JoinStringErrs(p.Box.Fingerprint) | |||
| 2694 | - | if templ_7745c5c3_Err != nil { | |||
| 2695 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 526, Col: 45} | |||
| 2696 | - | } | |||
| 2697 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var128)) | |||
| 2698 | - | if templ_7745c5c3_Err != nil { | |||
| 2699 | - | return templ_7745c5c3_Err | |||
| 2700 | - | } | |||
| 2701 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 255, "</code> ") | |||
| 2702 | - | if templ_7745c5c3_Err != nil { | |||
| 2703 | - | return templ_7745c5c3_Err | |||
| 2704 | - | } | |||
| 2705 | - | } | |||
| 2706 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 256, "<code>ermite signing-key show</code> prints it.</p>") | |||
| 2707 | - | if templ_7745c5c3_Err != nil { | |||
| 2708 | - | return templ_7745c5c3_Err | |||
| 2709 | - | } | |||
| 2710 | - | } | |||
| 2711 | if p.Box.CanDeleteBranch { | 2692 | if p.Box.CanDeleteBranch { | ||
| 2712 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 257, "<label class=\"d-check\"><input type=\"checkbox\" name=\"delete_branch\" value=\"1\"> delete ") | 2693 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 253, "<label class=\"d-check\"><input type=\"checkbox\" name=\"delete_branch\" value=\"1\"> delete ") |
| 2713 | if templ_7745c5c3_Err != nil { | 2694 | if templ_7745c5c3_Err != nil { | ||
| 2714 | return templ_7745c5c3_Err | 2695 | return templ_7745c5c3_Err | ||
| 2715 | } | 2696 | } | ||
| 2716 | - | var templ_7745c5c3_Var129 string | 2697 | + | var templ_7745c5c3_Var127 string |
| 2717 | - | templ_7745c5c3_Var129, templ_7745c5c3_Err = templ.JoinStringErrs(p.Source) | 2698 | + | templ_7745c5c3_Var127, templ_7745c5c3_Err = templ.JoinStringErrs(p.Source) |
| 2718 | if templ_7745c5c3_Err != nil { | 2699 | if templ_7745c5c3_Err != nil { | ||
| 2719 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 532, Col: 102} | 2700 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 529, Col: 102} |
| 2720 | } | 2701 | } | ||
| 2721 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var129)) | 2702 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var127)) |
| 2722 | if templ_7745c5c3_Err != nil { | 2703 | if templ_7745c5c3_Err != nil { | ||
| 2723 | return templ_7745c5c3_Err | 2704 | return templ_7745c5c3_Err | ||
| 2724 | } | 2705 | } | ||
| 2725 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 258, " after the merge <kbd aria-hidden=\"true\">D</kbd></label>") | 2706 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 254, " after the merge <kbd aria-hidden=\"true\">D</kbd></label>") |
| 2726 | if templ_7745c5c3_Err != nil { | 2707 | if templ_7745c5c3_Err != nil { | ||
| 2727 | return templ_7745c5c3_Err | 2708 | return templ_7745c5c3_Err | ||
| 2728 | } | 2709 | } | ||
| 2729 | } | 2710 | } | ||
| 2730 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 259, "<div class=\"d-btns\"><button type=\"submit\" class=\"btn primary\" data-default") | 2711 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 255, "<div class=\"d-btns\"><button type=\"submit\" class=\"btn primary\" data-default") |
| 2731 | if templ_7745c5c3_Err != nil { | 2712 | if templ_7745c5c3_Err != nil { | ||
| 2732 | return templ_7745c5c3_Err | 2713 | return templ_7745c5c3_Err | ||
| 2733 | } | 2714 | } | ||
| 2734 | if !p.Box.CanMerge() { | 2715 | if !p.Box.CanMerge() { | ||
| 2735 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 260, " disabled") | 2716 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 256, " disabled") |
| 2736 | if templ_7745c5c3_Err != nil { | 2717 | if templ_7745c5c3_Err != nil { | ||
| 2737 | return templ_7745c5c3_Err | 2718 | return templ_7745c5c3_Err | ||
| 2738 | } | 2719 | } | ||
| 2739 | } | 2720 | } | ||
| 2740 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 261, " title=\"") | 2721 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 257, " title=\"") |
| 2741 | if templ_7745c5c3_Err != nil { | 2722 | if templ_7745c5c3_Err != nil { | ||
| 2742 | return templ_7745c5c3_Err | 2723 | return templ_7745c5c3_Err | ||
| 2743 | } | 2724 | } | ||
| 2744 | - | var templ_7745c5c3_Var130 string | 2725 | + | var templ_7745c5c3_Var128 string |
| 2745 | - | templ_7745c5c3_Var130, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Box.MergeTitle()) | 2726 | + | templ_7745c5c3_Var128, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Box.MergeTitle()) |
| 2746 | if templ_7745c5c3_Err != nil { | 2727 | if templ_7745c5c3_Err != nil { | ||
| 2747 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 540, Col: 33} | 2728 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 537, Col: 33} |
| 2748 | } | 2729 | } | ||
| 2749 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var130) | 2730 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var128) |
| 2750 | if templ_7745c5c3_Err != nil { | 2731 | if templ_7745c5c3_Err != nil { | ||
| 2751 | return templ_7745c5c3_Err | 2732 | return templ_7745c5c3_Err | ||
| 2752 | } | 2733 | } | ||
| 2753 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 262, "\" :disabled=\"!this.form.querySelector('input[name=mode]:checked:not(:disabled)')\" :title=\"(this.form.querySelector('input[name=mode]:checked') || {}).title || ''\">Merge into ") | 2734 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 258, "\" :disabled=\"!this.form.querySelector('input[name=mode]:checked:not(:disabled)')\" :title=\"(this.form.querySelector('input[name=mode]:checked') || {}).title || ''\">Merge into ") |
| 2754 | if templ_7745c5c3_Err != nil { | 2735 | if templ_7745c5c3_Err != nil { | ||
| 2755 | return templ_7745c5c3_Err | 2736 | return templ_7745c5c3_Err | ||
| 2756 | } | 2737 | } | ||
| 2757 | - | var templ_7745c5c3_Var131 string | 2738 | + | var templ_7745c5c3_Var129 string |
| 2758 | - | templ_7745c5c3_Var131, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | 2739 | + | templ_7745c5c3_Var129, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) |
| 2759 | if templ_7745c5c3_Err != nil { | 2740 | if templ_7745c5c3_Err != nil { | ||
| 2760 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 543, Col: 28} | 2741 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 540, Col: 28} |
| 2761 | } | 2742 | } | ||
| 2762 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var131)) | 2743 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var129)) |
| 2763 | if templ_7745c5c3_Err != nil { | 2744 | if templ_7745c5c3_Err != nil { | ||
| 2764 | return templ_7745c5c3_Err | 2745 | return templ_7745c5c3_Err | ||
| 2765 | } | 2746 | } | ||
| 2766 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 263, "</button></div></form>") | 2747 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 259, "</button></div></form>") |
| 2767 | if templ_7745c5c3_Err != nil { | 2748 | if templ_7745c5c3_Err != nil { | ||
| 2768 | return templ_7745c5c3_Err | 2749 | return templ_7745c5c3_Err | ||
| 2769 | } | 2750 | } | ||
| 2770 | } | 2751 | } | ||
| 2771 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 264, "</div></details>") | 2752 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 260, "</div></details>") |
| 2772 | if templ_7745c5c3_Err != nil { | 2753 | if templ_7745c5c3_Err != nil { | ||
| 2773 | return templ_7745c5c3_Err | 2754 | return templ_7745c5c3_Err | ||
| 2774 | } | 2755 | } | ||
| @@ -2794,182 +2775,182 @@ func MRMergeability(v MergeabilityView) templ.Component { | |||||
| 2794 | }() | 2775 | }() | ||
| 2795 | } | 2776 | } | ||
| 2796 | ctx = templ.InitializeContext(ctx) | 2777 | ctx = templ.InitializeContext(ctx) | ||
| 2797 | - | templ_7745c5c3_Var132 := templ.GetChildren(ctx) | 2778 | + | templ_7745c5c3_Var130 := templ.GetChildren(ctx) |
| 2798 | - | if templ_7745c5c3_Var132 == nil { | 2779 | + | if templ_7745c5c3_Var130 == nil { |
| 2799 | - | templ_7745c5c3_Var132 = templ.NopComponent | 2780 | + | templ_7745c5c3_Var130 = templ.NopComponent |
| 2800 | } | 2781 | } | ||
| 2801 | ctx = templ.ClearChildren(ctx) | 2782 | ctx = templ.ClearChildren(ctx) | ||
| 2802 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 265, "<span data-mergeability data-state=\"") | 2783 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 261, "<span data-mergeability data-state=\"") |
| 2803 | if templ_7745c5c3_Err != nil { | 2784 | if templ_7745c5c3_Err != nil { | ||
| 2804 | return templ_7745c5c3_Err | 2785 | return templ_7745c5c3_Err | ||
| 2805 | } | 2786 | } | ||
| 2806 | - | var templ_7745c5c3_Var133 string | 2787 | + | var templ_7745c5c3_Var131 string |
| 2807 | - | templ_7745c5c3_Var133, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.State) | 2788 | + | templ_7745c5c3_Var131, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.State) |
| 2808 | if templ_7745c5c3_Err != nil { | 2789 | if templ_7745c5c3_Err != nil { | ||
| 2809 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 556, Col: 22} | 2790 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 553, Col: 22} |
| 2810 | } | 2791 | } | ||
| 2811 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var133) | 2792 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var131) |
| 2812 | if templ_7745c5c3_Err != nil { | 2793 | if templ_7745c5c3_Err != nil { | ||
| 2813 | return templ_7745c5c3_Err | 2794 | return templ_7745c5c3_Err | ||
| 2814 | } | 2795 | } | ||
| 2815 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 266, "\" data-ff-ok=\"") | 2796 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 262, "\" data-ff-ok=\"") |
| 2816 | if templ_7745c5c3_Err != nil { | 2797 | if templ_7745c5c3_Err != nil { | ||
| 2817 | return templ_7745c5c3_Err | 2798 | return templ_7745c5c3_Err | ||
| 2818 | } | 2799 | } | ||
| 2819 | - | var templ_7745c5c3_Var134 string | 2800 | + | var templ_7745c5c3_Var132 string |
| 2820 | - | templ_7745c5c3_Var134, templ_7745c5c3_Err = templ.ResolveAttributeValue(strconv.FormatBool(v.FFOk)) | 2801 | + | templ_7745c5c3_Var132, templ_7745c5c3_Err = templ.ResolveAttributeValue(strconv.FormatBool(v.FFOk)) |
| 2821 | if templ_7745c5c3_Err != nil { | 2802 | if templ_7745c5c3_Err != nil { | ||
| 2822 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 557, Col: 41} | 2803 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 554, Col: 41} |
| 2823 | } | 2804 | } | ||
| 2824 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var134) | 2805 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var132) |
| 2825 | if templ_7745c5c3_Err != nil { | 2806 | if templ_7745c5c3_Err != nil { | ||
| 2826 | return templ_7745c5c3_Err | 2807 | return templ_7745c5c3_Err | ||
| 2827 | } | 2808 | } | ||
| 2828 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 267, "\" data-merge-ok=\"") | 2809 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 263, "\" data-merge-ok=\"") |
| 2829 | if templ_7745c5c3_Err != nil { | 2810 | if templ_7745c5c3_Err != nil { | ||
| 2830 | return templ_7745c5c3_Err | 2811 | return templ_7745c5c3_Err | ||
| 2831 | } | 2812 | } | ||
| 2832 | - | var templ_7745c5c3_Var135 string | 2813 | + | var templ_7745c5c3_Var133 string |
| 2833 | - | templ_7745c5c3_Var135, templ_7745c5c3_Err = templ.ResolveAttributeValue(strconv.FormatBool(v.MergeOk)) | 2814 | + | templ_7745c5c3_Var133, templ_7745c5c3_Err = templ.ResolveAttributeValue(strconv.FormatBool(v.MergeOk)) |
| 2834 | if templ_7745c5c3_Err != nil { | 2815 | if templ_7745c5c3_Err != nil { | ||
| 2835 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 558, Col: 47} | 2816 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 555, Col: 47} |
| 2836 | } | 2817 | } | ||
| 2837 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var135) | 2818 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var133) |
| 2838 | if templ_7745c5c3_Err != nil { | 2819 | if templ_7745c5c3_Err != nil { | ||
| 2839 | return templ_7745c5c3_Err | 2820 | return templ_7745c5c3_Err | ||
| 2840 | } | 2821 | } | ||
| 2841 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 268, "\" data-ff-reason=\"") | 2822 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 264, "\" data-ff-reason=\"") |
| 2842 | if templ_7745c5c3_Err != nil { | 2823 | if templ_7745c5c3_Err != nil { | ||
| 2843 | return templ_7745c5c3_Err | 2824 | return templ_7745c5c3_Err | ||
| 2844 | } | 2825 | } | ||
| 2845 | - | var templ_7745c5c3_Var136 string | 2826 | + | var templ_7745c5c3_Var134 string |
| 2846 | - | templ_7745c5c3_Var136, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.FFReason) | 2827 | + | templ_7745c5c3_Var134, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.FFReason) |
| 2847 | if templ_7745c5c3_Err != nil { | 2828 | if templ_7745c5c3_Err != nil { | ||
| 2848 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 559, Col: 29} | 2829 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 556, Col: 29} |
| 2849 | } | 2830 | } | ||
| 2850 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var136) | 2831 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var134) |
| 2851 | if templ_7745c5c3_Err != nil { | 2832 | if templ_7745c5c3_Err != nil { | ||
| 2852 | return templ_7745c5c3_Err | 2833 | return templ_7745c5c3_Err | ||
| 2853 | } | 2834 | } | ||
| 2854 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 269, "\" data-merge-reason=\"") | 2835 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 265, "\" data-merge-reason=\"") |
| 2855 | if templ_7745c5c3_Err != nil { | 2836 | if templ_7745c5c3_Err != nil { | ||
| 2856 | return templ_7745c5c3_Err | 2837 | return templ_7745c5c3_Err | ||
| 2857 | } | 2838 | } | ||
| 2858 | - | var templ_7745c5c3_Var137 string | 2839 | + | var templ_7745c5c3_Var135 string |
| 2859 | - | templ_7745c5c3_Var137, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.MergeReason) | 2840 | + | templ_7745c5c3_Var135, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.MergeReason) |
| 2860 | if templ_7745c5c3_Err != nil { | 2841 | if templ_7745c5c3_Err != nil { | ||
| 2861 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 560, Col: 35} | 2842 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 557, Col: 35} |
| 2862 | } | 2843 | } | ||
| 2863 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var137) | 2844 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var135) |
| 2864 | if templ_7745c5c3_Err != nil { | 2845 | if templ_7745c5c3_Err != nil { | ||
| 2865 | return templ_7745c5c3_Err | 2846 | return templ_7745c5c3_Err | ||
| 2866 | } | 2847 | } | ||
| 2867 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 270, "\"><span class=\"badge\" data-state=\"") | 2848 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 266, "\"><span class=\"badge\" data-state=\"") |
| 2868 | if templ_7745c5c3_Err != nil { | 2849 | if templ_7745c5c3_Err != nil { | ||
| 2869 | return templ_7745c5c3_Err | 2850 | return templ_7745c5c3_Err | ||
| 2870 | } | 2851 | } | ||
| 2871 | - | var templ_7745c5c3_Var138 string | 2852 | + | var templ_7745c5c3_Var136 string |
| 2872 | - | templ_7745c5c3_Var138, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.State) | 2853 | + | templ_7745c5c3_Var136, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.State) |
| 2873 | if templ_7745c5c3_Err != nil { | 2854 | if templ_7745c5c3_Err != nil { | ||
| 2874 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 562, Col: 42} | 2855 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 559, Col: 42} |
| 2875 | } | 2856 | } | ||
| 2876 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var138) | 2857 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var136) |
| 2877 | if templ_7745c5c3_Err != nil { | 2858 | if templ_7745c5c3_Err != nil { | ||
| 2878 | return templ_7745c5c3_Err | 2859 | return templ_7745c5c3_Err | ||
| 2879 | } | 2860 | } | ||
| 2880 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 271, "\">") | 2861 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 267, "\">") |
| 2881 | if templ_7745c5c3_Err != nil { | 2862 | if templ_7745c5c3_Err != nil { | ||
| 2882 | return templ_7745c5c3_Err | 2863 | return templ_7745c5c3_Err | ||
| 2883 | } | 2864 | } | ||
| 2884 | - | var templ_7745c5c3_Var139 string | 2865 | + | var templ_7745c5c3_Var137 string |
| 2885 | - | templ_7745c5c3_Var139, templ_7745c5c3_Err = templ.JoinStringErrs(v.Label) | 2866 | + | templ_7745c5c3_Var137, templ_7745c5c3_Err = templ.JoinStringErrs(v.Label) |
| 2886 | if templ_7745c5c3_Err != nil { | 2867 | if templ_7745c5c3_Err != nil { | ||
| 2887 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 562, Col: 54} | 2868 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 559, Col: 54} |
| 2888 | } | 2869 | } | ||
| 2889 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var139)) | 2870 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var137)) |
| 2890 | if templ_7745c5c3_Err != nil { | 2871 | if templ_7745c5c3_Err != nil { | ||
| 2891 | return templ_7745c5c3_Err | 2872 | return templ_7745c5c3_Err | ||
| 2892 | } | 2873 | } | ||
| 2893 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 272, "</span> ") | 2874 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 268, "</span> ") |
| 2894 | if templ_7745c5c3_Err != nil { | 2875 | if templ_7745c5c3_Err != nil { | ||
| 2895 | return templ_7745c5c3_Err | 2876 | return templ_7745c5c3_Err | ||
| 2896 | } | 2877 | } | ||
| 2897 | if v.Detail != "" { | 2878 | if v.Detail != "" { | ||
| 2898 | - | var templ_7745c5c3_Var140 string | 2879 | + | var templ_7745c5c3_Var138 string |
| 2899 | - | templ_7745c5c3_Var140, templ_7745c5c3_Err = templ.JoinStringErrs(" ") | 2880 | + | templ_7745c5c3_Var138, templ_7745c5c3_Err = templ.JoinStringErrs(" ") |
| 2900 | if templ_7745c5c3_Err != nil { | 2881 | if templ_7745c5c3_Err != nil { | ||
| 2901 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 564, Col: 8} | 2882 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 561, Col: 8} |
| 2902 | } | 2883 | } | ||
| 2903 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var140)) | 2884 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var138)) |
| 2904 | if templ_7745c5c3_Err != nil { | 2885 | if templ_7745c5c3_Err != nil { | ||
| 2905 | return templ_7745c5c3_Err | 2886 | return templ_7745c5c3_Err | ||
| 2906 | } | 2887 | } | ||
| 2907 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 273, "<span class=\"dim\">") | 2888 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 269, "<span class=\"dim\">") |
| 2908 | if templ_7745c5c3_Err != nil { | 2889 | if templ_7745c5c3_Err != nil { | ||
| 2909 | return templ_7745c5c3_Err | 2890 | return templ_7745c5c3_Err | ||
| 2910 | } | 2891 | } | ||
| 2911 | - | var templ_7745c5c3_Var141 string | 2892 | + | var templ_7745c5c3_Var139 string |
| 2912 | - | templ_7745c5c3_Var141, templ_7745c5c3_Err = templ.JoinStringErrs(v.Detail) | 2893 | + | templ_7745c5c3_Var139, templ_7745c5c3_Err = templ.JoinStringErrs(v.Detail) |
| 2913 | if templ_7745c5c3_Err != nil { | 2894 | if templ_7745c5c3_Err != nil { | ||
| 2914 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 564, Col: 38} | 2895 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 561, Col: 38} |
| 2915 | } | 2896 | } | ||
| 2916 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var141)) | 2897 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var139)) |
| 2917 | if templ_7745c5c3_Err != nil { | 2898 | if templ_7745c5c3_Err != nil { | ||
| 2918 | return templ_7745c5c3_Err | 2899 | return templ_7745c5c3_Err | ||
| 2919 | } | 2900 | } | ||
| 2920 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 274, "</span>") | 2901 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 270, "</span>") |
| 2921 | if templ_7745c5c3_Err != nil { | 2902 | if templ_7745c5c3_Err != nil { | ||
| 2922 | return templ_7745c5c3_Err | 2903 | return templ_7745c5c3_Err | ||
| 2923 | } | 2904 | } | ||
| 2924 | } | 2905 | } | ||
| 2925 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 275, "</span> ") | 2906 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 271, "</span> ") |
| 2926 | if templ_7745c5c3_Err != nil { | 2907 | if templ_7745c5c3_Err != nil { | ||
| 2927 | return templ_7745c5c3_Err | 2908 | return templ_7745c5c3_Err | ||
| 2928 | } | 2909 | } | ||
| 2929 | if len(v.Paths) > 0 { | 2910 | if len(v.Paths) > 0 { | ||
| 2930 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 276, "<ul class=\"mg-paths\" aria-label=\"conflicting files\">") | 2911 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 272, "<ul class=\"mg-paths\" aria-label=\"conflicting files\">") |
| 2931 | if templ_7745c5c3_Err != nil { | 2912 | if templ_7745c5c3_Err != nil { | ||
| 2932 | return templ_7745c5c3_Err | 2913 | return templ_7745c5c3_Err | ||
| 2933 | } | 2914 | } | ||
| 2934 | for _, path := range v.Paths { | 2915 | for _, path := range v.Paths { | ||
| 2935 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 277, "<li><code>") | 2916 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 273, "<li><code>") |
| 2936 | if templ_7745c5c3_Err != nil { | 2917 | if templ_7745c5c3_Err != nil { | ||
| 2937 | return templ_7745c5c3_Err | 2918 | return templ_7745c5c3_Err | ||
| 2938 | } | 2919 | } | ||
| 2939 | - | var templ_7745c5c3_Var142 string | 2920 | + | var templ_7745c5c3_Var140 string |
| 2940 | - | templ_7745c5c3_Var142, templ_7745c5c3_Err = templ.JoinStringErrs(path) | 2921 | + | templ_7745c5c3_Var140, templ_7745c5c3_Err = templ.JoinStringErrs(path) |
| 2941 | if templ_7745c5c3_Err != nil { | 2922 | if templ_7745c5c3_Err != nil { | ||
| 2942 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 570, Col: 20} | 2923 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 567, Col: 20} |
| 2943 | } | 2924 | } | ||
| 2944 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var142)) | 2925 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var140)) |
| 2945 | if templ_7745c5c3_Err != nil { | 2926 | if templ_7745c5c3_Err != nil { | ||
| 2946 | return templ_7745c5c3_Err | 2927 | return templ_7745c5c3_Err | ||
| 2947 | } | 2928 | } | ||
| 2948 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 278, "</code></li>") | 2929 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 274, "</code></li>") |
| 2949 | if templ_7745c5c3_Err != nil { | 2930 | if templ_7745c5c3_Err != nil { | ||
| 2950 | return templ_7745c5c3_Err | 2931 | return templ_7745c5c3_Err | ||
| 2951 | } | 2932 | } | ||
| 2952 | } | 2933 | } | ||
| 2953 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 279, "</ul>") | 2934 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 275, "</ul>") |
| 2954 | if templ_7745c5c3_Err != nil { | 2935 | if templ_7745c5c3_Err != nil { | ||
| 2955 | return templ_7745c5c3_Err | 2936 | return templ_7745c5c3_Err | ||
| 2956 | } | 2937 | } | ||
| 2957 | } | 2938 | } | ||
| 2958 | if v.PathsNote != "" { | 2939 | if v.PathsNote != "" { | ||
| 2959 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 280, "<p class=\"dim\">") | 2940 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 276, "<p class=\"dim\">") |
| 2960 | if templ_7745c5c3_Err != nil { | 2941 | if templ_7745c5c3_Err != nil { | ||
| 2961 | return templ_7745c5c3_Err | 2942 | return templ_7745c5c3_Err | ||
| 2962 | } | 2943 | } | ||
| 2963 | - | var templ_7745c5c3_Var143 string | 2944 | + | var templ_7745c5c3_Var141 string |
| 2964 | - | templ_7745c5c3_Var143, templ_7745c5c3_Err = templ.JoinStringErrs(v.PathsNote) | 2945 | + | templ_7745c5c3_Var141, templ_7745c5c3_Err = templ.JoinStringErrs(v.PathsNote) |
| 2965 | if templ_7745c5c3_Err != nil { | 2946 | if templ_7745c5c3_Err != nil { | ||
| 2966 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 575, Col: 30} | 2947 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 572, Col: 30} |
| 2967 | } | 2948 | } | ||
| 2968 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var143)) | 2949 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var141)) |
| 2969 | if templ_7745c5c3_Err != nil { | 2950 | if templ_7745c5c3_Err != nil { | ||
| 2970 | return templ_7745c5c3_Err | 2951 | return templ_7745c5c3_Err | ||
| 2971 | } | 2952 | } | ||
| 2972 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 281, "</p>") | 2953 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 277, "</p>") |
| 2973 | if templ_7745c5c3_Err != nil { | 2954 | if templ_7745c5c3_Err != nil { | ||
| 2974 | return templ_7745c5c3_Err | 2955 | return templ_7745c5c3_Err | ||
| 2975 | } | 2956 | } | ||
| @@ -2996,12 +2977,12 @@ func mrMergeabilitySlot(v MergeabilityView) templ.Component { | |||||
| 2996 | }() | 2977 | }() | ||
| 2997 | } | 2978 | } | ||
| 2998 | ctx = templ.InitializeContext(ctx) | 2979 | ctx = templ.InitializeContext(ctx) | ||
| 2999 | - | templ_7745c5c3_Var144 := templ.GetChildren(ctx) | 2980 | + | templ_7745c5c3_Var142 := templ.GetChildren(ctx) |
| 3000 | - | if templ_7745c5c3_Var144 == nil { | 2981 | + | if templ_7745c5c3_Var142 == nil { |
| 3001 | - | templ_7745c5c3_Var144 = templ.NopComponent | 2982 | + | templ_7745c5c3_Var142 = templ.NopComponent |
| 3002 | } | 2983 | } | ||
| 3003 | ctx = templ.ClearChildren(ctx) | 2984 | ctx = templ.ClearChildren(ctx) | ||
| 3004 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 282, "<div id=\"mr-mergeability\" class=\"live-slot\" role=\"status\" data-slot>") | 2985 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 278, "<div id=\"mr-mergeability\" class=\"live-slot\" role=\"status\" data-slot>") |
| 3005 | if templ_7745c5c3_Err != nil { | 2986 | if templ_7745c5c3_Err != nil { | ||
| 3006 | return templ_7745c5c3_Err | 2987 | return templ_7745c5c3_Err | ||
| 3007 | } | 2988 | } | ||
| @@ -3009,7 +2990,7 @@ func mrMergeabilitySlot(v MergeabilityView) templ.Component { | |||||
| 3009 | if templ_7745c5c3_Err != nil { | 2990 | if templ_7745c5c3_Err != nil { | ||
| 3010 | return templ_7745c5c3_Err | 2991 | return templ_7745c5c3_Err | ||
| 3011 | } | 2992 | } | ||
| 3012 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 283, "</div>") | 2993 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 279, "</div>") |
| 3013 | if templ_7745c5c3_Err != nil { | 2994 | if templ_7745c5c3_Err != nil { | ||
| 3014 | return templ_7745c5c3_Err | 2995 | return templ_7745c5c3_Err | ||
| 3015 | } | 2996 | } | ||
| @@ -3034,9 +3015,9 @@ func MRMergeabilityFragment(v MergeabilityView) templ.Component { | |||||
| 3034 | }() | 3015 | }() | ||
| 3035 | } | 3016 | } | ||
| 3036 | ctx = templ.InitializeContext(ctx) | 3017 | ctx = templ.InitializeContext(ctx) | ||
| 3037 | - | templ_7745c5c3_Var145 := templ.GetChildren(ctx) | 3018 | + | templ_7745c5c3_Var143 := templ.GetChildren(ctx) |
| 3038 | - | if templ_7745c5c3_Var145 == nil { | 3019 | + | if templ_7745c5c3_Var143 == nil { |
| 3039 | - | templ_7745c5c3_Var145 = templ.NopComponent | 3020 | + | templ_7745c5c3_Var143 = templ.NopComponent |
| 3040 | } | 3021 | } | ||
| 3041 | ctx = templ.ClearChildren(ctx) | 3022 | ctx = templ.ClearChildren(ctx) | ||
| 3042 | templ_7745c5c3_Err = mrMergeabilitySlot(v).Render(ctx, templ_7745c5c3_Buffer) | 3023 | templ_7745c5c3_Err = mrMergeabilitySlot(v).Render(ctx, templ_7745c5c3_Buffer) | ||
| @@ -3047,8 +3028,8 @@ func MRMergeabilityFragment(v MergeabilityView) templ.Component { | |||||
| 3047 | }) | 3028 | }) | ||
| 3048 | } | 3029 | } | ||
| 3049 | 3030 | ||||
| 3050 | - | // moreMenu is what else the owner does with an open request: mark the head | 3031 | + | // moreMenu shows read-only settings to every viewer, and keeps owner actions |
| 3051 | - | // read, close it, merge it from a terminal. | 3032 | + | // behind the same merge-box permission as before. |
| 3052 | func moreMenu(p MRPage) templ.Component { | 3033 | func moreMenu(p MRPage) templ.Component { | ||
| 3053 | return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { | 3034 | return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { | ||
| 3054 | templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context | 3035 | templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context | ||
| @@ -3065,79 +3046,142 @@ func moreMenu(p MRPage) templ.Component { | |||||
| 3065 | }() | 3046 | }() | ||
| 3066 | } | 3047 | } | ||
| 3067 | ctx = templ.InitializeContext(ctx) | 3048 | ctx = templ.InitializeContext(ctx) | ||
| 3068 | - | templ_7745c5c3_Var146 := templ.GetChildren(ctx) | 3049 | + | templ_7745c5c3_Var144 := templ.GetChildren(ctx) |
| 3069 | - | if templ_7745c5c3_Var146 == nil { | 3050 | + | if templ_7745c5c3_Var144 == nil { |
| 3070 | - | templ_7745c5c3_Var146 = templ.NopComponent | 3051 | + | templ_7745c5c3_Var144 = templ.NopComponent |
| 3071 | } | 3052 | } | ||
| 3072 | ctx = templ.ClearChildren(ctx) | 3053 | ctx = templ.ClearChildren(ctx) | ||
| 3073 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 284, "<details class=\"menu omenu\"><summary class=\"btn icon\" aria-label=\"More actions\" title=\"more actions\">⋯</summary><div class=\"menu-pop\" role=\"group\" aria-label=\"More actions\">") | 3054 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 280, "<details class=\"menu omenu\"><summary class=\"btn icon\" aria-label=\"More actions\" title=\"more actions\">⋯</summary><div class=\"menu-pop\" role=\"group\" aria-label=\"More actions\"><section class=\"merge-settings\"><h2>Merge settings</h2><dl class=\"kv\"><dt>modes</dt><dd>") |
| 3074 | if templ_7745c5c3_Err != nil { | 3055 | if templ_7745c5c3_Err != nil { | ||
| 3075 | return templ_7745c5c3_Err | 3056 | return templ_7745c5c3_Err | ||
| 3076 | } | 3057 | } | ||
| 3077 | - | if p.Box.CanMarkRead { | 3058 | + | var templ_7745c5c3_Var145 string |
| 3078 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 285, "<form method=\"post\" action=\"") | 3059 | + | templ_7745c5c3_Var145, templ_7745c5c3_Err = templ.JoinStringErrs(strings.Join(p.Modes, ", ")) |
| 3060 | + | if templ_7745c5c3_Err != nil { | |||
| 3061 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 599, Col: 38} | |||
| 3062 | + | } | |||
| 3063 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var145)) | |||
| 3064 | + | if templ_7745c5c3_Err != nil { | |||
| 3065 | + | return templ_7745c5c3_Err | |||
| 3066 | + | } | |||
| 3067 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 281, "</dd><dt>checks</dt><dd>") | |||
| 3068 | + | if templ_7745c5c3_Err != nil { | |||
| 3069 | + | return templ_7745c5c3_Err | |||
| 3070 | + | } | |||
| 3071 | + | if p.ChecksBlock { | |||
| 3072 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 282, "failing ones block the merge") | |||
| 3079 | if templ_7745c5c3_Err != nil { | 3073 | if templ_7745c5c3_Err != nil { | ||
| 3080 | return templ_7745c5c3_Err | 3074 | return templ_7745c5c3_Err | ||
| 3081 | } | 3075 | } | ||
| 3082 | - | var templ_7745c5c3_Var147 templ.SafeURL | 3076 | + | } else { |
| 3083 | - | templ_7745c5c3_Var147, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.ReadAction)) | 3077 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 283, "do not block the merge") |
| 3084 | - | if templ_7745c5c3_Err != nil { | |||
| 3085 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 599, Col: 64} | |||
| 3086 | - | } | |||
| 3087 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var147)) | |||
| 3088 | if templ_7745c5c3_Err != nil { | 3078 | if templ_7745c5c3_Err != nil { | ||
| 3089 | return templ_7745c5c3_Err | 3079 | return templ_7745c5c3_Err | ||
| 3090 | } | 3080 | } | ||
| 3091 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 286, "\"><input type=\"hidden\" name=\"head_id\" value=\"") | 3081 | + | } |
| 3082 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 284, "</dd></dl></section>") | |||
| 3083 | + | if templ_7745c5c3_Err != nil { | |||
| 3084 | + | return templ_7745c5c3_Err | |||
| 3085 | + | } | |||
| 3086 | + | if p.Box != nil { | |||
| 3087 | + | if p.Box.Signed { | |||
| 3088 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 285, "<p class=\"d-note\" id=\"mr-signing\">squash and merge commits are signed with ermite's own key (generated on first start). ") | |||
| 3089 | + | if templ_7745c5c3_Err != nil { | |||
| 3090 | + | return templ_7745c5c3_Err | |||
| 3091 | + | } | |||
| 3092 | + | if p.Box.Fingerprint != "" { | |||
| 3093 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 286, "fingerprint <code>") | |||
| 3094 | + | if templ_7745c5c3_Err != nil { | |||
| 3095 | + | return templ_7745c5c3_Err | |||
| 3096 | + | } | |||
| 3097 | + | var templ_7745c5c3_Var146 string | |||
| 3098 | + | templ_7745c5c3_Var146, templ_7745c5c3_Err = templ.JoinStringErrs(p.Box.Fingerprint) | |||
| 3099 | + | if templ_7745c5c3_Err != nil { | |||
| 3100 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 615, Col: 44} | |||
| 3101 | + | } | |||
| 3102 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var146)) | |||
| 3103 | + | if templ_7745c5c3_Err != nil { | |||
| 3104 | + | return templ_7745c5c3_Err | |||
| 3105 | + | } | |||
| 3106 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 287, "</code> ") | |||
| 3107 | + | if templ_7745c5c3_Err != nil { | |||
| 3108 | + | return templ_7745c5c3_Err | |||
| 3109 | + | } | |||
| 3110 | + | } | |||
| 3111 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 288, "<code>ermite signing-key show</code> prints it.</p>") | |||
| 3112 | + | if templ_7745c5c3_Err != nil { | |||
| 3113 | + | return templ_7745c5c3_Err | |||
| 3114 | + | } | |||
| 3115 | + | } | |||
| 3116 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 289, " ") | |||
| 3092 | if templ_7745c5c3_Err != nil { | 3117 | if templ_7745c5c3_Err != nil { | ||
| 3093 | return templ_7745c5c3_Err | 3118 | return templ_7745c5c3_Err | ||
| 3094 | } | 3119 | } | ||
| 3095 | - | var templ_7745c5c3_Var148 string | 3120 | + | if p.Box.CanMarkRead { |
| 3096 | - | templ_7745c5c3_Var148, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Box.Head) | 3121 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 290, "<form method=\"post\" action=\"") |
| 3097 | - | if templ_7745c5c3_Err != nil { | 3122 | + | if templ_7745c5c3_Err != nil { |
| 3098 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 600, Col: 59} | 3123 | + | return templ_7745c5c3_Err |
| 3124 | + | } | |||
| 3125 | + | var templ_7745c5c3_Var147 templ.SafeURL | |||
| 3126 | + | templ_7745c5c3_Var147, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.ReadAction)) | |||
| 3127 | + | if templ_7745c5c3_Err != nil { | |||
| 3128 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 621, Col: 65} | |||
| 3129 | + | } | |||
| 3130 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var147)) | |||
| 3131 | + | if templ_7745c5c3_Err != nil { | |||
| 3132 | + | return templ_7745c5c3_Err | |||
| 3133 | + | } | |||
| 3134 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 291, "\"><input type=\"hidden\" name=\"head_id\" value=\"") | |||
| 3135 | + | if templ_7745c5c3_Err != nil { | |||
| 3136 | + | return templ_7745c5c3_Err | |||
| 3137 | + | } | |||
| 3138 | + | var templ_7745c5c3_Var148 string | |||
| 3139 | + | templ_7745c5c3_Var148, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Box.Head) | |||
| 3140 | + | if templ_7745c5c3_Err != nil { | |||
| 3141 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 622, Col: 60} | |||
| 3142 | + | } | |||
| 3143 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var148) | |||
| 3144 | + | if templ_7745c5c3_Err != nil { | |||
| 3145 | + | return templ_7745c5c3_Err | |||
| 3146 | + | } | |||
| 3147 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 292, "\"> <button type=\"submit\" title=\"the next visit can show only what changed after this head\" class=\"btn\" aria-keyshortcuts=\"Shift+R\" data-read>Mark read <kbd aria-hidden=\"true\">R</kbd></button></form>") | |||
| 3148 | + | if templ_7745c5c3_Err != nil { | |||
| 3149 | + | return templ_7745c5c3_Err | |||
| 3150 | + | } | |||
| 3099 | } | 3151 | } | ||
| 3100 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var148) | 3152 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 293, " <form method=\"post\" action=\"") |
| 3101 | if templ_7745c5c3_Err != nil { | 3153 | if templ_7745c5c3_Err != nil { | ||
| 3102 | return templ_7745c5c3_Err | 3154 | return templ_7745c5c3_Err | ||
| 3103 | } | 3155 | } | ||
| 3104 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 287, "\"> <button type=\"submit\" title=\"the next visit can show only what changed after this head\" class=\"btn\" aria-keyshortcuts=\"Shift+R\" data-read>Mark read <kbd aria-hidden=\"true\">R</kbd></button></form>") | 3156 | + | var templ_7745c5c3_Var149 templ.SafeURL |
| 3157 | + | templ_7745c5c3_Var149, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.CloseAction)) | |||
| 3105 | if templ_7745c5c3_Err != nil { | 3158 | if templ_7745c5c3_Err != nil { | ||
| 3106 | - | return templ_7745c5c3_Err | 3159 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 626, Col: 65} |
| 3107 | } | 3160 | } | ||
| 3108 | - | } | 3161 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var149)) |
| 3109 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 288, "<form method=\"post\" action=\"") | |||
| 3110 | - | if templ_7745c5c3_Err != nil { | |||
| 3111 | - | return templ_7745c5c3_Err | |||
| 3112 | - | } | |||
| 3113 | - | var templ_7745c5c3_Var149 templ.SafeURL | |||
| 3114 | - | templ_7745c5c3_Var149, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.CloseAction)) | |||
| 3115 | - | if templ_7745c5c3_Err != nil { | |||
| 3116 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 604, Col: 64} | |||
| 3117 | - | } | |||
| 3118 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var149)) | |||
| 3119 | - | if templ_7745c5c3_Err != nil { | |||
| 3120 | - | return templ_7745c5c3_Err | |||
| 3121 | - | } | |||
| 3122 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 289, "\"><button type=\"submit\" title=\"close without merging; the branch is kept\" class=\"btn danger\">Close</button></form>") | |||
| 3123 | - | if templ_7745c5c3_Err != nil { | |||
| 3124 | - | return templ_7745c5c3_Err | |||
| 3125 | - | } | |||
| 3126 | - | if !p.Box.HeadGone && p.Box.ReadyAction == "" { | |||
| 3127 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 290, "<details class=\"d-or\"><summary class=\"mute\">or from a terminal</summary>") | |||
| 3128 | if templ_7745c5c3_Err != nil { | 3162 | if templ_7745c5c3_Err != nil { | ||
| 3129 | return templ_7745c5c3_Err | 3163 | return templ_7745c5c3_Err | ||
| 3130 | } | 3164 | } | ||
| 3131 | - | templ_7745c5c3_Err = CloneBlock(p.Box.CLI).Render(ctx, templ_7745c5c3_Buffer) | 3165 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 294, "\"><button type=\"submit\" title=\"close without merging; the branch is kept\" class=\"btn danger\">Close</button></form>") |
| 3132 | if templ_7745c5c3_Err != nil { | 3166 | if templ_7745c5c3_Err != nil { | ||
| 3133 | return templ_7745c5c3_Err | 3167 | return templ_7745c5c3_Err | ||
| 3134 | } | 3168 | } | ||
| 3135 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 291, "</details>") | 3169 | + | if !p.Box.HeadGone && p.Box.ReadyAction == "" { |
| 3136 | - | if templ_7745c5c3_Err != nil { | 3170 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 295, "<details class=\"d-or\"><summary class=\"mute\">or from a terminal</summary>") |
| 3137 | - | return templ_7745c5c3_Err | 3171 | + | if templ_7745c5c3_Err != nil { |
| 3172 | + | return templ_7745c5c3_Err | |||
| 3173 | + | } | |||
| 3174 | + | templ_7745c5c3_Err = CloneBlock(p.Box.CLI).Render(ctx, templ_7745c5c3_Buffer) | |||
| 3175 | + | if templ_7745c5c3_Err != nil { | |||
| 3176 | + | return templ_7745c5c3_Err | |||
| 3177 | + | } | |||
| 3178 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 296, "</details>") | |||
| 3179 | + | if templ_7745c5c3_Err != nil { | |||
| 3180 | + | return templ_7745c5c3_Err | |||
| 3181 | + | } | |||
| 3138 | } | 3182 | } | ||
| 3139 | } | 3183 | } | ||
| 3140 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 292, "</div></details>") | 3184 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 297, "</div></details>") |
| 3141 | if templ_7745c5c3_Err != nil { | 3185 | if templ_7745c5c3_Err != nil { | ||
| 3142 | return templ_7745c5c3_Err | 3186 | return templ_7745c5c3_Err | ||
| 3143 | } | 3187 | } | ||
| @@ -3178,263 +3222,263 @@ func Compare(l Layout, p ComparePage) templ.Component { | |||||
| 3178 | }() | 3222 | }() | ||
| 3179 | } | 3223 | } | ||
| 3180 | ctx = templ.InitializeContext(ctx) | 3224 | ctx = templ.InitializeContext(ctx) | ||
| 3181 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 293, "<header class=\"show mr-h\"><h1>") | 3225 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 298, "<header class=\"show mr-h\"><h1>") |
| 3182 | if templ_7745c5c3_Err != nil { | 3226 | if templ_7745c5c3_Err != nil { | ||
| 3183 | return templ_7745c5c3_Err | 3227 | return templ_7745c5c3_Err | ||
| 3184 | } | 3228 | } | ||
| 3185 | var templ_7745c5c3_Var152 string | 3229 | var templ_7745c5c3_Var152 string | ||
| 3186 | templ_7745c5c3_Var152, templ_7745c5c3_Err = templ.JoinStringErrs(p.Source) | 3230 | templ_7745c5c3_Var152, templ_7745c5c3_Err = templ.JoinStringErrs(p.Source) | ||
| 3187 | if templ_7745c5c3_Err != nil { | 3231 | if templ_7745c5c3_Err != nil { | ||
| 3188 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 620, Col: 17} | 3232 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 643, Col: 17} |
| 3189 | } | 3233 | } | ||
| 3190 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var152)) | 3234 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var152)) | ||
| 3191 | if templ_7745c5c3_Err != nil { | 3235 | if templ_7745c5c3_Err != nil { | ||
| 3192 | return templ_7745c5c3_Err | 3236 | return templ_7745c5c3_Err | ||
| 3193 | } | 3237 | } | ||
| 3194 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 294, " → ") | 3238 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 299, " → ") |
| 3195 | if templ_7745c5c3_Err != nil { | 3239 | if templ_7745c5c3_Err != nil { | ||
| 3196 | return templ_7745c5c3_Err | 3240 | return templ_7745c5c3_Err | ||
| 3197 | } | 3241 | } | ||
| 3198 | var templ_7745c5c3_Var153 string | 3242 | var templ_7745c5c3_Var153 string | ||
| 3199 | templ_7745c5c3_Var153, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | 3243 | templ_7745c5c3_Var153, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | ||
| 3200 | if templ_7745c5c3_Err != nil { | 3244 | if templ_7745c5c3_Err != nil { | ||
| 3201 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 620, Col: 34} | 3245 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 643, Col: 34} |
| 3202 | } | 3246 | } | ||
| 3203 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var153)) | 3247 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var153)) | ||
| 3204 | if templ_7745c5c3_Err != nil { | 3248 | if templ_7745c5c3_Err != nil { | ||
| 3205 | return templ_7745c5c3_Err | 3249 | return templ_7745c5c3_Err | ||
| 3206 | } | 3250 | } | ||
| 3207 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 295, "</h1><dl class=\"kv show-kv\"><dt>branch</dt><dd><a href=\"") | 3251 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 300, "</h1><dl class=\"kv show-kv\"><dt>branch</dt><dd><a href=\"") |
| 3208 | if templ_7745c5c3_Err != nil { | 3252 | if templ_7745c5c3_Err != nil { | ||
| 3209 | return templ_7745c5c3_Err | 3253 | return templ_7745c5c3_Err | ||
| 3210 | } | 3254 | } | ||
| 3211 | var templ_7745c5c3_Var154 templ.SafeURL | 3255 | var templ_7745c5c3_Var154 templ.SafeURL | ||
| 3212 | templ_7745c5c3_Var154, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.SourceHref)) | 3256 | templ_7745c5c3_Var154, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.SourceHref)) | ||
| 3213 | if templ_7745c5c3_Err != nil { | 3257 | if templ_7745c5c3_Err != nil { | ||
| 3214 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 623, Col: 45} | 3258 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 646, Col: 45} |
| 3215 | } | 3259 | } | ||
| 3216 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var154)) | 3260 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var154)) | ||
| 3217 | if templ_7745c5c3_Err != nil { | 3261 | if templ_7745c5c3_Err != nil { | ||
| 3218 | return templ_7745c5c3_Err | 3262 | return templ_7745c5c3_Err | ||
| 3219 | } | 3263 | } | ||
| 3220 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 296, "\">") | 3264 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 301, "\">") |
| 3221 | if templ_7745c5c3_Err != nil { | 3265 | if templ_7745c5c3_Err != nil { | ||
| 3222 | return templ_7745c5c3_Err | 3266 | return templ_7745c5c3_Err | ||
| 3223 | } | 3267 | } | ||
| 3224 | var templ_7745c5c3_Var155 string | 3268 | var templ_7745c5c3_Var155 string | ||
| 3225 | templ_7745c5c3_Var155, templ_7745c5c3_Err = templ.JoinStringErrs(p.Source) | 3269 | templ_7745c5c3_Var155, templ_7745c5c3_Err = templ.JoinStringErrs(p.Source) | ||
| 3226 | if templ_7745c5c3_Err != nil { | 3270 | if templ_7745c5c3_Err != nil { | ||
| 3227 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 623, Col: 58} | 3271 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 646, Col: 58} |
| 3228 | } | 3272 | } | ||
| 3229 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var155)) | 3273 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var155)) | ||
| 3230 | if templ_7745c5c3_Err != nil { | 3274 | if templ_7745c5c3_Err != nil { | ||
| 3231 | return templ_7745c5c3_Err | 3275 | return templ_7745c5c3_Err | ||
| 3232 | } | 3276 | } | ||
| 3233 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 297, "</a></dd><dt>target</dt><dd><a href=\"") | 3277 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 302, "</a></dd><dt>target</dt><dd><a href=\"") |
| 3234 | if templ_7745c5c3_Err != nil { | 3278 | if templ_7745c5c3_Err != nil { | ||
| 3235 | return templ_7745c5c3_Err | 3279 | return templ_7745c5c3_Err | ||
| 3236 | } | 3280 | } | ||
| 3237 | var templ_7745c5c3_Var156 templ.SafeURL | 3281 | var templ_7745c5c3_Var156 templ.SafeURL | ||
| 3238 | templ_7745c5c3_Var156, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.TargetHref)) | 3282 | templ_7745c5c3_Var156, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.TargetHref)) | ||
| 3239 | if templ_7745c5c3_Err != nil { | 3283 | if templ_7745c5c3_Err != nil { | ||
| 3240 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 625, Col: 45} | 3284 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 648, Col: 45} |
| 3241 | } | 3285 | } | ||
| 3242 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var156)) | 3286 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var156)) | ||
| 3243 | if templ_7745c5c3_Err != nil { | 3287 | if templ_7745c5c3_Err != nil { | ||
| 3244 | return templ_7745c5c3_Err | 3288 | return templ_7745c5c3_Err | ||
| 3245 | } | 3289 | } | ||
| 3246 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 298, "\">") | 3290 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 303, "\">") |
| 3247 | if templ_7745c5c3_Err != nil { | 3291 | if templ_7745c5c3_Err != nil { | ||
| 3248 | return templ_7745c5c3_Err | 3292 | return templ_7745c5c3_Err | ||
| 3249 | } | 3293 | } | ||
| 3250 | var templ_7745c5c3_Var157 string | 3294 | var templ_7745c5c3_Var157 string | ||
| 3251 | templ_7745c5c3_Var157, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | 3295 | templ_7745c5c3_Var157, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | ||
| 3252 | if templ_7745c5c3_Err != nil { | 3296 | if templ_7745c5c3_Err != nil { | ||
| 3253 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 625, Col: 58} | 3297 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 648, Col: 58} |
| 3254 | } | 3298 | } | ||
| 3255 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var157)) | 3299 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var157)) | ||
| 3256 | if templ_7745c5c3_Err != nil { | 3300 | if templ_7745c5c3_Err != nil { | ||
| 3257 | return templ_7745c5c3_Err | 3301 | return templ_7745c5c3_Err | ||
| 3258 | } | 3302 | } | ||
| 3259 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 299, "</a></dd><dt>ahead</dt><dd>") | 3303 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 304, "</a></dd><dt>ahead</dt><dd>") |
| 3260 | if templ_7745c5c3_Err != nil { | 3304 | if templ_7745c5c3_Err != nil { | ||
| 3261 | return templ_7745c5c3_Err | 3305 | return templ_7745c5c3_Err | ||
| 3262 | } | 3306 | } | ||
| 3263 | var templ_7745c5c3_Var158 string | 3307 | var templ_7745c5c3_Var158 string | ||
| 3264 | templ_7745c5c3_Var158, templ_7745c5c3_Err = templ.JoinStringErrs(p.AheadText) | 3308 | templ_7745c5c3_Var158, templ_7745c5c3_Err = templ.JoinStringErrs(p.AheadText) | ||
| 3265 | if templ_7745c5c3_Err != nil { | 3309 | if templ_7745c5c3_Err != nil { | ||
| 3266 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 627, Col: 21} | 3310 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 650, Col: 21} |
| 3267 | } | 3311 | } | ||
| 3268 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var158)) | 3312 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var158)) | ||
| 3269 | if templ_7745c5c3_Err != nil { | 3313 | if templ_7745c5c3_Err != nil { | ||
| 3270 | return templ_7745c5c3_Err | 3314 | return templ_7745c5c3_Err | ||
| 3271 | } | 3315 | } | ||
| 3272 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 300, "</dd></dl></header>") | 3316 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 305, "</dd></dl></header>") |
| 3273 | if templ_7745c5c3_Err != nil { | 3317 | if templ_7745c5c3_Err != nil { | ||
| 3274 | return templ_7745c5c3_Err | 3318 | return templ_7745c5c3_Err | ||
| 3275 | } | 3319 | } | ||
| 3276 | if p.Note != "" { | 3320 | if p.Note != "" { | ||
| 3277 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 301, "<p class=\"notice\">") | 3321 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 306, "<p class=\"notice\">") |
| 3278 | if templ_7745c5c3_Err != nil { | 3322 | if templ_7745c5c3_Err != nil { | ||
| 3279 | return templ_7745c5c3_Err | 3323 | return templ_7745c5c3_Err | ||
| 3280 | } | 3324 | } | ||
| 3281 | var templ_7745c5c3_Var159 string | 3325 | var templ_7745c5c3_Var159 string | ||
| 3282 | templ_7745c5c3_Var159, templ_7745c5c3_Err = templ.JoinStringErrs(p.Note) | 3326 | templ_7745c5c3_Var159, templ_7745c5c3_Err = templ.JoinStringErrs(p.Note) | ||
| 3283 | if templ_7745c5c3_Err != nil { | 3327 | if templ_7745c5c3_Err != nil { | ||
| 3284 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 631, Col: 29} | 3328 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 654, Col: 29} |
| 3285 | } | 3329 | } | ||
| 3286 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var159)) | 3330 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var159)) | ||
| 3287 | if templ_7745c5c3_Err != nil { | 3331 | if templ_7745c5c3_Err != nil { | ||
| 3288 | return templ_7745c5c3_Err | 3332 | return templ_7745c5c3_Err | ||
| 3289 | } | 3333 | } | ||
| 3290 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 302, "</p>") | 3334 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 307, "</p>") |
| 3291 | if templ_7745c5c3_Err != nil { | 3335 | if templ_7745c5c3_Err != nil { | ||
| 3292 | return templ_7745c5c3_Err | 3336 | return templ_7745c5c3_Err | ||
| 3293 | } | 3337 | } | ||
| 3294 | } | 3338 | } | ||
| 3295 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 303, " ") | 3339 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 308, " ") |
| 3296 | if templ_7745c5c3_Err != nil { | 3340 | if templ_7745c5c3_Err != nil { | ||
| 3297 | return templ_7745c5c3_Err | 3341 | return templ_7745c5c3_Err | ||
| 3298 | } | 3342 | } | ||
| 3299 | if p.Existing != nil { | 3343 | if p.Existing != nil { | ||
| 3300 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 304, "<p class=\"notice\">an open merge request already covers these branches: <a href=\"") | 3344 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 309, "<p class=\"notice\">an open merge request already covers these branches: <a href=\"") |
| 3301 | if templ_7745c5c3_Err != nil { | 3345 | if templ_7745c5c3_Err != nil { | ||
| 3302 | return templ_7745c5c3_Err | 3346 | return templ_7745c5c3_Err | ||
| 3303 | } | 3347 | } | ||
| 3304 | var templ_7745c5c3_Var160 templ.SafeURL | 3348 | var templ_7745c5c3_Var160 templ.SafeURL | ||
| 3305 | templ_7745c5c3_Var160, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Existing.Href)) | 3349 | templ_7745c5c3_Var160, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Existing.Href)) | ||
| 3306 | if templ_7745c5c3_Err != nil { | 3350 | if templ_7745c5c3_Err != nil { | ||
| 3307 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 634, Col: 114} | 3351 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 657, Col: 114} |
| 3308 | } | 3352 | } | ||
| 3309 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var160)) | 3353 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var160)) | ||
| 3310 | if templ_7745c5c3_Err != nil { | 3354 | if templ_7745c5c3_Err != nil { | ||
| 3311 | return templ_7745c5c3_Err | 3355 | return templ_7745c5c3_Err | ||
| 3312 | } | 3356 | } | ||
| 3313 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 305, "\">") | 3357 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 310, "\">") |
| 3314 | if templ_7745c5c3_Err != nil { | 3358 | if templ_7745c5c3_Err != nil { | ||
| 3315 | return templ_7745c5c3_Err | 3359 | return templ_7745c5c3_Err | ||
| 3316 | } | 3360 | } | ||
| 3317 | var templ_7745c5c3_Var161 string | 3361 | var templ_7745c5c3_Var161 string | ||
| 3318 | templ_7745c5c3_Var161, templ_7745c5c3_Err = templ.JoinStringErrs(p.Existing.Label) | 3362 | templ_7745c5c3_Var161, templ_7745c5c3_Err = templ.JoinStringErrs(p.Existing.Label) | ||
| 3319 | if templ_7745c5c3_Err != nil { | 3363 | if templ_7745c5c3_Err != nil { | ||
| 3320 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 634, Col: 135} | 3364 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 657, Col: 135} |
| 3321 | } | 3365 | } | ||
| 3322 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var161)) | 3366 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var161)) | ||
| 3323 | if templ_7745c5c3_Err != nil { | 3367 | if templ_7745c5c3_Err != nil { | ||
| 3324 | return templ_7745c5c3_Err | 3368 | return templ_7745c5c3_Err | ||
| 3325 | } | 3369 | } | ||
| 3326 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 306, "</a></p>") | 3370 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 311, "</a></p>") |
| 3327 | if templ_7745c5c3_Err != nil { | 3371 | if templ_7745c5c3_Err != nil { | ||
| 3328 | return templ_7745c5c3_Err | 3372 | return templ_7745c5c3_Err | ||
| 3329 | } | 3373 | } | ||
| 3330 | } | 3374 | } | ||
| 3331 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 307, " ") | 3375 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 312, " ") |
| 3332 | if templ_7745c5c3_Err != nil { | 3376 | if templ_7745c5c3_Err != nil { | ||
| 3333 | return templ_7745c5c3_Err | 3377 | return templ_7745c5c3_Err | ||
| 3334 | } | 3378 | } | ||
| 3335 | if p.Create != nil { | 3379 | if p.Create != nil { | ||
| 3336 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 308, "<form class=\"cform create\" method=\"post\" action=\"") | 3380 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 313, "<form class=\"cform create\" method=\"post\" action=\"") |
| 3337 | if templ_7745c5c3_Err != nil { | 3381 | if templ_7745c5c3_Err != nil { | ||
| 3338 | return templ_7745c5c3_Err | 3382 | return templ_7745c5c3_Err | ||
| 3339 | } | 3383 | } | ||
| 3340 | var templ_7745c5c3_Var162 templ.SafeURL | 3384 | var templ_7745c5c3_Var162 templ.SafeURL | ||
| 3341 | templ_7745c5c3_Var162, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Create.Action)) | 3385 | templ_7745c5c3_Var162, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Create.Action)) | ||
| 3342 | if templ_7745c5c3_Err != nil { | 3386 | if templ_7745c5c3_Err != nil { | ||
| 3343 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 637, Col: 83} | 3387 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 660, Col: 83} |
| 3344 | } | 3388 | } | ||
| 3345 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var162)) | 3389 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var162)) | ||
| 3346 | if templ_7745c5c3_Err != nil { | 3390 | if templ_7745c5c3_Err != nil { | ||
| 3347 | return templ_7745c5c3_Err | 3391 | return templ_7745c5c3_Err | ||
| 3348 | } | 3392 | } | ||
| 3349 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 309, "\"><input type=\"hidden\" name=\"source\" value=\"") | 3393 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 314, "\"><input type=\"hidden\" name=\"source\" value=\"") |
| 3350 | if templ_7745c5c3_Err != nil { | 3394 | if templ_7745c5c3_Err != nil { | ||
| 3351 | return templ_7745c5c3_Err | 3395 | return templ_7745c5c3_Err | ||
| 3352 | } | 3396 | } | ||
| 3353 | var templ_7745c5c3_Var163 string | 3397 | var templ_7745c5c3_Var163 string | ||
| 3354 | templ_7745c5c3_Var163, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Create.Source) | 3398 | templ_7745c5c3_Var163, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Create.Source) | ||
| 3355 | if templ_7745c5c3_Err != nil { | 3399 | if templ_7745c5c3_Err != nil { | ||
| 3356 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 638, Col: 62} | 3400 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 661, Col: 62} |
| 3357 | } | 3401 | } | ||
| 3358 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var163) | 3402 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var163) | ||
| 3359 | if templ_7745c5c3_Err != nil { | 3403 | if templ_7745c5c3_Err != nil { | ||
| 3360 | return templ_7745c5c3_Err | 3404 | return templ_7745c5c3_Err | ||
| 3361 | } | 3405 | } | ||
| 3362 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 310, "\"> <input type=\"hidden\" name=\"target\" value=\"") | 3406 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 315, "\"> <input type=\"hidden\" name=\"target\" value=\"") |
| 3363 | if templ_7745c5c3_Err != nil { | 3407 | if templ_7745c5c3_Err != nil { | ||
| 3364 | return templ_7745c5c3_Err | 3408 | return templ_7745c5c3_Err | ||
| 3365 | } | 3409 | } | ||
| 3366 | var templ_7745c5c3_Var164 string | 3410 | var templ_7745c5c3_Var164 string | ||
| 3367 | templ_7745c5c3_Var164, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Create.Target) | 3411 | templ_7745c5c3_Var164, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Create.Target) | ||
| 3368 | if templ_7745c5c3_Err != nil { | 3412 | if templ_7745c5c3_Err != nil { | ||
| 3369 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 639, Col: 62} | 3413 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 662, Col: 62} |
| 3370 | } | 3414 | } | ||
| 3371 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var164) | 3415 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var164) | ||
| 3372 | if templ_7745c5c3_Err != nil { | 3416 | if templ_7745c5c3_Err != nil { | ||
| 3373 | return templ_7745c5c3_Err | 3417 | return templ_7745c5c3_Err | ||
| 3374 | } | 3418 | } | ||
| 3375 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 311, "\"> <label for=\"mr-title\">title</label> <input id=\"mr-title\" name=\"title\" type=\"text\" maxlength=\"120\" required value=\"") | 3419 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 316, "\"> <label for=\"mr-title\">title</label> <input id=\"mr-title\" name=\"title\" type=\"text\" maxlength=\"120\" required value=\"") |
| 3376 | if templ_7745c5c3_Err != nil { | 3420 | if templ_7745c5c3_Err != nil { | ||
| 3377 | return templ_7745c5c3_Err | 3421 | return templ_7745c5c3_Err | ||
| 3378 | } | 3422 | } | ||
| 3379 | var templ_7745c5c3_Var165 string | 3423 | var templ_7745c5c3_Var165 string | ||
| 3380 | templ_7745c5c3_Var165, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Create.Title) | 3424 | templ_7745c5c3_Var165, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Create.Title) | ||
| 3381 | if templ_7745c5c3_Err != nil { | 3425 | if templ_7745c5c3_Err != nil { | ||
| 3382 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 641, Col: 97} | 3426 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 664, Col: 97} |
| 3383 | } | 3427 | } | ||
| 3384 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var165) | 3428 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var165) | ||
| 3385 | if templ_7745c5c3_Err != nil { | 3429 | if templ_7745c5c3_Err != nil { | ||
| 3386 | return templ_7745c5c3_Err | 3430 | return templ_7745c5c3_Err | ||
| 3387 | } | 3431 | } | ||
| 3388 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 312, "\" autocomplete=\"off\"> <label for=\"mr-desc\">description</label> <textarea id=\"mr-desc\" name=\"description\" rows=\"4\" maxlength=\"8000\" placeholder=\"Markdown, optional\"></textarea><div class=\"f-btns\"><button type=\"submit\" class=\"btn primary\">Create merge request</button></div></form>") | 3432 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 317, "\" autocomplete=\"off\"> <label for=\"mr-desc\">description</label> <textarea id=\"mr-desc\" name=\"description\" rows=\"4\" maxlength=\"8000\" placeholder=\"Markdown, optional\"></textarea><div class=\"f-btns\"><button type=\"submit\" class=\"btn primary\">Create merge request</button></div></form>") |
| 3389 | if templ_7745c5c3_Err != nil { | 3433 | if templ_7745c5c3_Err != nil { | ||
| 3390 | return templ_7745c5c3_Err | 3434 | return templ_7745c5c3_Err | ||
| 3391 | } | 3435 | } | ||
| 3392 | } | 3436 | } | ||
| 3393 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 313, " ") | 3437 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 318, " ") |
| 3394 | if templ_7745c5c3_Err != nil { | 3438 | if templ_7745c5c3_Err != nil { | ||
| 3395 | return templ_7745c5c3_Err | 3439 | return templ_7745c5c3_Err | ||
| 3396 | } | 3440 | } | ||
| 3397 | if p.HasDiff { | 3441 | if p.HasDiff { | ||
| 3398 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 314, "<div class=\"diff-tools\" role=\"group\" aria-label=\"Diff view\"><span class=\"dim\">") | 3442 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 319, "<div class=\"diff-tools\" role=\"group\" aria-label=\"Diff view\"><span class=\"dim\">") |
| 3399 | if templ_7745c5c3_Err != nil { | 3443 | if templ_7745c5c3_Err != nil { | ||
| 3400 | return templ_7745c5c3_Err | 3444 | return templ_7745c5c3_Err | ||
| 3401 | } | 3445 | } | ||
| 3402 | var templ_7745c5c3_Var166 string | 3446 | var templ_7745c5c3_Var166 string | ||
| 3403 | templ_7745c5c3_Var166, templ_7745c5c3_Err = templ.JoinStringErrs(plural(p.NFiles, "file", "files")) | 3447 | templ_7745c5c3_Var166, templ_7745c5c3_Err = templ.JoinStringErrs(plural(p.NFiles, "file", "files")) | ||
| 3404 | if templ_7745c5c3_Err != nil { | 3448 | if templ_7745c5c3_Err != nil { | ||
| 3405 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 651, Col: 57} | 3449 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 674, Col: 57} |
| 3406 | } | 3450 | } | ||
| 3407 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var166)) | 3451 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var166)) | ||
| 3408 | if templ_7745c5c3_Err != nil { | 3452 | if templ_7745c5c3_Err != nil { | ||
| 3409 | return templ_7745c5c3_Err | 3453 | return templ_7745c5c3_Err | ||
| 3410 | } | 3454 | } | ||
| 3411 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 315, " · <span class=\"plus\">+") | 3455 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 320, " · <span class=\"plus\">+") |
| 3412 | if templ_7745c5c3_Err != nil { | 3456 | if templ_7745c5c3_Err != nil { | ||
| 3413 | return templ_7745c5c3_Err | 3457 | return templ_7745c5c3_Err | ||
| 3414 | } | 3458 | } | ||
| 3415 | var templ_7745c5c3_Var167 string | 3459 | var templ_7745c5c3_Var167 string | ||
| 3416 | templ_7745c5c3_Var167, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Adds)) | 3460 | templ_7745c5c3_Var167, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Adds)) | ||
| 3417 | if templ_7745c5c3_Err != nil { | 3461 | if templ_7745c5c3_Err != nil { | ||
| 3418 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 651, Col: 97} | 3462 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 674, Col: 97} |
| 3419 | } | 3463 | } | ||
| 3420 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var167)) | 3464 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var167)) | ||
| 3421 | if templ_7745c5c3_Err != nil { | 3465 | if templ_7745c5c3_Err != nil { | ||
| 3422 | return templ_7745c5c3_Err | 3466 | return templ_7745c5c3_Err | ||
| 3423 | } | 3467 | } | ||
| 3424 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 316, "</span> <span class=\"minus\">-") | 3468 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 321, "</span> <span class=\"minus\">-") |
| 3425 | if templ_7745c5c3_Err != nil { | 3469 | if templ_7745c5c3_Err != nil { | ||
| 3426 | return templ_7745c5c3_Err | 3470 | return templ_7745c5c3_Err | ||
| 3427 | } | 3471 | } | ||
| 3428 | var templ_7745c5c3_Var168 string | 3472 | var templ_7745c5c3_Var168 string | ||
| 3429 | templ_7745c5c3_Var168, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Dels)) | 3473 | templ_7745c5c3_Var168, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Dels)) | ||
| 3430 | if templ_7745c5c3_Err != nil { | 3474 | if templ_7745c5c3_Err != nil { | ||
| 3431 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 651, Col: 142} | 3475 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 674, Col: 142} |
| 3432 | } | 3476 | } | ||
| 3433 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var168)) | 3477 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var168)) | ||
| 3434 | if templ_7745c5c3_Err != nil { | 3478 | if templ_7745c5c3_Err != nil { | ||
| 3435 | return templ_7745c5c3_Err | 3479 | return templ_7745c5c3_Err | ||
| 3436 | } | 3480 | } | ||
| 3437 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 317, "</span></span> <span class=\"grow\"></span>") | 3481 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 322, "</span></span> <span class=\"grow\"></span>") |
| 3438 | if templ_7745c5c3_Err != nil { | 3482 | if templ_7745c5c3_Err != nil { | ||
| 3439 | return templ_7745c5c3_Err | 3483 | return templ_7745c5c3_Err | ||
| 3440 | } | 3484 | } | ||
| @@ -3442,64 +3486,64 @@ func Compare(l Layout, p ComparePage) templ.Component { | |||||
| 3442 | if templ_7745c5c3_Err != nil { | 3486 | if templ_7745c5c3_Err != nil { | ||
| 3443 | return templ_7745c5c3_Err | 3487 | return templ_7745c5c3_Err | ||
| 3444 | } | 3488 | } | ||
| 3445 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 318, "</div>") | 3489 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 323, "</div>") |
| 3446 | if templ_7745c5c3_Err != nil { | 3490 | if templ_7745c5c3_Err != nil { | ||
| 3447 | return templ_7745c5c3_Err | 3491 | return templ_7745c5c3_Err | ||
| 3448 | } | 3492 | } | ||
| 3449 | if p.Invisible { | 3493 | if p.Invisible { | ||
| 3450 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 319, "<p class=\"notice\">this diff holds invisible characters (direction controls, zero-width characters). They are shown as <span class=\"inv\"><U+XXXX></span> markers, never applied.</p>") | 3494 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 324, "<p class=\"notice\">this diff holds invisible characters (direction controls, zero-width characters). They are shown as <span class=\"inv\"><U+XXXX></span> markers, never applied.</p>") |
| 3451 | if templ_7745c5c3_Err != nil { | 3495 | if templ_7745c5c3_Err != nil { | ||
| 3452 | return templ_7745c5c3_Err | 3496 | return templ_7745c5c3_Err | ||
| 3453 | } | 3497 | } | ||
| 3454 | } | 3498 | } | ||
| 3455 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 320, " <div id=\"diffs\"") | 3499 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 325, " <div id=\"diffs\"") |
| 3456 | if templ_7745c5c3_Err != nil { | 3500 | if templ_7745c5c3_Err != nil { | ||
| 3457 | return templ_7745c5c3_Err | 3501 | return templ_7745c5c3_Err | ||
| 3458 | } | 3502 | } | ||
| 3459 | if p.Both { | 3503 | if p.Both { | ||
| 3460 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 321, " data-diff=\"") | 3504 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 326, " data-diff=\"") |
| 3461 | if templ_7745c5c3_Err != nil { | 3505 | if templ_7745c5c3_Err != nil { | ||
| 3462 | return templ_7745c5c3_Err | 3506 | return templ_7745c5c3_Err | ||
| 3463 | } | 3507 | } | ||
| 3464 | var templ_7745c5c3_Var169 string | 3508 | var templ_7745c5c3_Var169 string | ||
| 3465 | templ_7745c5c3_Var169, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.View) | 3509 | templ_7745c5c3_Var169, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.View) | ||
| 3466 | if templ_7745c5c3_Err != nil { | 3510 | if templ_7745c5c3_Err != nil { | ||
| 3467 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 664, Col: 23} | 3511 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 687, Col: 23} |
| 3468 | } | 3512 | } | ||
| 3469 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var169) | 3513 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var169) | ||
| 3470 | if templ_7745c5c3_Err != nil { | 3514 | if templ_7745c5c3_Err != nil { | ||
| 3471 | return templ_7745c5c3_Err | 3515 | return templ_7745c5c3_Err | ||
| 3472 | } | 3516 | } | ||
| 3473 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 322, "\"") | 3517 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 327, "\"") |
| 3474 | if templ_7745c5c3_Err != nil { | 3518 | if templ_7745c5c3_Err != nil { | ||
| 3475 | return templ_7745c5c3_Err | 3519 | return templ_7745c5c3_Err | ||
| 3476 | } | 3520 | } | ||
| 3477 | } else { | 3521 | } else { | ||
| 3478 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 323, " data-view=\"") | 3522 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 328, " data-view=\"") |
| 3479 | if templ_7745c5c3_Err != nil { | 3523 | if templ_7745c5c3_Err != nil { | ||
| 3480 | return templ_7745c5c3_Err | 3524 | return templ_7745c5c3_Err | ||
| 3481 | } | 3525 | } | ||
| 3482 | var templ_7745c5c3_Var170 string | 3526 | var templ_7745c5c3_Var170 string | ||
| 3483 | templ_7745c5c3_Var170, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.View) | 3527 | templ_7745c5c3_Var170, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.View) | ||
| 3484 | if templ_7745c5c3_Err != nil { | 3528 | if templ_7745c5c3_Err != nil { | ||
| 3485 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 666, Col: 23} | 3529 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 689, Col: 23} |
| 3486 | } | 3530 | } | ||
| 3487 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var170) | 3531 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var170) | ||
| 3488 | if templ_7745c5c3_Err != nil { | 3532 | if templ_7745c5c3_Err != nil { | ||
| 3489 | return templ_7745c5c3_Err | 3533 | return templ_7745c5c3_Err | ||
| 3490 | } | 3534 | } | ||
| 3491 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 324, "\"") | 3535 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 329, "\"") |
| 3492 | if templ_7745c5c3_Err != nil { | 3536 | if templ_7745c5c3_Err != nil { | ||
| 3493 | return templ_7745c5c3_Err | 3537 | return templ_7745c5c3_Err | ||
| 3494 | } | 3538 | } | ||
| 3495 | } | 3539 | } | ||
| 3496 | if p.Both && !p.Pinned { | 3540 | if p.Both && !p.Pinned { | ||
| 3497 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 325, " hx-live=\"this.dataset.diff = sessionStorage.getItem('diff') || this.dataset.diff\"") | 3541 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 330, " hx-live=\"this.dataset.diff = sessionStorage.getItem('diff') || this.dataset.diff\"") |
| 3498 | if templ_7745c5c3_Err != nil { | 3542 | if templ_7745c5c3_Err != nil { | ||
| 3499 | return templ_7745c5c3_Err | 3543 | return templ_7745c5c3_Err | ||
| 3500 | } | 3544 | } | ||
| 3501 | } | 3545 | } | ||
| 3502 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 326, ">") | 3546 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 331, ">") |
| 3503 | if templ_7745c5c3_Err != nil { | 3547 | if templ_7745c5c3_Err != nil { | ||
| 3504 | return templ_7745c5c3_Err | 3548 | return templ_7745c5c3_Err | ||
| 3505 | } | 3549 | } | ||
| @@ -3509,7 +3553,7 @@ func Compare(l Layout, p ComparePage) templ.Component { | |||||
| 3509 | return templ_7745c5c3_Err | 3553 | return templ_7745c5c3_Err | ||
| 3510 | } | 3554 | } | ||
| 3511 | } | 3555 | } | ||
| 3512 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 327, "</div>") | 3556 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 332, "</div>") |
| 3513 | if templ_7745c5c3_Err != nil { | 3557 | if templ_7745c5c3_Err != nil { | ||
| 3514 | return templ_7745c5c3_Err | 3558 | return templ_7745c5c3_Err | ||
| 3515 | } | 3559 | } | ||
| @@ -3545,77 +3589,77 @@ func compareRail(p ComparePage) templ.Component { | |||||
| 3545 | templ_7745c5c3_Var171 = templ.NopComponent | 3589 | templ_7745c5c3_Var171 = templ.NopComponent | ||
| 3546 | } | 3590 | } | ||
| 3547 | ctx = templ.ClearChildren(ctx) | 3591 | ctx = templ.ClearChildren(ctx) | ||
| 3548 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 328, "<section aria-labelledby=\"r-ahead\"><h2 id=\"r-ahead\">Commits <span class=\"count\">") | 3592 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 333, "<section aria-labelledby=\"r-ahead\"><h2 id=\"r-ahead\">Commits <span class=\"count\">") |
| 3549 | if templ_7745c5c3_Err != nil { | 3593 | if templ_7745c5c3_Err != nil { | ||
| 3550 | return templ_7745c5c3_Err | 3594 | return templ_7745c5c3_Err | ||
| 3551 | } | 3595 | } | ||
| 3552 | var templ_7745c5c3_Var172 string | 3596 | var templ_7745c5c3_Var172 string | ||
| 3553 | templ_7745c5c3_Var172, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(len(p.Ahead))) | 3597 | templ_7745c5c3_Var172, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(len(p.Ahead))) | ||
| 3554 | if templ_7745c5c3_Err != nil { | 3598 | if templ_7745c5c3_Err != nil { | ||
| 3555 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 682, Col: 67} | 3599 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 705, Col: 67} |
| 3556 | } | 3600 | } | ||
| 3557 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var172)) | 3601 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var172)) | ||
| 3558 | if templ_7745c5c3_Err != nil { | 3602 | if templ_7745c5c3_Err != nil { | ||
| 3559 | return templ_7745c5c3_Err | 3603 | return templ_7745c5c3_Err | ||
| 3560 | } | 3604 | } | ||
| 3561 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 329, "</span></h2><ul class=\"pcommits\">") | 3605 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 334, "</span></h2><ul class=\"pcommits\">") |
| 3562 | if templ_7745c5c3_Err != nil { | 3606 | if templ_7745c5c3_Err != nil { | ||
| 3563 | return templ_7745c5c3_Err | 3607 | return templ_7745c5c3_Err | ||
| 3564 | } | 3608 | } | ||
| 3565 | for _, c := range p.Ahead { | 3609 | for _, c := range p.Ahead { | ||
| 3566 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 330, "<li><a href=\"") | 3610 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 335, "<li><a href=\"") |
| 3567 | if templ_7745c5c3_Err != nil { | 3611 | if templ_7745c5c3_Err != nil { | ||
| 3568 | return templ_7745c5c3_Err | 3612 | return templ_7745c5c3_Err | ||
| 3569 | } | 3613 | } | ||
| 3570 | var templ_7745c5c3_Var173 templ.SafeURL | 3614 | var templ_7745c5c3_Var173 templ.SafeURL | ||
| 3571 | templ_7745c5c3_Var173, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(c.CHref)) | 3615 | templ_7745c5c3_Var173, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(c.CHref)) | ||
| 3572 | if templ_7745c5c3_Err != nil { | 3616 | if templ_7745c5c3_Err != nil { | ||
| 3573 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 686, Col: 37} | 3617 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 709, Col: 37} |
| 3574 | } | 3618 | } | ||
| 3575 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var173)) | 3619 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var173)) | ||
| 3576 | if templ_7745c5c3_Err != nil { | 3620 | if templ_7745c5c3_Err != nil { | ||
| 3577 | return templ_7745c5c3_Err | 3621 | return templ_7745c5c3_Err | ||
| 3578 | } | 3622 | } | ||
| 3579 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 331, "\">") | 3623 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 336, "\">") |
| 3580 | if templ_7745c5c3_Err != nil { | 3624 | if templ_7745c5c3_Err != nil { | ||
| 3581 | return templ_7745c5c3_Err | 3625 | return templ_7745c5c3_Err | ||
| 3582 | } | 3626 | } | ||
| 3583 | var templ_7745c5c3_Var174 string | 3627 | var templ_7745c5c3_Var174 string | ||
| 3584 | templ_7745c5c3_Var174, templ_7745c5c3_Err = templ.JoinStringErrs(c.Short) | 3628 | templ_7745c5c3_Var174, templ_7745c5c3_Err = templ.JoinStringErrs(c.Short) | ||
| 3585 | if templ_7745c5c3_Err != nil { | 3629 | if templ_7745c5c3_Err != nil { | ||
| 3586 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 686, Col: 49} | 3630 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 709, Col: 49} |
| 3587 | } | 3631 | } | ||
| 3588 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var174)) | 3632 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var174)) | ||
| 3589 | if templ_7745c5c3_Err != nil { | 3633 | if templ_7745c5c3_Err != nil { | ||
| 3590 | return templ_7745c5c3_Err | 3634 | return templ_7745c5c3_Err | ||
| 3591 | } | 3635 | } | ||
| 3592 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 332, "</a> <span class=\"s\">") | 3636 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 337, "</a> <span class=\"s\">") |
| 3593 | if templ_7745c5c3_Err != nil { | 3637 | if templ_7745c5c3_Err != nil { | ||
| 3594 | return templ_7745c5c3_Err | 3638 | return templ_7745c5c3_Err | ||
| 3595 | } | 3639 | } | ||
| 3596 | var templ_7745c5c3_Var175 string | 3640 | var templ_7745c5c3_Var175 string | ||
| 3597 | templ_7745c5c3_Var175, templ_7745c5c3_Err = templ.JoinStringErrs(c.Subject) | 3641 | templ_7745c5c3_Var175, templ_7745c5c3_Err = templ.JoinStringErrs(c.Subject) | ||
| 3598 | if templ_7745c5c3_Err != nil { | 3642 | if templ_7745c5c3_Err != nil { | ||
| 3599 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 687, Col: 32} | 3643 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 710, Col: 32} |
| 3600 | } | 3644 | } | ||
| 3601 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var175)) | 3645 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var175)) | ||
| 3602 | if templ_7745c5c3_Err != nil { | 3646 | if templ_7745c5c3_Err != nil { | ||
| 3603 | return templ_7745c5c3_Err | 3647 | return templ_7745c5c3_Err | ||
| 3604 | } | 3648 | } | ||
| 3605 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 333, "</span> <span class=\"mute\">") | 3649 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 338, "</span> <span class=\"mute\">") |
| 3606 | if templ_7745c5c3_Err != nil { | 3650 | if templ_7745c5c3_Err != nil { | ||
| 3607 | return templ_7745c5c3_Err | 3651 | return templ_7745c5c3_Err | ||
| 3608 | } | 3652 | } | ||
| 3609 | var templ_7745c5c3_Var176 string | 3653 | var templ_7745c5c3_Var176 string | ||
| 3610 | templ_7745c5c3_Var176, templ_7745c5c3_Err = templ.JoinStringErrs(c.Author) | 3654 | templ_7745c5c3_Var176, templ_7745c5c3_Err = templ.JoinStringErrs(c.Author) | ||
| 3611 | if templ_7745c5c3_Err != nil { | 3655 | if templ_7745c5c3_Err != nil { | ||
| 3612 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 689, Col: 16} | 3656 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 712, Col: 16} |
| 3613 | } | 3657 | } | ||
| 3614 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var176)) | 3658 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var176)) | ||
| 3615 | if templ_7745c5c3_Err != nil { | 3659 | if templ_7745c5c3_Err != nil { | ||
| 3616 | return templ_7745c5c3_Err | 3660 | return templ_7745c5c3_Err | ||
| 3617 | } | 3661 | } | ||
| 3618 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 334, " ") | 3662 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 339, " ") |
| 3619 | if templ_7745c5c3_Err != nil { | 3663 | if templ_7745c5c3_Err != nil { | ||
| 3620 | return templ_7745c5c3_Err | 3664 | return templ_7745c5c3_Err | ||
| 3621 | } | 3665 | } | ||
| @@ -3623,90 +3667,90 @@ func compareRail(p ComparePage) templ.Component { | |||||
| 3623 | var templ_7745c5c3_Var177 string | 3667 | var templ_7745c5c3_Var177 string | ||
| 3624 | templ_7745c5c3_Var177, templ_7745c5c3_Err = templ.JoinStringErrs(" · ") | 3668 | templ_7745c5c3_Var177, templ_7745c5c3_Err = templ.JoinStringErrs(" · ") | ||
| 3625 | if templ_7745c5c3_Err != nil { | 3669 | if templ_7745c5c3_Err != nil { | ||
| 3626 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 691, Col: 15} | 3670 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 714, Col: 15} |
| 3627 | } | 3671 | } | ||
| 3628 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var177)) | 3672 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var177)) | ||
| 3629 | if templ_7745c5c3_Err != nil { | 3673 | if templ_7745c5c3_Err != nil { | ||
| 3630 | return templ_7745c5c3_Err | 3674 | return templ_7745c5c3_Err | ||
| 3631 | } | 3675 | } | ||
| 3632 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 335, "<time datetime=\"") | 3676 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 340, "<time datetime=\"") |
| 3633 | if templ_7745c5c3_Err != nil { | 3677 | if templ_7745c5c3_Err != nil { | ||
| 3634 | return templ_7745c5c3_Err | 3678 | return templ_7745c5c3_Err | ||
| 3635 | } | 3679 | } | ||
| 3636 | var templ_7745c5c3_Var178 string | 3680 | var templ_7745c5c3_Var178 string | ||
| 3637 | templ_7745c5c3_Var178, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.WhenAt) | 3681 | templ_7745c5c3_Var178, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.WhenAt) | ||
| 3638 | if templ_7745c5c3_Err != nil { | 3682 | if templ_7745c5c3_Err != nil { | ||
| 3639 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 691, Col: 42} | 3683 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 714, Col: 42} |
| 3640 | } | 3684 | } | ||
| 3641 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var178) | 3685 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var178) | ||
| 3642 | if templ_7745c5c3_Err != nil { | 3686 | if templ_7745c5c3_Err != nil { | ||
| 3643 | return templ_7745c5c3_Err | 3687 | return templ_7745c5c3_Err | ||
| 3644 | } | 3688 | } | ||
| 3645 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 336, "\">") | 3689 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 341, "\">") |
| 3646 | if templ_7745c5c3_Err != nil { | 3690 | if templ_7745c5c3_Err != nil { | ||
| 3647 | return templ_7745c5c3_Err | 3691 | return templ_7745c5c3_Err | ||
| 3648 | } | 3692 | } | ||
| 3649 | var templ_7745c5c3_Var179 string | 3693 | var templ_7745c5c3_Var179 string | ||
| 3650 | templ_7745c5c3_Var179, templ_7745c5c3_Err = templ.JoinStringErrs(c.When) | 3694 | templ_7745c5c3_Var179, templ_7745c5c3_Err = templ.JoinStringErrs(c.When) | ||
| 3651 | if templ_7745c5c3_Err != nil { | 3695 | if templ_7745c5c3_Err != nil { | ||
| 3652 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 691, Col: 53} | 3696 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 714, Col: 53} |
| 3653 | } | 3697 | } | ||
| 3654 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var179)) | 3698 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var179)) | ||
| 3655 | if templ_7745c5c3_Err != nil { | 3699 | if templ_7745c5c3_Err != nil { | ||
| 3656 | return templ_7745c5c3_Err | 3700 | return templ_7745c5c3_Err | ||
| 3657 | } | 3701 | } | ||
| 3658 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 337, "</time>") | 3702 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 342, "</time>") |
| 3659 | if templ_7745c5c3_Err != nil { | 3703 | if templ_7745c5c3_Err != nil { | ||
| 3660 | return templ_7745c5c3_Err | 3704 | return templ_7745c5c3_Err | ||
| 3661 | } | 3705 | } | ||
| 3662 | } | 3706 | } | ||
| 3663 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 338, "</span></li>") | 3707 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 343, "</span></li>") |
| 3664 | if templ_7745c5c3_Err != nil { | 3708 | if templ_7745c5c3_Err != nil { | ||
| 3665 | return templ_7745c5c3_Err | 3709 | return templ_7745c5c3_Err | ||
| 3666 | } | 3710 | } | ||
| 3667 | } | 3711 | } | ||
| 3668 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 339, "</ul>") | 3712 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 344, "</ul>") |
| 3669 | if templ_7745c5c3_Err != nil { | 3713 | if templ_7745c5c3_Err != nil { | ||
| 3670 | return templ_7745c5c3_Err | 3714 | return templ_7745c5c3_Err | ||
| 3671 | } | 3715 | } | ||
| 3672 | if len(p.Ahead) == 0 { | 3716 | if len(p.Ahead) == 0 { | ||
| 3673 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 340, "<p class=\"dim\">no commit ahead of ") | 3717 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 345, "<p class=\"dim\">no commit ahead of ") |
| 3674 | if templ_7745c5c3_Err != nil { | 3718 | if templ_7745c5c3_Err != nil { | ||
| 3675 | return templ_7745c5c3_Err | 3719 | return templ_7745c5c3_Err | ||
| 3676 | } | 3720 | } | ||
| 3677 | var templ_7745c5c3_Var180 string | 3721 | var templ_7745c5c3_Var180 string | ||
| 3678 | templ_7745c5c3_Var180, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | 3722 | templ_7745c5c3_Var180, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | ||
| 3679 | if templ_7745c5c3_Err != nil { | 3723 | if templ_7745c5c3_Err != nil { | ||
| 3680 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 698, Col: 47} | 3724 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 721, Col: 47} |
| 3681 | } | 3725 | } | ||
| 3682 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var180)) | 3726 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var180)) | ||
| 3683 | if templ_7745c5c3_Err != nil { | 3727 | if templ_7745c5c3_Err != nil { | ||
| 3684 | return templ_7745c5c3_Err | 3728 | return templ_7745c5c3_Err | ||
| 3685 | } | 3729 | } | ||
| 3686 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 341, ".</p>") | 3730 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 346, ".</p>") |
| 3687 | if templ_7745c5c3_Err != nil { | 3731 | if templ_7745c5c3_Err != nil { | ||
| 3688 | return templ_7745c5c3_Err | 3732 | return templ_7745c5c3_Err | ||
| 3689 | } | 3733 | } | ||
| 3690 | } | 3734 | } | ||
| 3691 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 342, "</section>") | 3735 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 347, "</section>") |
| 3692 | if templ_7745c5c3_Err != nil { | 3736 | if templ_7745c5c3_Err != nil { | ||
| 3693 | return templ_7745c5c3_Err | 3737 | return templ_7745c5c3_Err | ||
| 3694 | } | 3738 | } | ||
| 3695 | if p.HasDiff { | 3739 | if p.HasDiff { | ||
| 3696 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 343, "<section aria-labelledby=\"r-files\"><h2 id=\"r-files\">Files <span class=\"count\">") | 3740 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 348, "<section aria-labelledby=\"r-files\"><h2 id=\"r-files\">Files <span class=\"count\">") |
| 3697 | if templ_7745c5c3_Err != nil { | 3741 | if templ_7745c5c3_Err != nil { | ||
| 3698 | return templ_7745c5c3_Err | 3742 | return templ_7745c5c3_Err | ||
| 3699 | } | 3743 | } | ||
| 3700 | var templ_7745c5c3_Var181 string | 3744 | var templ_7745c5c3_Var181 string | ||
| 3701 | templ_7745c5c3_Var181, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(len(p.Files))) | 3745 | templ_7745c5c3_Var181, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(len(p.Files))) | ||
| 3702 | if templ_7745c5c3_Err != nil { | 3746 | if templ_7745c5c3_Err != nil { | ||
| 3703 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 703, Col: 66} | 3747 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 726, Col: 66} |
| 3704 | } | 3748 | } | ||
| 3705 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var181)) | 3749 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var181)) | ||
| 3706 | if templ_7745c5c3_Err != nil { | 3750 | if templ_7745c5c3_Err != nil { | ||
| 3707 | return templ_7745c5c3_Err | 3751 | return templ_7745c5c3_Err | ||
| 3708 | } | 3752 | } | ||
| 3709 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 344, "</span></h2>") | 3753 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 349, "</span></h2>") |
| 3710 | if templ_7745c5c3_Err != nil { | 3754 | if templ_7745c5c3_Err != nil { | ||
| 3711 | return templ_7745c5c3_Err | 3755 | return templ_7745c5c3_Err | ||
| 3712 | } | 3756 | } | ||
| @@ -3714,12 +3758,12 @@ func compareRail(p ComparePage) templ.Component { | |||||
| 3714 | if templ_7745c5c3_Err != nil { | 3758 | if templ_7745c5c3_Err != nil { | ||
| 3715 | return templ_7745c5c3_Err | 3759 | return templ_7745c5c3_Err | ||
| 3716 | } | 3760 | } | ||
| 3717 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 345, "</section>") | 3761 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 350, "</section>") |
| 3718 | if templ_7745c5c3_Err != nil { | 3762 | if templ_7745c5c3_Err != nil { | ||
| 3719 | return templ_7745c5c3_Err | 3763 | return templ_7745c5c3_Err | ||
| 3720 | } | 3764 | } | ||
| 3721 | } | 3765 | } | ||
| 3722 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 346, "<section aria-labelledby=\"r-cli\"><h2 id=\"r-cli\">From a terminal</h2>") | 3766 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 351, "<section aria-labelledby=\"r-cli\"><h2 id=\"r-cli\">From a terminal</h2>") |
| 3723 | if templ_7745c5c3_Err != nil { | 3767 | if templ_7745c5c3_Err != nil { | ||
| 3724 | return templ_7745c5c3_Err | 3768 | return templ_7745c5c3_Err | ||
| 3725 | } | 3769 | } | ||
| @@ -3727,7 +3771,7 @@ func compareRail(p ComparePage) templ.Component { | |||||
| 3727 | if templ_7745c5c3_Err != nil { | 3771 | if templ_7745c5c3_Err != nil { | ||
| 3728 | return templ_7745c5c3_Err | 3772 | return templ_7745c5c3_Err | ||
| 3729 | } | 3773 | } | ||
| 3730 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 347, "</section>") | 3774 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 352, "</section>") |
| 3731 | if templ_7745c5c3_Err != nil { | 3775 | if templ_7745c5c3_Err != nil { | ||
| 3732 | return templ_7745c5c3_Err | 3776 | return templ_7745c5c3_Err | ||
| 3733 | } | 3777 | } | ||
M internal/adapters/web/mr_test.go +32 -0
| @@ -128,3 +128,35 @@ func TestMergeabilityLiveEvents(t *testing.T) { | |||
| 128 | 128 | require.NoError(t, err) | |
| 129 | 129 | assert.Empty(t, fs) | |
| 130 | 130 | } | |
| 131 | + | ||
| 132 | + | func TestMRPanelsAndMenus(t *testing.T) { | |
| 133 | + | p := MRPage{CommitCount: "500+", CommitsNote: "more commits", Modes: []string{"squash", "merge"}, ChecksBlock: true, | |
| 134 | + | ChecksSum: ChecksSummary{Total: 2, Label: "1/2", Title: "1/2 failed"}, Box: &MergeBox{Signed: true, Fingerprint: "fingerprint", HeadGone: true}} | |
| 135 | + | footer := renderToString(t, mrFooter(p)) | |
| 136 | + | assert.Contains(t, footer, `<footer class="mr-footer"><details id="mr-panels">`) | |
| 137 | + | assert.Contains(t, footer, `data-mr-tabs`) | |
| 138 | + | assert.Contains(t, footer, `id="mr-commits"`) | |
| 139 | + | assert.Contains(t, footer, `id="mr-checks"`) | |
| 140 | + | assert.Contains(t, footer, `<table class="mr-commits">`) | |
| 141 | + | assert.Contains(t, footer, "500+") | |
| 142 | + | assert.Contains(t, footer, "more commits") | |
| 143 | + | assert.Contains(t, footer, "1/2 failed") | |
| 144 | + | rail := renderToString(t, mrRail(p)) | |
| 145 | + | assert.Contains(t, rail, "g f") | |
| 146 | + | for _, text := range []string{"Checks", "Commits", "Settings", "mr-checks"} { | |
| 147 | + | assert.NotContains(t, rail, text) | |
| 148 | + | } | |
| 149 | + | more := renderToString(t, moreMenu(p)) | |
| 150 | + | for _, text := range []string{"Merge settings", "squash, merge", "failing ones block", `id="mr-signing"`, "fingerprint", "ermite signing-key show"} { | |
| 151 | + | assert.Contains(t, more, text) | |
| 152 | + | } | |
| 153 | + | merge := renderToString(t, mergeMenu(p)) | |
| 154 | + | assert.NotContains(t, merge, `<dl`) | |
| 155 | + | assert.NotContains(t, merge, `mr-signing`) | |
| 156 | + | assert.Contains(t, merge, "the source branch was deleted") | |
| 157 | + | bar := renderToString(t, mrBar(MRPage{})) | |
| 158 | + | assert.Contains(t, bar, `id="mr-ck"`) | |
| 159 | + | assert.Contains(t, bar, `href="#mr-checks"`) | |
| 160 | + | assert.Contains(t, bar, "Merge settings") | |
| 161 | + | assert.NotContains(t, bar, ">Close</button>") | |
| 162 | + | } | |
| @@ -128,3 +128,35 @@ func TestMergeabilityLiveEvents(t *testing.T) { | |||||
| 128 | require.NoError(t, err) | 128 | require.NoError(t, err) | ||
| 129 | assert.Empty(t, fs) | 129 | assert.Empty(t, fs) | ||
| 130 | } | 130 | } | ||
| 131 | + | ||||
| 132 | + | func TestMRPanelsAndMenus(t *testing.T) { | |||
| 133 | + | p := MRPage{CommitCount: "500+", CommitsNote: "more commits", Modes: []string{"squash", "merge"}, ChecksBlock: true, | |||
| 134 | + | ChecksSum: ChecksSummary{Total: 2, Label: "1/2", Title: "1/2 failed"}, Box: &MergeBox{Signed: true, Fingerprint: "fingerprint", HeadGone: true}} | |||
| 135 | + | footer := renderToString(t, mrFooter(p)) | |||
| 136 | + | assert.Contains(t, footer, `<footer class="mr-footer"><details id="mr-panels">`) | |||
| 137 | + | assert.Contains(t, footer, `data-mr-tabs`) | |||
| 138 | + | assert.Contains(t, footer, `id="mr-commits"`) | |||
| 139 | + | assert.Contains(t, footer, `id="mr-checks"`) | |||
| 140 | + | assert.Contains(t, footer, `<table class="mr-commits">`) | |||
| 141 | + | assert.Contains(t, footer, "500+") | |||
| 142 | + | assert.Contains(t, footer, "more commits") | |||
| 143 | + | assert.Contains(t, footer, "1/2 failed") | |||
| 144 | + | rail := renderToString(t, mrRail(p)) | |||
| 145 | + | assert.Contains(t, rail, "g f") | |||
| 146 | + | for _, text := range []string{"Checks", "Commits", "Settings", "mr-checks"} { | |||
| 147 | + | assert.NotContains(t, rail, text) | |||
| 148 | + | } | |||
| 149 | + | more := renderToString(t, moreMenu(p)) | |||
| 150 | + | for _, text := range []string{"Merge settings", "squash, merge", "failing ones block", `id="mr-signing"`, "fingerprint", "ermite signing-key show"} { | |||
| 151 | + | assert.Contains(t, more, text) | |||
| 152 | + | } | |||
| 153 | + | merge := renderToString(t, mergeMenu(p)) | |||
| 154 | + | assert.NotContains(t, merge, `<dl`) | |||
| 155 | + | assert.NotContains(t, merge, `mr-signing`) | |||
| 156 | + | assert.Contains(t, merge, "the source branch was deleted") | |||
| 157 | + | bar := renderToString(t, mrBar(MRPage{})) | |||
| 158 | + | assert.Contains(t, bar, `id="mr-ck"`) | |||
| 159 | + | assert.Contains(t, bar, `href="#mr-checks"`) | |||
| 160 | + | assert.Contains(t, bar, "Merge settings") | |||
| 161 | + | assert.NotContains(t, bar, ">Close</button>") | |||
| 162 | + | } | |||
M internal/adapters/web/signature_test.go +1 -1
| @@ -145,7 +145,7 @@ func TestCommitPageShowsTheSignature(t *testing.T) { | |||
| 145 | 145 | func TestMergeRequestCommitsShowTheSignatureBadge(t *testing.T) { | |
| 146 | 146 | t.Parallel() | |
| 147 | 147 | signed := signatureBadge(verification(domain.FormatGPG, domain.StatusVerified, gpgFP, ""), false) | |
| 148 | - | got := renderToString(t, mrRail(MRPage{Commits: []MRCommit{ | |
| 148 | + | got := renderToString(t, mrFooter(MRPage{Commits: []MRCommit{ | |
| 149 | 149 | {Short: "aaaaaaa", Href: "/r/commit/a", Subject: "signed", Sig: signed}, | |
| 150 | 150 | {Short: "bbbbbbb", Href: "/r/commit/b", Subject: "unsigned"}, | |
| 151 | 151 | }})) | |
| @@ -145,7 +145,7 @@ func TestCommitPageShowsTheSignature(t *testing.T) { | |||||
| 145 | func TestMergeRequestCommitsShowTheSignatureBadge(t *testing.T) { | 145 | func TestMergeRequestCommitsShowTheSignatureBadge(t *testing.T) { | ||
| 146 | t.Parallel() | 146 | t.Parallel() | ||
| 147 | signed := signatureBadge(verification(domain.FormatGPG, domain.StatusVerified, gpgFP, ""), false) | 147 | signed := signatureBadge(verification(domain.FormatGPG, domain.StatusVerified, gpgFP, ""), false) | ||
| 148 | - | got := renderToString(t, mrRail(MRPage{Commits: []MRCommit{ | 148 | + | got := renderToString(t, mrFooter(MRPage{Commits: []MRCommit{ |
| 149 | {Short: "aaaaaaa", Href: "/r/commit/a", Subject: "signed", Sig: signed}, | 149 | {Short: "aaaaaaa", Href: "/r/commit/a", Subject: "signed", Sig: signed}, | ||
| 150 | {Short: "bbbbbbb", Href: "/r/commit/b", Subject: "unsigned"}, | 150 | {Short: "bbbbbbb", Href: "/r/commit/b", Subject: "unsigned"}, | ||
| 151 | }})) | 151 | }})) | ||
M internal/adapters/web/static/css/60-mr.css +19 -2
| @@ -8,6 +8,23 @@ | |||
| 8 | 8 | & > .mr-desc.prose { border: 0; border-top: 1px solid var(--border); border-radius: 0; } | |
| 9 | 9 | } | |
| 10 | 10 | ||
| 11 | + | .mr-footer { | |
| 12 | + | border-top: 1px solid var(--border); padding: var(--s3) var(--s5); | |
| 13 | + | font-size: var(--fs-s); | |
| 14 | + | & summary { cursor: pointer; color: var(--ink-dim); } | |
| 15 | + | & nav { display: flex; gap: var(--s3); padding-block: var(--s3); } | |
| 16 | + | & [role="tab"] { padding: var(--s1) var(--s2); border-radius: var(--r-s); } | |
| 17 | + | & [aria-selected="true"] { background: var(--bg-raised); color: var(--ink-hi); } | |
| 18 | + | & [data-mr-panel] { overflow-x: auto; } | |
| 19 | + | & [hidden] { display: none; } | |
| 20 | + | & section h2 { font-size: var(--fs-s); color: var(--ink-dim); } | |
| 21 | + | & table { width: 100%; border-collapse: collapse; } | |
| 22 | + | & th, & td { text-align: left; padding: var(--s2); border-bottom: 1px solid var(--border); } | |
| 23 | + | & th { color: var(--ink-dim); font-weight: 500; } | |
| 24 | + | } | |
| 25 | + | .merge-settings { font-size: var(--fs-s); color: var(--ink-dim); } | |
| 26 | + | .merge-settings h2 { font-size: var(--fs-s); } | |
| 27 | + | ||
| 11 | 28 | .mr-state[data-state="open"]::before { content: "● "; color: var(--teal); } | |
| 12 | 29 | .mr-state[data-state="merged"]::before { content: "✓ "; color: var(--teal); } | |
| 13 | 30 | .mr-state[data-state="closed"]::before { content: "✗ "; color: var(--red); } | |
| @@ -112,11 +129,11 @@ | |||
| 112 | 129 | & .d-or > summary:hover { color: var(--ink-hi); } | |
| 113 | 130 | & .d-or[open] > .clone { margin-top: var(--s2); } | |
| 114 | 131 | & .clone code { white-space: pre-wrap; overflow-wrap: anywhere; } | |
| 132 | + | & #mr-signing code { overflow-wrap: anywhere; } | |
| 115 | 133 | } | |
| 116 | 134 | ||
| 117 | 135 | /* the rail of a merge request follows the review: it sticks under the | |
| 118 | - | header, one screen high, and scrolls on its own to its checks, commits | |
| 119 | - | and settings. The list of files keeps its own scroll, under a height, so | |
| 136 | + | header, one screen high, and scrolls on its own to its verdicts. The list of files keeps its own scroll, under a height, so | |
| 120 | 137 | that the blocks below it stay in reach. Only on a two-column layout. */ | |
| 121 | 138 | @media (min-width: 1081px) { | |
| 122 | 139 | .rail:has(.r-files) { | |
| @@ -8,6 +8,23 @@ | |||||
| 8 | & > .mr-desc.prose { border: 0; border-top: 1px solid var(--border); border-radius: 0; } | 8 | & > .mr-desc.prose { border: 0; border-top: 1px solid var(--border); border-radius: 0; } | ||
| 9 | } | 9 | } | ||
| 10 | 10 | ||||
| 11 | + | .mr-footer { | |||
| 12 | + | border-top: 1px solid var(--border); padding: var(--s3) var(--s5); | |||
| 13 | + | font-size: var(--fs-s); | |||
| 14 | + | & summary { cursor: pointer; color: var(--ink-dim); } | |||
| 15 | + | & nav { display: flex; gap: var(--s3); padding-block: var(--s3); } | |||
| 16 | + | & [role="tab"] { padding: var(--s1) var(--s2); border-radius: var(--r-s); } | |||
| 17 | + | & [aria-selected="true"] { background: var(--bg-raised); color: var(--ink-hi); } | |||
| 18 | + | & [data-mr-panel] { overflow-x: auto; } | |||
| 19 | + | & [hidden] { display: none; } | |||
| 20 | + | & section h2 { font-size: var(--fs-s); color: var(--ink-dim); } | |||
| 21 | + | & table { width: 100%; border-collapse: collapse; } | |||
| 22 | + | & th, & td { text-align: left; padding: var(--s2); border-bottom: 1px solid var(--border); } | |||
| 23 | + | & th { color: var(--ink-dim); font-weight: 500; } | |||
| 24 | + | } | |||
| 25 | + | .merge-settings { font-size: var(--fs-s); color: var(--ink-dim); } | |||
| 26 | + | .merge-settings h2 { font-size: var(--fs-s); } | |||
| 27 | + | ||||
| 11 | .mr-state[data-state="open"]::before { content: "● "; color: var(--teal); } | 28 | .mr-state[data-state="open"]::before { content: "● "; color: var(--teal); } | ||
| 12 | .mr-state[data-state="merged"]::before { content: "✓ "; color: var(--teal); } | 29 | .mr-state[data-state="merged"]::before { content: "✓ "; color: var(--teal); } | ||
| 13 | .mr-state[data-state="closed"]::before { content: "✗ "; color: var(--red); } | 30 | .mr-state[data-state="closed"]::before { content: "✗ "; color: var(--red); } | ||
| @@ -112,11 +129,11 @@ | |||||
| 112 | & .d-or > summary:hover { color: var(--ink-hi); } | 129 | & .d-or > summary:hover { color: var(--ink-hi); } | ||
| 113 | & .d-or[open] > .clone { margin-top: var(--s2); } | 130 | & .d-or[open] > .clone { margin-top: var(--s2); } | ||
| 114 | & .clone code { white-space: pre-wrap; overflow-wrap: anywhere; } | 131 | & .clone code { white-space: pre-wrap; overflow-wrap: anywhere; } | ||
| 132 | + | & #mr-signing code { overflow-wrap: anywhere; } | |||
| 115 | } | 133 | } | ||
| 116 | 134 | ||||
| 117 | /* the rail of a merge request follows the review: it sticks under the | 135 | /* the rail of a merge request follows the review: it sticks under the | ||
| 118 | - | header, one screen high, and scrolls on its own to its checks, commits | 136 | + | header, one screen high, and scrolls on its own to its verdicts. The list of files keeps its own scroll, under a height, so |
| 119 | - | and settings. The list of files keeps its own scroll, under a height, so | |||
| 120 | that the blocks below it stay in reach. Only on a two-column layout. */ | 137 | that the blocks below it stay in reach. Only on a two-column layout. */ | ||
| 121 | @media (min-width: 1081px) { | 138 | @media (min-width: 1081px) { | ||
| 122 | .rail:has(.r-files) { | 139 | .rail:has(.r-files) { | ||
M internal/adapters/web/static/js/mr.js +54 -1
| @@ -49,6 +49,13 @@ window.ermiteMR = (() => { | |||
| 49 | 49 | if (/^[1-9]$/.test(key) && Number(key) <= modes) return { mode: Number(key) - 1 }; | |
| 50 | 50 | return null; | |
| 51 | 51 | }, | |
| 52 | + | tabIndex(key, index, count) { | |
| 53 | + | if (key === 'Home') return 0; | |
| 54 | + | if (key === 'End') return count - 1; | |
| 55 | + | if (key === 'ArrowRight') return (index + 1) % count; | |
| 56 | + | if (key === 'ArrowLeft') return (index + count - 1) % count; | |
| 57 | + | return null; | |
| 58 | + | }, | |
| 52 | 59 | // step moves an index within [0, n). | |
| 53 | 60 | step(i, d, n) { | |
| 54 | 61 | if (n === 0) return -1; | |
| @@ -285,8 +292,54 @@ window.ermiteMR = (() => { | |||
| 285 | 292 | reveal(id); | |
| 286 | 293 | } | |
| 287 | 294 | ||
| 295 | + | // Enhance the ordinary anchor navigation only when scripts are available. | |
| 296 | + | function panels() { | |
| 297 | + | const footer = $('#mr-panels'), nav = $('[data-mr-tabs]'); | |
| 298 | + | if (!footer || !nav) return; | |
| 299 | + | const tabs = $$('a', nav), panels = $$('[data-mr-panel]', footer); | |
| 300 | + | nav.setAttribute('role', 'tablist'); | |
| 301 | + | function select(index, focus = false) { | |
| 302 | + | tabs.forEach((tab, i) => { | |
| 303 | + | tab.setAttribute('role', 'tab'); | |
| 304 | + | tab.setAttribute('aria-controls', panels[i].id); | |
| 305 | + | tab.setAttribute('aria-selected', String(i === index)); | |
| 306 | + | tab.tabIndex = i === index ? 0 : -1; | |
| 307 | + | panels[i].setAttribute('role', 'tabpanel'); | |
| 308 | + | panels[i].tabIndex = 0; | |
| 309 | + | panels[i].hidden = i !== index; | |
| 310 | + | }); | |
| 311 | + | if (focus) tabs[index].focus(); | |
| 312 | + | } | |
| 313 | + | tabs.forEach((tab, i) => { | |
| 314 | + | tab.addEventListener('click', (e) => { e.preventDefault(); select(i); }); | |
| 315 | + | tab.addEventListener('keydown', (e) => { | |
| 316 | + | const next = core.tabIndex(e.key, i, tabs.length); | |
| 317 | + | if (next === null) return; | |
| 318 | + | e.preventDefault(); select(next, true); | |
| 319 | + | }); | |
| 320 | + | }); | |
| 321 | + | function hash() { | |
| 322 | + | const index = location.hash === '#mr-checks' ? 1 : location.hash === '#mr-commits' ? 0 : -1; | |
| 323 | + | if (index < 0) return; | |
| 324 | + | footer.open = true; select(index); | |
| 325 | + | } | |
| 326 | + | // A repeated click on the same hash must also reopen a folded footer. | |
| 327 | + | document.addEventListener('click', (e) => { | |
| 328 | + | if (e.target.closest?.('#mr-ck')) { footer.open = true; select(1); } | |
| 329 | + | }); | |
| 330 | + | const summary = $('#mr-ck'); | |
| 331 | + | if (summary) { | |
| 332 | + | const sync = () => { $('[data-checks-label]', nav).textContent = $('#mr-ck')?.title || $('#mr-ck')?.textContent.trim() || 'no checks'; }; | |
| 333 | + | new MutationObserver(sync).observe(summary.parentElement, { childList: true, subtree: true, characterData: true }); | |
| 334 | + | sync(); | |
| 335 | + | } | |
| 336 | + | select(0); hash(); | |
| 337 | + | addEventListener('hashchange', hash); | |
| 338 | + | } | |
| 339 | + | ||
| 288 | 340 | function start() { | |
| 289 | 341 | if (!$('#diffs[data-mr]')) return; | |
| 342 | + | panels(); | |
| 290 | 343 | let folded = false; | |
| 291 | 344 | try { folded = localStorage.getItem('mr-files-folded') === '1'; } catch { /* no storage: open */ } | |
| 292 | 345 | if (folded) foldFiles(true); | |
| @@ -316,7 +369,7 @@ window.ermiteMR = (() => { | |||
| 316 | 369 | }); | |
| 317 | 370 | } | |
| 318 | 371 | ||
| 319 | - | return { core, start, load, reveal, openMerge, menuKey, markRead, focusFiles, stepFiles, leaveFiles, foldFiles, openFile }; | |
| 372 | + | return { core, panels, start, load, reveal, openMerge, menuKey, markRead, focusFiles, stepFiles, leaveFiles, foldFiles, openFile }; | |
| 320 | 373 | })(); | |
| 321 | 374 | ||
| 322 | 375 | if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', () => window.ermiteMR.start()); | |
| @@ -49,6 +49,13 @@ window.ermiteMR = (() => { | |||||
| 49 | if (/^[1-9]$/.test(key) && Number(key) <= modes) return { mode: Number(key) - 1 }; | 49 | if (/^[1-9]$/.test(key) && Number(key) <= modes) return { mode: Number(key) - 1 }; | ||
| 50 | return null; | 50 | return null; | ||
| 51 | }, | 51 | }, | ||
| 52 | + | tabIndex(key, index, count) { | |||
| 53 | + | if (key === 'Home') return 0; | |||
| 54 | + | if (key === 'End') return count - 1; | |||
| 55 | + | if (key === 'ArrowRight') return (index + 1) % count; | |||
| 56 | + | if (key === 'ArrowLeft') return (index + count - 1) % count; | |||
| 57 | + | return null; | |||
| 58 | + | }, | |||
| 52 | // step moves an index within [0, n). | 59 | // step moves an index within [0, n). | ||
| 53 | step(i, d, n) { | 60 | step(i, d, n) { | ||
| 54 | if (n === 0) return -1; | 61 | if (n === 0) return -1; | ||
| @@ -285,8 +292,54 @@ window.ermiteMR = (() => { | |||||
| 285 | reveal(id); | 292 | reveal(id); | ||
| 286 | } | 293 | } | ||
| 287 | 294 | ||||
| 295 | + | // Enhance the ordinary anchor navigation only when scripts are available. | |||
| 296 | + | function panels() { | |||
| 297 | + | const footer = $('#mr-panels'), nav = $('[data-mr-tabs]'); | |||
| 298 | + | if (!footer || !nav) return; | |||
| 299 | + | const tabs = $$('a', nav), panels = $$('[data-mr-panel]', footer); | |||
| 300 | + | nav.setAttribute('role', 'tablist'); | |||
| 301 | + | function select(index, focus = false) { | |||
| 302 | + | tabs.forEach((tab, i) => { | |||
| 303 | + | tab.setAttribute('role', 'tab'); | |||
| 304 | + | tab.setAttribute('aria-controls', panels[i].id); | |||
| 305 | + | tab.setAttribute('aria-selected', String(i === index)); | |||
| 306 | + | tab.tabIndex = i === index ? 0 : -1; | |||
| 307 | + | panels[i].setAttribute('role', 'tabpanel'); | |||
| 308 | + | panels[i].tabIndex = 0; | |||
| 309 | + | panels[i].hidden = i !== index; | |||
| 310 | + | }); | |||
| 311 | + | if (focus) tabs[index].focus(); | |||
| 312 | + | } | |||
| 313 | + | tabs.forEach((tab, i) => { | |||
| 314 | + | tab.addEventListener('click', (e) => { e.preventDefault(); select(i); }); | |||
| 315 | + | tab.addEventListener('keydown', (e) => { | |||
| 316 | + | const next = core.tabIndex(e.key, i, tabs.length); | |||
| 317 | + | if (next === null) return; | |||
| 318 | + | e.preventDefault(); select(next, true); | |||
| 319 | + | }); | |||
| 320 | + | }); | |||
| 321 | + | function hash() { | |||
| 322 | + | const index = location.hash === '#mr-checks' ? 1 : location.hash === '#mr-commits' ? 0 : -1; | |||
| 323 | + | if (index < 0) return; | |||
| 324 | + | footer.open = true; select(index); | |||
| 325 | + | } | |||
| 326 | + | // A repeated click on the same hash must also reopen a folded footer. | |||
| 327 | + | document.addEventListener('click', (e) => { | |||
| 328 | + | if (e.target.closest?.('#mr-ck')) { footer.open = true; select(1); } | |||
| 329 | + | }); | |||
| 330 | + | const summary = $('#mr-ck'); | |||
| 331 | + | if (summary) { | |||
| 332 | + | const sync = () => { $('[data-checks-label]', nav).textContent = $('#mr-ck')?.title || $('#mr-ck')?.textContent.trim() || 'no checks'; }; | |||
| 333 | + | new MutationObserver(sync).observe(summary.parentElement, { childList: true, subtree: true, characterData: true }); | |||
| 334 | + | sync(); | |||
| 335 | + | } | |||
| 336 | + | select(0); hash(); | |||
| 337 | + | addEventListener('hashchange', hash); | |||
| 338 | + | } | |||
| 339 | + | ||||
| 288 | function start() { | 340 | function start() { | ||
| 289 | if (!$('#diffs[data-mr]')) return; | 341 | if (!$('#diffs[data-mr]')) return; | ||
| 342 | + | panels(); | |||
| 290 | let folded = false; | 343 | let folded = false; | ||
| 291 | try { folded = localStorage.getItem('mr-files-folded') === '1'; } catch { /* no storage: open */ } | 344 | try { folded = localStorage.getItem('mr-files-folded') === '1'; } catch { /* no storage: open */ } | ||
| 292 | if (folded) foldFiles(true); | 345 | if (folded) foldFiles(true); | ||
| @@ -316,7 +369,7 @@ window.ermiteMR = (() => { | |||||
| 316 | }); | 369 | }); | ||
| 317 | } | 370 | } | ||
| 318 | 371 | ||||
| 319 | - | return { core, start, load, reveal, openMerge, menuKey, markRead, focusFiles, stepFiles, leaveFiles, foldFiles, openFile }; | 372 | + | return { core, panels, start, load, reveal, openMerge, menuKey, markRead, focusFiles, stepFiles, leaveFiles, foldFiles, openFile }; |
| 320 | })(); | 373 | })(); | ||
| 321 | 374 | ||||
| 322 | if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', () => window.ermiteMR.start()); | 375 | if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', () => window.ermiteMR.start()); | ||
M internal/app/web_mr_test.go +1 -1
| @@ -335,7 +335,7 @@ func TestWebMergeRequestReviewAndFastForward(t *testing.T) { | |||
| 335 | 335 | all := b.get(base, as(token)) | |
| 336 | 336 | assert.Contains(t, all.body, `href="/proj/merge-requests/1/since"`) | |
| 337 | 337 | assert.Contains(t, all.body, "since your last read") | |
| 338 | - | assert.Contains(t, all.body, "<li data-new>", "the commit pushed since is marked") | |
| 338 | + | assert.Contains(t, all.body, "<tr data-new>", "the commit pushed since is marked") | |
| 339 | 339 | assert.Contains(t, all.body, "data-read>Mark read") | |
| 340 | 340 | assert.Contains(t, all.body, "outdated", "the notes were written on the earlier head") | |
| 341 | 341 | since := b.get(base+"/since", as(token)) | |
| @@ -335,7 +335,7 @@ func TestWebMergeRequestReviewAndFastForward(t *testing.T) { | |||||
| 335 | all := b.get(base, as(token)) | 335 | all := b.get(base, as(token)) | ||
| 336 | assert.Contains(t, all.body, `href="/proj/merge-requests/1/since"`) | 336 | assert.Contains(t, all.body, `href="/proj/merge-requests/1/since"`) | ||
| 337 | assert.Contains(t, all.body, "since your last read") | 337 | assert.Contains(t, all.body, "since your last read") | ||
| 338 | - | assert.Contains(t, all.body, "<li data-new>", "the commit pushed since is marked") | 338 | + | assert.Contains(t, all.body, "<tr data-new>", "the commit pushed since is marked") |
| 339 | assert.Contains(t, all.body, "data-read>Mark read") | 339 | assert.Contains(t, all.body, "data-read>Mark read") | ||
| 340 | assert.Contains(t, all.body, "outdated", "the notes were written on the earlier head") | 340 | assert.Contains(t, all.body, "outdated", "the notes were written on the earlier head") | ||
| 341 | since := b.get(base+"/since", as(token)) | 341 | since := b.get(base+"/since", as(token)) | ||