feat(web): turn the MR footer into toggle tabs on a darker background
- commit
- f525ac63ebda2eef85f9d3a5de537ac635fb7cac
- author
- brice · · 2026-10-20 08:50 UTC
- parent
- 89e7d82
- signature
- GPG Verified
CD88F9E564E0102646FB6077A1A07C7C7C3E349D· arch-gpg Verified for the committer email
8 files · +649 -657
M docs/merge-requests.md +7 -5
| @@ -107,10 +107,12 @@ because it owns the merge-git port. | |||
| 107 | 107 | ||
| 108 | 108 | ### Review page panels | |
| 109 | 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 | |
| 110 | + | The main request card ends with a footer of two tabs, Commits and Checks, both | |
| 111 | + | collapsed by default. Clicking a tab opens its panel, clicking the open tab | |
| 112 | + | folds it again, clicking the other tab switches. Arrow keys (and Home / End) | |
| 113 | + | move between the tabs. Without scripts the tabs are anchor links and the URL | |
| 114 | + | fragment (`#mr-commits`, `#mr-checks`) shows the panel. The checks summary above | |
| 115 | + | the diff opens the Checks panel and continues to update live. Commit totals use `N+` when the branch | |
| 114 | 116 | list is capped: the reader's existing count operation counts all reachable | |
| 115 | 117 | ancestors, not the source-minus-target range. | |
| 116 | 118 | ||
| @@ -123,7 +125,7 @@ merge actions remain restricted to their existing permissions. | |||
| 123 | 125 | ||
| 124 | 126 | A push to the source branch refreshes the web review in place: the diff, files | |
| 125 | 127 | rail, commits/checks footer, diff range and merge controls follow the new head. | |
| 126 | - | The review keeps its visible file/line, folded files and selected footer tab. | |
| 128 | + | The review keeps its visible file/line, folded files and open footer panel. | |
| 127 | 129 | The page request still reads only one 25-file window of hunks; the visible | |
| 128 | 130 | anchor's window is fetched too if needed, and other windows remain lazy. | |
| 129 | 131 | ||
| @@ -107,10 +107,12 @@ because it owns the merge-git port. | |||||
| 107 | 107 | ||||
| 108 | ### Review page panels | 108 | ### Review page panels | ||
| 109 | 109 | ||||
| 110 | - | The main request card ends with a collapsed Commits / Checks footer. With | 110 | + | The main request card ends with a footer of two tabs, Commits and Checks, both |
| 111 | - | scripts, arrow keys (and Home / End) switch its tabs; without scripts, opening | 111 | + | collapsed by default. Clicking a tab opens its panel, clicking the open tab |
| 112 | - | the footer shows both sections. The checks summary above the diff opens the | 112 | + | folds it again, clicking the other tab switches. Arrow keys (and Home / End) |
| 113 | - | Checks tab and continues to update live. Commit totals use `N+` when the branch | 113 | + | move between the tabs. Without scripts the tabs are anchor links and the URL |
| 114 | + | fragment (`#mr-commits`, `#mr-checks`) shows the panel. The checks summary above | |||
| 115 | + | the diff opens the Checks panel 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 | 116 | list is capped: the reader's existing count operation counts all reachable | ||
| 115 | ancestors, not the source-minus-target range. | 117 | ancestors, not the source-minus-target range. | ||
| 116 | 118 | ||||
| @@ -123,7 +125,7 @@ merge actions remain restricted to their existing permissions. | |||||
| 123 | 125 | ||||
| 124 | A push to the source branch refreshes the web review in place: the diff, files | 126 | A push to the source branch refreshes the web review in place: the diff, files | ||
| 125 | rail, commits/checks footer, diff range and merge controls follow the new head. | 127 | rail, commits/checks footer, diff range and merge controls follow the new head. | ||
| 126 | - | The review keeps its visible file/line, folded files and selected footer tab. | 128 | + | The review keeps its visible file/line, folded files and open footer panel. |
| 127 | The page request still reads only one 25-file window of hunks; the visible | 129 | The page request still reads only one 25-file window of hunks; the visible | ||
| 128 | anchor's window is fetched too if needed, and other windows remain lazy. | 130 | anchor's window is fetched too if needed, and other windows remain lazy. | ||
| 129 | 131 | ||||
M internal/adapters/web/jstest/mr.test.mjs +72 -72
| @@ -93,98 +93,98 @@ for (const dataset of [{diff:'split'}, {view:'split'}]) test(`reveal selects the | |||
| 93 | 93 | } | |
| 94 | 94 | }); | |
| 95 | 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 oldHistory = globalThis.history; | |
| 101 | - | const listeners = {}; | |
| 102 | - | const replaced = []; | |
| 103 | - | globalThis.history = { replaceState: (...args) => replaced.push(args) }; | |
| 96 | + | function footerHarness(extra = {}) { | |
| 97 | + | const saved = Object.fromEntries(['document', 'location', 'addEventListener', 'history', 'MutationObserver'].map((k) => [k, globalThis[k]])); | |
| 104 | 98 | const node = (id) => ({ id, attrs: {}, events: {}, hidden: false, | |
| 105 | - | setAttribute(k,v) { this.attrs[k]=v; }, | |
| 106 | - | addEventListener(k,v) { this.events[k]=v; }, focus() { this.focused=true; } }); | |
| 99 | + | setAttribute(k, v) { this.attrs[k] = v; }, getAttribute(k) { return this.attrs[k] ?? null; }, | |
| 100 | + | addEventListener(k, v) { this.events[k] = v; }, focus() { this.focused = true; } }); | |
| 107 | 101 | const tabs = [node('mr-tab-commits'), node('mr-tab-checks')]; | |
| 108 | 102 | const panels = [node('mr-commits'), node('mr-checks-panel')]; | |
| 109 | - | const footer = node('mr-panels'); footer.open=false; | |
| 110 | - | const nav = node('tabs'); nav.querySelectorAll=()=>tabs; | |
| 111 | - | footer.querySelectorAll=()=>panels; | |
| 112 | - | globalThis.document = {querySelector: (s) => s === '#mr-panels' ? footer : s === '[data-mr-tabs]' ? nav : null, | |
| 113 | - | addEventListener(k,v) {listeners[k]=v;} }; | |
| 114 | - | globalThis.location = {hash:''}; | |
| 115 | - | globalThis.addEventListener = (k,v) => {listeners[k]=v;}; | |
| 103 | + | const footer = node('footer'); footer.querySelectorAll = () => panels; | |
| 104 | + | const nav = node('tabs'); nav.querySelectorAll = () => tabs; | |
| 105 | + | const listeners = {}, replaced = []; | |
| 106 | + | globalThis.document = { querySelector: (s) => s === '.mr-footer' ? footer : s === '[data-mr-tabs]' ? nav : s === '#mr-ck' ? extra.summary ?? null : null, | |
| 107 | + | querySelectorAll: (s) => s === '[data-mr-tabs] a' ? tabs : [], addEventListener(k, v) { listeners[k] = v; } }; | |
| 108 | + | globalThis.location = { hash: '', pathname: '/demo/merge-requests/1', search: '?x=1' }; | |
| 109 | + | globalThis.addEventListener = (k, v) => { listeners[k] = v; }; | |
| 110 | + | globalThis.history = { replaceState: (...args) => replaced.push(args) }; | |
| 111 | + | const restore = () => { for (const [k, v] of Object.entries(saved)) { if (v === undefined) delete globalThis[k]; else globalThis[k] = v; } }; | |
| 112 | + | const state = () => panels.map((p) => !p.hidden); | |
| 113 | + | return { tabs, panels, listeners, replaced, restore, state }; | |
| 114 | + | } | |
| 115 | + | ||
| 116 | + | test('footer tabs: closed by default, toggle, switch, arrows, hash', () => { | |
| 117 | + | const h = footerHarness(); | |
| 116 | 118 | try { | |
| 117 | 119 | window.ermiteMR.panels(); | |
| 118 | - | assert.equal(footer.open,false); | |
| 119 | - | assert.equal(panels[0].hidden,false); | |
| 120 | - | assert.equal(panels[1].hidden,true); | |
| 121 | - | assert.deepEqual(replaced, [], 'initial selection leaves the URL alone'); | |
| 122 | - | tabs[1].events.click({preventDefault(){}}); | |
| 123 | - | assert.deepEqual(replaced, [[null, '', '#mr-checks-panel']]); | |
| 124 | - | assert.equal(panels[0].hidden,true); | |
| 125 | - | assert.equal(tabs[1].attrs['aria-selected'],'true'); | |
| 126 | - | tabs[1].events.keydown({key:'ArrowRight',preventDefault(){}}); | |
| 127 | - | assert.equal(tabs[0].focused,true); | |
| 128 | - | assert.equal(panels[0].hidden,false); | |
| 129 | - | assert.deepEqual(replaced.at(-1), [null, '', '#mr-commits']); | |
| 130 | - | location.hash='#mr-checks'; replaced.length = 0; listeners.hashchange(); | |
| 131 | - | assert.deepEqual(replaced, [], 'hash navigation does not rewrite the URL'); | |
| 132 | - | assert.equal(footer.open,true); | |
| 133 | - | assert.equal(panels[1].hidden,false); | |
| 134 | - | footer.open=false; | |
| 135 | - | listeners.click({target:{closest:()=>true}}); | |
| 136 | - | assert.equal(footer.open,true); | |
| 137 | - | assert.equal(C.tabIndex('Home',1,2),0); | |
| 138 | - | assert.equal(C.tabIndex('End',0,2),1); | |
| 139 | - | assert.equal(C.tabIndex('ArrowLeft',0,2),1); | |
| 140 | - | assert.equal(C.tabIndex('Escape',0,2),null); | |
| 141 | - | } finally { | |
| 142 | - | globalThis.document=oldDocument; globalThis.location=oldLocation; globalThis.addEventListener=oldAdd; | |
| 143 | - | if (oldHistory === undefined) delete globalThis.history; else globalThis.history = oldHistory; | |
| 144 | - | } | |
| 120 | + | assert.deepEqual(h.state(), [false, false], 'initially closed'); | |
| 121 | + | assert.equal(h.tabs[0].attrs['aria-expanded'], 'false'); | |
| 122 | + | assert.deepEqual(h.replaced, [], 'initial state leaves the URL alone'); | |
| 123 | + | h.tabs[1].events.click({ preventDefault() {} }); | |
| 124 | + | assert.deepEqual(h.state(), [false, true]); | |
| 125 | + | assert.equal(h.tabs[1].attrs['aria-expanded'], 'true'); | |
| 126 | + | assert.deepEqual(h.replaced, [[null, '', '#mr-checks-panel']]); | |
| 127 | + | location.hash = '#mr-checks-panel'; | |
| 128 | + | h.tabs[1].events.click({ preventDefault() {} }); | |
| 129 | + | assert.deepEqual(h.state(), [false, false], 'a second click closes'); | |
| 130 | + | assert.deepEqual(h.replaced.at(-1), [null, '', '/demo/merge-requests/1?x=1'], 'closing clears the fragment'); | |
| 131 | + | location.hash = ''; | |
| 132 | + | h.tabs[1].events.click({ preventDefault() {} }); | |
| 133 | + | h.tabs[0].events.click({ preventDefault() {} }); | |
| 134 | + | assert.deepEqual(h.state(), [true, false], 'the other tab switches'); | |
| 135 | + | h.tabs[0].events.keydown({ key: 'ArrowRight', preventDefault() {} }); | |
| 136 | + | assert.equal(h.tabs[1].focused, true, 'arrows move focus only'); | |
| 137 | + | assert.deepEqual(h.state(), [true, false]); | |
| 138 | + | location.hash = '#mr-checks'; h.replaced.length = 0; h.listeners.hashchange(); | |
| 139 | + | assert.deepEqual(h.state(), [false, true], 'hash opens checks'); | |
| 140 | + | assert.deepEqual(h.replaced, [], 'hash navigation does not rewrite the URL'); | |
| 141 | + | location.hash = '#mr-commits'; h.listeners.hashchange(); | |
| 142 | + | assert.deepEqual(h.state(), [true, false]); | |
| 143 | + | assert.equal(C.tabIndex('Home', 1, 2), 0); | |
| 144 | + | assert.equal(C.tabIndex('End', 0, 2), 1); | |
| 145 | + | assert.equal(C.tabIndex('ArrowLeft', 0, 2), 1); | |
| 146 | + | assert.equal(C.tabIndex('Escape', 0, 2), null); | |
| 147 | + | } finally { h.restore(); } | |
| 145 | 148 | }); | |
| 146 | 149 | ||
| 147 | - | test('footer: #mr-ck syncs the checks label and a click opens the footer on Checks', () => { | |
| 148 | - | const saved = Object.fromEntries(['document', 'location', 'addEventListener', 'history', 'MutationObserver'].map((k) => [k, globalThis[k]])); | |
| 149 | - | const node = (id) => ({ id, attrs: {}, events: {}, hidden: false, | |
| 150 | - | setAttribute(k, v) { this.attrs[k] = v; }, addEventListener(k, v) { this.events[k] = v; }, focus() {} }); | |
| 151 | - | const tabs = [node('t0'), node('t1')]; | |
| 152 | - | const panels = [node('mr-commits'), node('mr-checks-panel')]; | |
| 153 | - | const footer = node('mr-panels'); footer.open = false; footer.querySelectorAll = () => panels; | |
| 154 | - | let writes = 0, text = ''; | |
| 155 | - | const label = { get textContent() { return text; }, set textContent(v) { writes++; text = v; } }; | |
| 156 | - | const nav = node('tabs'); nav.querySelectorAll = () => tabs; | |
| 157 | - | nav.querySelector = (s) => s === '[data-checks-label]' ? label : null; | |
| 150 | + | test('footer: #mr-ck syncs the checks label; its click opens Checks without toggling', () => { | |
| 151 | + | const text0 = { v: '' }; let writes = 0; | |
| 152 | + | const label = { get textContent() { return text0.v; }, set textContent(v) { writes++; text0.v = v; } }; | |
| 158 | 153 | const summary = { title: '1/2 failed', textContent: ' 1/2 ', parentElement: {} }; | |
| 159 | - | const listeners = {}; | |
| 154 | + | const h = footerHarness({ summary }); | |
| 160 | 155 | let observed = null, callback = null; | |
| 161 | 156 | globalThis.MutationObserver = class { constructor(fn) { callback = fn; } observe(target, opts) { observed = [target, opts]; } }; | |
| 162 | - | globalThis.document = { querySelector: (s) => s === '#mr-panels' ? footer : s === '[data-mr-tabs]' ? nav : s === '#mr-ck' ? summary : null, | |
| 163 | - | addEventListener(k, v) { listeners[k] = v; } }; | |
| 164 | - | globalThis.location = { hash: '' }; | |
| 165 | - | globalThis.addEventListener = () => {}; | |
| 166 | - | globalThis.history = { replaceState() {} }; | |
| 157 | + | const nav = document.querySelector('[data-mr-tabs]'); | |
| 158 | + | nav.querySelector = (s) => s === '[data-checks-label]' ? label : null; | |
| 167 | 159 | try { | |
| 168 | 160 | window.ermiteMR.panels(); | |
| 169 | 161 | assert.equal(label.textContent, '1/2 failed', 'initial label sync'); | |
| 170 | 162 | assert.equal(observed[0], summary.parentElement); | |
| 171 | - | // A mutation elsewhere in the bar (hx-live rewriting a label) must not | |
| 172 | - | // write the label again, or hx-live wakes up on its own write forever. | |
| 173 | 163 | assert.deepEqual(observed[1], { childList: true }, 'only #mr-ck replacements wake the observer'); | |
| 174 | 164 | const before = writes; callback(); callback(); | |
| 175 | 165 | assert.equal(writes, before, 'an unchanged label is not written'); | |
| 176 | 166 | summary.title = ''; callback(); | |
| 177 | - | assert.equal(label.textContent, '1/2', 'observer re-syncs from the text'); | |
| 167 | + | assert.equal(label.textContent, '1/2'); | |
| 178 | 168 | summary.textContent = ' '; callback(); | |
| 179 | 169 | assert.equal(label.textContent, 'no checks'); | |
| 180 | - | listeners.click({ target: { closest: (s) => s === '#mr-ck' ? summary : null } }); | |
| 181 | - | assert.equal(footer.open, true); | |
| 182 | - | assert.equal(panels[1].hidden, false); | |
| 183 | - | assert.equal(panels[0].hidden, true); | |
| 184 | - | assert.equal(tabs[1].attrs['aria-selected'], 'true'); | |
| 185 | - | } finally { | |
| 186 | - | for (const [k, v] of Object.entries(saved)) { if (v === undefined) delete globalThis[k]; else globalThis[k] = v; } | |
| 187 | - | } | |
| 170 | + | const click = { target: { closest: (s) => s === '#mr-ck' ? summary : null } }; | |
| 171 | + | h.listeners.click(click); | |
| 172 | + | assert.deepEqual(h.state(), [false, true]); | |
| 173 | + | h.listeners.click(click); | |
| 174 | + | assert.deepEqual(h.state(), [false, true], 'a second badge click keeps it open'); | |
| 175 | + | } finally { h.restore(); } | |
| 176 | + | }); | |
| 177 | + | ||
| 178 | + | test('footer: panels(index) restores the open panel without touching the URL', () => { | |
| 179 | + | const h = footerHarness(); | |
| 180 | + | try { | |
| 181 | + | window.ermiteMR.panels(1); | |
| 182 | + | assert.deepEqual(h.state(), [false, true]); | |
| 183 | + | assert.equal(h.tabs[1].attrs['aria-expanded'], 'true'); | |
| 184 | + | assert.deepEqual(h.replaced, []); | |
| 185 | + | window.ermiteMR.panels(-1); | |
| 186 | + | assert.deepEqual(h.state(), [false, false]); | |
| 187 | + | } finally { h.restore(); } | |
| 188 | 188 | }); | |
| 189 | 189 | ||
| 190 | 190 | test('touch range: first tap anchors, second tap opens the sorted range', () => { | |
| @@ -93,98 +93,98 @@ for (const dataset of [{diff:'split'}, {view:'split'}]) test(`reveal selects the | |||||
| 93 | } | 93 | } | ||
| 94 | }); | 94 | }); | ||
| 95 | 95 | ||||
| 96 | - | test('footer tabs switch panels, support arrows, and open on checks hash', () => { | 96 | + | function footerHarness(extra = {}) { |
| 97 | - | const oldDocument = globalThis.document; | 97 | + | const saved = Object.fromEntries(['document', 'location', 'addEventListener', 'history', 'MutationObserver'].map((k) => [k, globalThis[k]])); |
| 98 | - | const oldLocation = globalThis.location; | |||
| 99 | - | const oldAdd = globalThis.addEventListener; | |||
| 100 | - | const oldHistory = globalThis.history; | |||
| 101 | - | const listeners = {}; | |||
| 102 | - | const replaced = []; | |||
| 103 | - | globalThis.history = { replaceState: (...args) => replaced.push(args) }; | |||
| 104 | const node = (id) => ({ id, attrs: {}, events: {}, hidden: false, | 98 | const node = (id) => ({ id, attrs: {}, events: {}, hidden: false, | ||
| 105 | - | setAttribute(k,v) { this.attrs[k]=v; }, | 99 | + | setAttribute(k, v) { this.attrs[k] = v; }, getAttribute(k) { return this.attrs[k] ?? null; }, |
| 106 | - | addEventListener(k,v) { this.events[k]=v; }, focus() { this.focused=true; } }); | 100 | + | addEventListener(k, v) { this.events[k] = v; }, focus() { this.focused = true; } }); |
| 107 | const tabs = [node('mr-tab-commits'), node('mr-tab-checks')]; | 101 | const tabs = [node('mr-tab-commits'), node('mr-tab-checks')]; | ||
| 108 | const panels = [node('mr-commits'), node('mr-checks-panel')]; | 102 | const panels = [node('mr-commits'), node('mr-checks-panel')]; | ||
| 109 | - | const footer = node('mr-panels'); footer.open=false; | 103 | + | const footer = node('footer'); footer.querySelectorAll = () => panels; |
| 110 | - | const nav = node('tabs'); nav.querySelectorAll=()=>tabs; | 104 | + | const nav = node('tabs'); nav.querySelectorAll = () => tabs; |
| 111 | - | footer.querySelectorAll=()=>panels; | 105 | + | const listeners = {}, replaced = []; |
| 112 | - | globalThis.document = {querySelector: (s) => s === '#mr-panels' ? footer : s === '[data-mr-tabs]' ? nav : null, | 106 | + | globalThis.document = { querySelector: (s) => s === '.mr-footer' ? footer : s === '[data-mr-tabs]' ? nav : s === '#mr-ck' ? extra.summary ?? null : null, |
| 113 | - | addEventListener(k,v) {listeners[k]=v;} }; | 107 | + | querySelectorAll: (s) => s === '[data-mr-tabs] a' ? tabs : [], addEventListener(k, v) { listeners[k] = v; } }; |
| 114 | - | globalThis.location = {hash:''}; | 108 | + | globalThis.location = { hash: '', pathname: '/demo/merge-requests/1', search: '?x=1' }; |
| 115 | - | globalThis.addEventListener = (k,v) => {listeners[k]=v;}; | 109 | + | globalThis.addEventListener = (k, v) => { listeners[k] = v; }; |
| 110 | + | globalThis.history = { replaceState: (...args) => replaced.push(args) }; | |||
| 111 | + | const restore = () => { for (const [k, v] of Object.entries(saved)) { if (v === undefined) delete globalThis[k]; else globalThis[k] = v; } }; | |||
| 112 | + | const state = () => panels.map((p) => !p.hidden); | |||
| 113 | + | return { tabs, panels, listeners, replaced, restore, state }; | |||
| 114 | + | } | |||
| 115 | + | ||||
| 116 | + | test('footer tabs: closed by default, toggle, switch, arrows, hash', () => { | |||
| 117 | + | const h = footerHarness(); | |||
| 116 | try { | 118 | try { | ||
| 117 | window.ermiteMR.panels(); | 119 | window.ermiteMR.panels(); | ||
| 118 | - | assert.equal(footer.open,false); | 120 | + | assert.deepEqual(h.state(), [false, false], 'initially closed'); |
| 119 | - | assert.equal(panels[0].hidden,false); | 121 | + | assert.equal(h.tabs[0].attrs['aria-expanded'], 'false'); |
| 120 | - | assert.equal(panels[1].hidden,true); | 122 | + | assert.deepEqual(h.replaced, [], 'initial state leaves the URL alone'); |
| 121 | - | assert.deepEqual(replaced, [], 'initial selection leaves the URL alone'); | 123 | + | h.tabs[1].events.click({ preventDefault() {} }); |
| 122 | - | tabs[1].events.click({preventDefault(){}}); | 124 | + | assert.deepEqual(h.state(), [false, true]); |
| 123 | - | assert.deepEqual(replaced, [[null, '', '#mr-checks-panel']]); | 125 | + | assert.equal(h.tabs[1].attrs['aria-expanded'], 'true'); |
| 124 | - | assert.equal(panels[0].hidden,true); | 126 | + | assert.deepEqual(h.replaced, [[null, '', '#mr-checks-panel']]); |
| 125 | - | assert.equal(tabs[1].attrs['aria-selected'],'true'); | 127 | + | location.hash = '#mr-checks-panel'; |
| 126 | - | tabs[1].events.keydown({key:'ArrowRight',preventDefault(){}}); | 128 | + | h.tabs[1].events.click({ preventDefault() {} }); |
| 127 | - | assert.equal(tabs[0].focused,true); | 129 | + | assert.deepEqual(h.state(), [false, false], 'a second click closes'); |
| 128 | - | assert.equal(panels[0].hidden,false); | 130 | + | assert.deepEqual(h.replaced.at(-1), [null, '', '/demo/merge-requests/1?x=1'], 'closing clears the fragment'); |
| 129 | - | assert.deepEqual(replaced.at(-1), [null, '', '#mr-commits']); | 131 | + | location.hash = ''; |
| 130 | - | location.hash='#mr-checks'; replaced.length = 0; listeners.hashchange(); | 132 | + | h.tabs[1].events.click({ preventDefault() {} }); |
| 131 | - | assert.deepEqual(replaced, [], 'hash navigation does not rewrite the URL'); | 133 | + | h.tabs[0].events.click({ preventDefault() {} }); |
| 132 | - | assert.equal(footer.open,true); | 134 | + | assert.deepEqual(h.state(), [true, false], 'the other tab switches'); |
| 133 | - | assert.equal(panels[1].hidden,false); | 135 | + | h.tabs[0].events.keydown({ key: 'ArrowRight', preventDefault() {} }); |
| 134 | - | footer.open=false; | 136 | + | assert.equal(h.tabs[1].focused, true, 'arrows move focus only'); |
| 135 | - | listeners.click({target:{closest:()=>true}}); | 137 | + | assert.deepEqual(h.state(), [true, false]); |
| 136 | - | assert.equal(footer.open,true); | 138 | + | location.hash = '#mr-checks'; h.replaced.length = 0; h.listeners.hashchange(); |
| 137 | - | assert.equal(C.tabIndex('Home',1,2),0); | 139 | + | assert.deepEqual(h.state(), [false, true], 'hash opens checks'); |
| 138 | - | assert.equal(C.tabIndex('End',0,2),1); | 140 | + | assert.deepEqual(h.replaced, [], 'hash navigation does not rewrite the URL'); |
| 139 | - | assert.equal(C.tabIndex('ArrowLeft',0,2),1); | 141 | + | location.hash = '#mr-commits'; h.listeners.hashchange(); |
| 140 | - | assert.equal(C.tabIndex('Escape',0,2),null); | 142 | + | assert.deepEqual(h.state(), [true, false]); |
| 141 | - | } finally { | 143 | + | assert.equal(C.tabIndex('Home', 1, 2), 0); |
| 142 | - | globalThis.document=oldDocument; globalThis.location=oldLocation; globalThis.addEventListener=oldAdd; | 144 | + | assert.equal(C.tabIndex('End', 0, 2), 1); |
| 143 | - | if (oldHistory === undefined) delete globalThis.history; else globalThis.history = oldHistory; | 145 | + | assert.equal(C.tabIndex('ArrowLeft', 0, 2), 1); |
| 144 | - | } | 146 | + | assert.equal(C.tabIndex('Escape', 0, 2), null); |
| 147 | + | } finally { h.restore(); } | |||
| 145 | }); | 148 | }); | ||
| 146 | 149 | ||||
| 147 | - | test('footer: #mr-ck syncs the checks label and a click opens the footer on Checks', () => { | 150 | + | test('footer: #mr-ck syncs the checks label; its click opens Checks without toggling', () => { |
| 148 | - | const saved = Object.fromEntries(['document', 'location', 'addEventListener', 'history', 'MutationObserver'].map((k) => [k, globalThis[k]])); | 151 | + | const text0 = { v: '' }; let writes = 0; |
| 149 | - | const node = (id) => ({ id, attrs: {}, events: {}, hidden: false, | 152 | + | const label = { get textContent() { return text0.v; }, set textContent(v) { writes++; text0.v = v; } }; |
| 150 | - | setAttribute(k, v) { this.attrs[k] = v; }, addEventListener(k, v) { this.events[k] = v; }, focus() {} }); | |||
| 151 | - | const tabs = [node('t0'), node('t1')]; | |||
| 152 | - | const panels = [node('mr-commits'), node('mr-checks-panel')]; | |||
| 153 | - | const footer = node('mr-panels'); footer.open = false; footer.querySelectorAll = () => panels; | |||
| 154 | - | let writes = 0, text = ''; | |||
| 155 | - | const label = { get textContent() { return text; }, set textContent(v) { writes++; text = v; } }; | |||
| 156 | - | const nav = node('tabs'); nav.querySelectorAll = () => tabs; | |||
| 157 | - | nav.querySelector = (s) => s === '[data-checks-label]' ? label : null; | |||
| 158 | const summary = { title: '1/2 failed', textContent: ' 1/2 ', parentElement: {} }; | 153 | const summary = { title: '1/2 failed', textContent: ' 1/2 ', parentElement: {} }; | ||
| 159 | - | const listeners = {}; | 154 | + | const h = footerHarness({ summary }); |
| 160 | let observed = null, callback = null; | 155 | let observed = null, callback = null; | ||
| 161 | globalThis.MutationObserver = class { constructor(fn) { callback = fn; } observe(target, opts) { observed = [target, opts]; } }; | 156 | globalThis.MutationObserver = class { constructor(fn) { callback = fn; } observe(target, opts) { observed = [target, opts]; } }; | ||
| 162 | - | globalThis.document = { querySelector: (s) => s === '#mr-panels' ? footer : s === '[data-mr-tabs]' ? nav : s === '#mr-ck' ? summary : null, | 157 | + | const nav = document.querySelector('[data-mr-tabs]'); |
| 163 | - | addEventListener(k, v) { listeners[k] = v; } }; | 158 | + | nav.querySelector = (s) => s === '[data-checks-label]' ? label : null; |
| 164 | - | globalThis.location = { hash: '' }; | |||
| 165 | - | globalThis.addEventListener = () => {}; | |||
| 166 | - | globalThis.history = { replaceState() {} }; | |||
| 167 | try { | 159 | try { | ||
| 168 | window.ermiteMR.panels(); | 160 | window.ermiteMR.panels(); | ||
| 169 | assert.equal(label.textContent, '1/2 failed', 'initial label sync'); | 161 | assert.equal(label.textContent, '1/2 failed', 'initial label sync'); | ||
| 170 | assert.equal(observed[0], summary.parentElement); | 162 | assert.equal(observed[0], summary.parentElement); | ||
| 171 | - | // A mutation elsewhere in the bar (hx-live rewriting a label) must not | |||
| 172 | - | // write the label again, or hx-live wakes up on its own write forever. | |||
| 173 | assert.deepEqual(observed[1], { childList: true }, 'only #mr-ck replacements wake the observer'); | 163 | assert.deepEqual(observed[1], { childList: true }, 'only #mr-ck replacements wake the observer'); | ||
| 174 | const before = writes; callback(); callback(); | 164 | const before = writes; callback(); callback(); | ||
| 175 | assert.equal(writes, before, 'an unchanged label is not written'); | 165 | assert.equal(writes, before, 'an unchanged label is not written'); | ||
| 176 | summary.title = ''; callback(); | 166 | summary.title = ''; callback(); | ||
| 177 | - | assert.equal(label.textContent, '1/2', 'observer re-syncs from the text'); | 167 | + | assert.equal(label.textContent, '1/2'); |
| 178 | summary.textContent = ' '; callback(); | 168 | summary.textContent = ' '; callback(); | ||
| 179 | assert.equal(label.textContent, 'no checks'); | 169 | assert.equal(label.textContent, 'no checks'); | ||
| 180 | - | listeners.click({ target: { closest: (s) => s === '#mr-ck' ? summary : null } }); | 170 | + | const click = { target: { closest: (s) => s === '#mr-ck' ? summary : null } }; |
| 181 | - | assert.equal(footer.open, true); | 171 | + | h.listeners.click(click); |
| 182 | - | assert.equal(panels[1].hidden, false); | 172 | + | assert.deepEqual(h.state(), [false, true]); |
| 183 | - | assert.equal(panels[0].hidden, true); | 173 | + | h.listeners.click(click); |
| 184 | - | assert.equal(tabs[1].attrs['aria-selected'], 'true'); | 174 | + | assert.deepEqual(h.state(), [false, true], 'a second badge click keeps it open'); |
| 185 | - | } finally { | 175 | + | } finally { h.restore(); } |
| 186 | - | for (const [k, v] of Object.entries(saved)) { if (v === undefined) delete globalThis[k]; else globalThis[k] = v; } | 176 | + | }); |
| 187 | - | } | 177 | + | |
| 178 | + | test('footer: panels(index) restores the open panel without touching the URL', () => { | |||
| 179 | + | const h = footerHarness(); | |||
| 180 | + | try { | |||
| 181 | + | window.ermiteMR.panels(1); | |||
| 182 | + | assert.deepEqual(h.state(), [false, true]); | |||
| 183 | + | assert.equal(h.tabs[1].attrs['aria-expanded'], 'true'); | |||
| 184 | + | assert.deepEqual(h.replaced, []); | |||
| 185 | + | window.ermiteMR.panels(-1); | |||
| 186 | + | assert.deepEqual(h.state(), [false, false]); | |||
| 187 | + | } finally { h.restore(); } | |||
| 188 | }); | 188 | }); | ||
| 189 | 189 | ||||
| 190 | test('touch range: first tap anchors, second tap opens the sorted range', () => { | 190 | test('touch range: first tap anchors, second tap opens the sorted range', () => { | ||
M internal/adapters/web/mr.templ +51 -54
| @@ -378,60 +378,57 @@ templ commentForm(f CommentForm, suffix string) { | |||
| 378 | 378 | ||
| 379 | 379 | templ mrFooter(p MRPage) { | |
| 380 | 380 | <footer class="mr-footer"> | |
| 381 | - | <details id="mr-panels"> | |
| 382 | - | <summary>Commits <span class="count">{ p.CommitCount }</span> · Checks</summary> | |
| 383 | - | <nav data-mr-tabs aria-label="Branch details"> | |
| 384 | - | <a id="mr-tab-commits" href="#mr-commits">Commits <span class="count">{ p.CommitCount }</span></a> | |
| 385 | - | <a id="mr-tab-checks" href="#mr-checks"> | |
| 386 | - | { "Checks " } | |
| 387 | - | <span data-checks-label> | |
| 388 | - | if p.ChecksSum.Total > 0 { | |
| 389 | - | { p.ChecksSum.Title } | |
| 390 | - | } else { | |
| 391 | - | no checks | |
| 392 | - | } | |
| 393 | - | </span> | |
| 394 | - | </a> | |
| 395 | - | </nav> | |
| 396 | - | <div id="mr-commits" data-mr-panel aria-labelledby="mr-tab-commits"> | |
| 397 | - | <table class="mr-commits"> | |
| 398 | - | <thead><tr><th>Commit</th><th>Subject</th><th>Author</th><th>Date</th><th>Signature</th><th>Status</th></tr></thead> | |
| 399 | - | <tbody> | |
| 400 | - | for _, c := range p.Commits { | |
| 401 | - | <tr data-new?={ c.New }> | |
| 402 | - | <td><a href={ templ.SafeURL(c.Href) }>{ c.Short }</a></td> | |
| 403 | - | <td>{ c.Subject }</td> | |
| 404 | - | <td>{ c.Author }</td> | |
| 405 | - | <td> | |
| 406 | - | if c.WhenAt != "" { | |
| 407 | - | <time datetime={ c.WhenAt }>{ c.When }</time> | |
| 408 | - | } | |
| 409 | - | </td> | |
| 410 | - | <td> | |
| 411 | - | if c.Sig != nil { | |
| 412 | - | @signaturePill(c.Sig) | |
| 413 | - | } | |
| 414 | - | </td> | |
| 415 | - | <td> | |
| 416 | - | if c.New { | |
| 417 | - | <span>new</span> | |
| 418 | - | } | |
| 419 | - | </td> | |
| 420 | - | </tr> | |
| 421 | - | } | |
| 422 | - | </tbody> | |
| 423 | - | </table> | |
| 424 | - | if len(p.Commits) == 0 { | |
| 425 | - | <p class="dim">no commit to merge.</p> | |
| 426 | - | } | |
| 427 | - | if p.CommitsNote != "" { | |
| 428 | - | <p class="note">{ p.CommitsNote }</p> | |
| 429 | - | } | |
| 430 | - | </div> | |
| 431 | - | <div id="mr-checks-panel" data-mr-panel aria-labelledby="mr-tab-checks"> | |
| 432 | - | @MRChecks(p.Checks) | |
| 433 | - | </div> | |
| 434 | - | </details> | |
| 381 | + | <nav data-mr-tabs aria-label="Branch details"> | |
| 382 | + | <a id="mr-tab-commits" href="#mr-commits">Commits <span class="count">{ p.CommitCount }</span></a> | |
| 383 | + | <a id="mr-tab-checks" href="#mr-checks"> | |
| 384 | + | { "Checks " } | |
| 385 | + | <span data-checks-label> | |
| 386 | + | if p.ChecksSum.Total > 0 { | |
| 387 | + | { p.ChecksSum.Title } | |
| 388 | + | } else { | |
| 389 | + | no checks | |
| 390 | + | } | |
| 391 | + | </span> | |
| 392 | + | </a> | |
| 393 | + | </nav> | |
| 394 | + | <div id="mr-commits" data-mr-panel hidden aria-labelledby="mr-tab-commits"> | |
| 395 | + | <table class="mr-commits"> | |
| 396 | + | <thead><tr><th>Commit</th><th>Subject</th><th>Author</th><th>Date</th><th>Signature</th><th>Status</th></tr></thead> | |
| 397 | + | <tbody> | |
| 398 | + | for _, c := range p.Commits { | |
| 399 | + | <tr data-new?={ c.New }> | |
| 400 | + | <td><a href={ templ.SafeURL(c.Href) }>{ c.Short }</a></td> | |
| 401 | + | <td>{ c.Subject }</td> | |
| 402 | + | <td>{ c.Author }</td> | |
| 403 | + | <td> | |
| 404 | + | if c.WhenAt != "" { | |
| 405 | + | <time datetime={ c.WhenAt }>{ c.When }</time> | |
| 406 | + | } | |
| 407 | + | </td> | |
| 408 | + | <td> | |
| 409 | + | if c.Sig != nil { | |
| 410 | + | @signaturePill(c.Sig) | |
| 411 | + | } | |
| 412 | + | </td> | |
| 413 | + | <td> | |
| 414 | + | if c.New { | |
| 415 | + | <span>new</span> | |
| 416 | + | } | |
| 417 | + | </td> | |
| 418 | + | </tr> | |
| 419 | + | } | |
| 420 | + | </tbody> | |
| 421 | + | </table> | |
| 422 | + | if len(p.Commits) == 0 { | |
| 423 | + | <p class="dim">no commit to merge.</p> | |
| 424 | + | } | |
| 425 | + | if p.CommitsNote != "" { | |
| 426 | + | <p class="note">{ p.CommitsNote }</p> | |
| 427 | + | } | |
| 428 | + | </div> | |
| 429 | + | <div id="mr-checks-panel" data-mr-panel hidden aria-labelledby="mr-tab-checks"> | |
| 430 | + | @MRChecks(p.Checks) | |
| 431 | + | </div> | |
| 435 | 432 | </footer> | |
| 436 | 433 | } | |
| 437 | 434 | ||
| @@ -378,60 +378,57 @@ templ commentForm(f CommentForm, suffix string) { | |||||
| 378 | 378 | ||||
| 379 | templ mrFooter(p MRPage) { | 379 | templ mrFooter(p MRPage) { | ||
| 380 | <footer class="mr-footer"> | 380 | <footer class="mr-footer"> | ||
| 381 | - | <details id="mr-panels"> | 381 | + | <nav data-mr-tabs aria-label="Branch details"> |
| 382 | - | <summary>Commits <span class="count">{ p.CommitCount }</span> · Checks</summary> | 382 | + | <a id="mr-tab-commits" href="#mr-commits">Commits <span class="count">{ p.CommitCount }</span></a> |
| 383 | - | <nav data-mr-tabs aria-label="Branch details"> | 383 | + | <a id="mr-tab-checks" href="#mr-checks"> |
| 384 | - | <a id="mr-tab-commits" href="#mr-commits">Commits <span class="count">{ p.CommitCount }</span></a> | 384 | + | { "Checks " } |
| 385 | - | <a id="mr-tab-checks" href="#mr-checks"> | 385 | + | <span data-checks-label> |
| 386 | - | { "Checks " } | 386 | + | if p.ChecksSum.Total > 0 { |
| 387 | - | <span data-checks-label> | 387 | + | { p.ChecksSum.Title } |
| 388 | - | if p.ChecksSum.Total > 0 { | 388 | + | } else { |
| 389 | - | { p.ChecksSum.Title } | 389 | + | no checks |
| 390 | - | } else { | 390 | + | } |
| 391 | - | no checks | 391 | + | </span> |
| 392 | - | } | 392 | + | </a> |
| 393 | - | </span> | 393 | + | </nav> |
| 394 | - | </a> | 394 | + | <div id="mr-commits" data-mr-panel hidden aria-labelledby="mr-tab-commits"> |
| 395 | - | </nav> | 395 | + | <table class="mr-commits"> |
| 396 | - | <div id="mr-commits" data-mr-panel aria-labelledby="mr-tab-commits"> | 396 | + | <thead><tr><th>Commit</th><th>Subject</th><th>Author</th><th>Date</th><th>Signature</th><th>Status</th></tr></thead> |
| 397 | - | <table class="mr-commits"> | 397 | + | <tbody> |
| 398 | - | <thead><tr><th>Commit</th><th>Subject</th><th>Author</th><th>Date</th><th>Signature</th><th>Status</th></tr></thead> | 398 | + | for _, c := range p.Commits { |
| 399 | - | <tbody> | 399 | + | <tr data-new?={ c.New }> |
| 400 | - | for _, c := range p.Commits { | 400 | + | <td><a href={ templ.SafeURL(c.Href) }>{ c.Short }</a></td> |
| 401 | - | <tr data-new?={ c.New }> | 401 | + | <td>{ c.Subject }</td> |
| 402 | - | <td><a href={ templ.SafeURL(c.Href) }>{ c.Short }</a></td> | 402 | + | <td>{ c.Author }</td> |
| 403 | - | <td>{ c.Subject }</td> | 403 | + | <td> |
| 404 | - | <td>{ c.Author }</td> | 404 | + | if c.WhenAt != "" { |
| 405 | - | <td> | 405 | + | <time datetime={ c.WhenAt }>{ c.When }</time> |
| 406 | - | if c.WhenAt != "" { | 406 | + | } |
| 407 | - | <time datetime={ c.WhenAt }>{ c.When }</time> | 407 | + | </td> |
| 408 | - | } | 408 | + | <td> |
| 409 | - | </td> | 409 | + | if c.Sig != nil { |
| 410 | - | <td> | 410 | + | @signaturePill(c.Sig) |
| 411 | - | if c.Sig != nil { | 411 | + | } |
| 412 | - | @signaturePill(c.Sig) | 412 | + | </td> |
| 413 | - | } | 413 | + | <td> |
| 414 | - | </td> | 414 | + | if c.New { |
| 415 | - | <td> | 415 | + | <span>new</span> |
| 416 | - | if c.New { | 416 | + | } |
| 417 | - | <span>new</span> | 417 | + | </td> |
| 418 | - | } | 418 | + | </tr> |
| 419 | - | </td> | 419 | + | } |
| 420 | - | </tr> | 420 | + | </tbody> |
| 421 | - | } | 421 | + | </table> |
| 422 | - | </tbody> | 422 | + | if len(p.Commits) == 0 { |
| 423 | - | </table> | 423 | + | <p class="dim">no commit to merge.</p> |
| 424 | - | if len(p.Commits) == 0 { | 424 | + | } |
| 425 | - | <p class="dim">no commit to merge.</p> | 425 | + | if p.CommitsNote != "" { |
| 426 | - | } | 426 | + | <p class="note">{ p.CommitsNote }</p> |
| 427 | - | if p.CommitsNote != "" { | 427 | + | } |
| 428 | - | <p class="note">{ p.CommitsNote }</p> | 428 | + | </div> |
| 429 | - | } | 429 | + | <div id="mr-checks-panel" data-mr-panel hidden aria-labelledby="mr-tab-checks"> |
| 430 | - | </div> | 430 | + | @MRChecks(p.Checks) |
| 431 | - | <div id="mr-checks-panel" data-mr-panel aria-labelledby="mr-tab-checks"> | 431 | + | </div> |
| 432 | - | @MRChecks(p.Checks) | |||
| 433 | - | </div> | |||
| 434 | - | </details> | |||
| 435 | </footer> | 432 | </footer> | ||
| 436 | } | 433 | } | ||
| 437 | 434 | ||||
M internal/adapters/web/mr_templ.go +480 -493
| @@ -2033,169 +2033,156 @@ func mrFooter(p MRPage) templ.Component { | |||
| 2033 | 2033 | templ_7745c5c3_Var97 = templ.NopComponent | |
| 2034 | 2034 | } | |
| 2035 | 2035 | ctx = templ.ClearChildren(ctx) | |
| 2036 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 187, "<footer class=\"mr-footer\"><details id=\"mr-panels\"><summary>Commits <span class=\"count\">") | |
| 2036 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 187, "<footer class=\"mr-footer\"><nav data-mr-tabs aria-label=\"Branch details\"><a id=\"mr-tab-commits\" href=\"#mr-commits\">Commits <span class=\"count\">") | |
| 2037 | 2037 | if templ_7745c5c3_Err != nil { | |
| 2038 | 2038 | return templ_7745c5c3_Err | |
| 2039 | 2039 | } | |
| 2040 | 2040 | var templ_7745c5c3_Var98 string | |
| 2041 | 2041 | templ_7745c5c3_Var98, templ_7745c5c3_Err = templ.JoinStringErrs(p.CommitCount) | |
| 2042 | 2042 | if templ_7745c5c3_Err != nil { | |
| 2043 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 382, Col: 55} | |
| 2043 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 382, Col: 88} | |
| 2044 | 2044 | } | |
| 2045 | 2045 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var98)) | |
| 2046 | 2046 | if templ_7745c5c3_Err != nil { | |
| 2047 | 2047 | return templ_7745c5c3_Err | |
| 2048 | 2048 | } | |
| 2049 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 188, "</span> · Checks</summary><nav data-mr-tabs aria-label=\"Branch details\"><a id=\"mr-tab-commits\" href=\"#mr-commits\">Commits <span class=\"count\">") | |
| 2049 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 188, "</span></a> <a id=\"mr-tab-checks\" href=\"#mr-checks\">") | |
| 2050 | 2050 | if templ_7745c5c3_Err != nil { | |
| 2051 | 2051 | return templ_7745c5c3_Err | |
| 2052 | 2052 | } | |
| 2053 | 2053 | var templ_7745c5c3_Var99 string | |
| 2054 | - | templ_7745c5c3_Var99, templ_7745c5c3_Err = templ.JoinStringErrs(p.CommitCount) | |
| 2054 | + | templ_7745c5c3_Var99, templ_7745c5c3_Err = templ.JoinStringErrs("Checks ") | |
| 2055 | 2055 | if templ_7745c5c3_Err != nil { | |
| 2056 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 384, Col: 89} | |
| 2056 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 384, Col: 15} | |
| 2057 | 2057 | } | |
| 2058 | 2058 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var99)) | |
| 2059 | 2059 | if templ_7745c5c3_Err != nil { | |
| 2060 | 2060 | return templ_7745c5c3_Err | |
| 2061 | 2061 | } | |
| 2062 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 189, "</span></a> <a id=\"mr-tab-checks\" href=\"#mr-checks\">") | |
| 2063 | - | if templ_7745c5c3_Err != nil { | |
| 2064 | - | return templ_7745c5c3_Err | |
| 2065 | - | } | |
| 2066 | - | var templ_7745c5c3_Var100 string | |
| 2067 | - | templ_7745c5c3_Var100, templ_7745c5c3_Err = templ.JoinStringErrs("Checks ") | |
| 2068 | - | if templ_7745c5c3_Err != nil { | |
| 2069 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 386, Col: 16} | |
| 2070 | - | } | |
| 2071 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var100)) | |
| 2072 | - | if templ_7745c5c3_Err != nil { | |
| 2073 | - | return templ_7745c5c3_Err | |
| 2074 | - | } | |
| 2075 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 190, " <span data-checks-label>") | |
| 2062 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 189, " <span data-checks-label>") | |
| 2076 | 2063 | if templ_7745c5c3_Err != nil { | |
| 2077 | 2064 | return templ_7745c5c3_Err | |
| 2078 | 2065 | } | |
| 2079 | 2066 | if p.ChecksSum.Total > 0 { | |
| 2080 | - | var templ_7745c5c3_Var101 string | |
| 2081 | - | templ_7745c5c3_Var101, templ_7745c5c3_Err = templ.JoinStringErrs(p.ChecksSum.Title) | |
| 2067 | + | var templ_7745c5c3_Var100 string | |
| 2068 | + | templ_7745c5c3_Var100, templ_7745c5c3_Err = templ.JoinStringErrs(p.ChecksSum.Title) | |
| 2082 | 2069 | if templ_7745c5c3_Err != nil { | |
| 2083 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 389, Col: 26} | |
| 2070 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 387, Col: 25} | |
| 2084 | 2071 | } | |
| 2085 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var101)) | |
| 2072 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var100)) | |
| 2086 | 2073 | if templ_7745c5c3_Err != nil { | |
| 2087 | 2074 | return templ_7745c5c3_Err | |
| 2088 | 2075 | } | |
| 2089 | 2076 | } else { | |
| 2090 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 191, "no checks") | |
| 2077 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 190, "no checks") | |
| 2091 | 2078 | if templ_7745c5c3_Err != nil { | |
| 2092 | 2079 | return templ_7745c5c3_Err | |
| 2093 | 2080 | } | |
| 2094 | 2081 | } | |
| 2095 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 192, "</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>") | |
| 2082 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 191, "</span></a></nav><div id=\"mr-commits\" data-mr-panel hidden 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>") | |
| 2096 | 2083 | if templ_7745c5c3_Err != nil { | |
| 2097 | 2084 | return templ_7745c5c3_Err | |
| 2098 | 2085 | } | |
| 2099 | 2086 | for _, c := range p.Commits { | |
| 2100 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 193, "<tr") | |
| 2087 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 192, "<tr") | |
| 2101 | 2088 | if templ_7745c5c3_Err != nil { | |
| 2102 | 2089 | return templ_7745c5c3_Err | |
| 2103 | 2090 | } | |
| 2104 | 2091 | if c.New { | |
| 2105 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 194, " data-new") | |
| 2092 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 193, " data-new") | |
| 2106 | 2093 | if templ_7745c5c3_Err != nil { | |
| 2107 | 2094 | return templ_7745c5c3_Err | |
| 2108 | 2095 | } | |
| 2109 | 2096 | } | |
| 2110 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 195, "><td><a href=\"") | |
| 2097 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 194, "><td><a href=\"") | |
| 2111 | 2098 | if templ_7745c5c3_Err != nil { | |
| 2112 | 2099 | return templ_7745c5c3_Err | |
| 2113 | 2100 | } | |
| 2114 | - | var templ_7745c5c3_Var102 templ.SafeURL | |
| 2115 | - | templ_7745c5c3_Var102, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(c.Href)) | |
| 2101 | + | var templ_7745c5c3_Var101 templ.SafeURL | |
| 2102 | + | templ_7745c5c3_Var101, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(c.Href)) | |
| 2116 | 2103 | if templ_7745c5c3_Err != nil { | |
| 2117 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 402, Col: 43} | |
| 2104 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 400, Col: 42} | |
| 2118 | 2105 | } | |
| 2119 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var102)) | |
| 2106 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var101)) | |
| 2120 | 2107 | if templ_7745c5c3_Err != nil { | |
| 2121 | 2108 | return templ_7745c5c3_Err | |
| 2122 | 2109 | } | |
| 2123 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 196, "\">") | |
| 2110 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 195, "\">") | |
| 2124 | 2111 | if templ_7745c5c3_Err != nil { | |
| 2125 | 2112 | return templ_7745c5c3_Err | |
| 2126 | 2113 | } | |
| 2127 | - | var templ_7745c5c3_Var103 string | |
| 2128 | - | templ_7745c5c3_Var103, templ_7745c5c3_Err = templ.JoinStringErrs(c.Short) | |
| 2114 | + | var templ_7745c5c3_Var102 string | |
| 2115 | + | templ_7745c5c3_Var102, templ_7745c5c3_Err = templ.JoinStringErrs(c.Short) | |
| 2129 | 2116 | if templ_7745c5c3_Err != nil { | |
| 2130 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 402, Col: 55} | |
| 2117 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 400, Col: 54} | |
| 2131 | 2118 | } | |
| 2132 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var103)) | |
| 2119 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var102)) | |
| 2133 | 2120 | if templ_7745c5c3_Err != nil { | |
| 2134 | 2121 | return templ_7745c5c3_Err | |
| 2135 | 2122 | } | |
| 2136 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 197, "</a></td><td>") | |
| 2123 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 196, "</a></td><td>") | |
| 2137 | 2124 | if templ_7745c5c3_Err != nil { | |
| 2138 | 2125 | return templ_7745c5c3_Err | |
| 2139 | 2126 | } | |
| 2140 | - | var templ_7745c5c3_Var104 string | |
| 2141 | - | templ_7745c5c3_Var104, templ_7745c5c3_Err = templ.JoinStringErrs(c.Subject) | |
| 2127 | + | var templ_7745c5c3_Var103 string | |
| 2128 | + | templ_7745c5c3_Var103, templ_7745c5c3_Err = templ.JoinStringErrs(c.Subject) | |
| 2142 | 2129 | if templ_7745c5c3_Err != nil { | |
| 2143 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 403, Col: 23} | |
| 2130 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 401, Col: 22} | |
| 2144 | 2131 | } | |
| 2145 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var104)) | |
| 2132 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var103)) | |
| 2146 | 2133 | if templ_7745c5c3_Err != nil { | |
| 2147 | 2134 | return templ_7745c5c3_Err | |
| 2148 | 2135 | } | |
| 2149 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 198, "</td><td>") | |
| 2136 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 197, "</td><td>") | |
| 2150 | 2137 | if templ_7745c5c3_Err != nil { | |
| 2151 | 2138 | return templ_7745c5c3_Err | |
| 2152 | 2139 | } | |
| 2153 | - | var templ_7745c5c3_Var105 string | |
| 2154 | - | templ_7745c5c3_Var105, templ_7745c5c3_Err = templ.JoinStringErrs(c.Author) | |
| 2140 | + | var templ_7745c5c3_Var104 string | |
| 2141 | + | templ_7745c5c3_Var104, templ_7745c5c3_Err = templ.JoinStringErrs(c.Author) | |
| 2155 | 2142 | if templ_7745c5c3_Err != nil { | |
| 2156 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 404, Col: 22} | |
| 2143 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 402, Col: 21} | |
| 2157 | 2144 | } | |
| 2158 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var105)) | |
| 2145 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var104)) | |
| 2159 | 2146 | if templ_7745c5c3_Err != nil { | |
| 2160 | 2147 | return templ_7745c5c3_Err | |
| 2161 | 2148 | } | |
| 2162 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 199, "</td><td>") | |
| 2149 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 198, "</td><td>") | |
| 2163 | 2150 | if templ_7745c5c3_Err != nil { | |
| 2164 | 2151 | return templ_7745c5c3_Err | |
| 2165 | 2152 | } | |
| 2166 | 2153 | if c.WhenAt != "" { | |
| 2167 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 200, "<time datetime=\"") | |
| 2154 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 199, "<time datetime=\"") | |
| 2168 | 2155 | if templ_7745c5c3_Err != nil { | |
| 2169 | 2156 | return templ_7745c5c3_Err | |
| 2170 | 2157 | } | |
| 2171 | - | var templ_7745c5c3_Var106 string | |
| 2172 | - | templ_7745c5c3_Var106, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.WhenAt) | |
| 2158 | + | var templ_7745c5c3_Var105 string | |
| 2159 | + | templ_7745c5c3_Var105, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.WhenAt) | |
| 2173 | 2160 | if templ_7745c5c3_Err != nil { | |
| 2174 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 407, Col: 35} | |
| 2161 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 405, Col: 34} | |
| 2175 | 2162 | } | |
| 2176 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var106) | |
| 2163 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var105) | |
| 2177 | 2164 | if templ_7745c5c3_Err != nil { | |
| 2178 | 2165 | return templ_7745c5c3_Err | |
| 2179 | 2166 | } | |
| 2180 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 201, "\">") | |
| 2167 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 200, "\">") | |
| 2181 | 2168 | if templ_7745c5c3_Err != nil { | |
| 2182 | 2169 | return templ_7745c5c3_Err | |
| 2183 | 2170 | } | |
| 2184 | - | var templ_7745c5c3_Var107 string | |
| 2185 | - | templ_7745c5c3_Var107, templ_7745c5c3_Err = templ.JoinStringErrs(c.When) | |
| 2171 | + | var templ_7745c5c3_Var106 string | |
| 2172 | + | templ_7745c5c3_Var106, templ_7745c5c3_Err = templ.JoinStringErrs(c.When) | |
| 2186 | 2173 | if templ_7745c5c3_Err != nil { | |
| 2187 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 407, Col: 46} | |
| 2174 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 405, Col: 45} | |
| 2188 | 2175 | } | |
| 2189 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var107)) | |
| 2176 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var106)) | |
| 2190 | 2177 | if templ_7745c5c3_Err != nil { | |
| 2191 | 2178 | return templ_7745c5c3_Err | |
| 2192 | 2179 | } | |
| 2193 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 202, "</time>") | |
| 2180 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 201, "</time>") | |
| 2194 | 2181 | if templ_7745c5c3_Err != nil { | |
| 2195 | 2182 | return templ_7745c5c3_Err | |
| 2196 | 2183 | } | |
| 2197 | 2184 | } | |
| 2198 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 203, "</td><td>") | |
| 2185 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 202, "</td><td>") | |
| 2199 | 2186 | if templ_7745c5c3_Err != nil { | |
| 2200 | 2187 | return templ_7745c5c3_Err | |
| 2201 | 2188 | } | |
| @@ -2205,51 +2192,51 @@ func mrFooter(p MRPage) templ.Component { | |||
| 2205 | 2192 | return templ_7745c5c3_Err | |
| 2206 | 2193 | } | |
| 2207 | 2194 | } | |
| 2208 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 204, "</td><td>") | |
| 2195 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 203, "</td><td>") | |
| 2209 | 2196 | if templ_7745c5c3_Err != nil { | |
| 2210 | 2197 | return templ_7745c5c3_Err | |
| 2211 | 2198 | } | |
| 2212 | 2199 | if c.New { | |
| 2213 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 205, "<span>new</span>") | |
| 2200 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 204, "<span>new</span>") | |
| 2214 | 2201 | if templ_7745c5c3_Err != nil { | |
| 2215 | 2202 | return templ_7745c5c3_Err | |
| 2216 | 2203 | } | |
| 2217 | 2204 | } | |
| 2218 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 206, "</td></tr>") | |
| 2205 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 205, "</td></tr>") | |
| 2219 | 2206 | if templ_7745c5c3_Err != nil { | |
| 2220 | 2207 | return templ_7745c5c3_Err | |
| 2221 | 2208 | } | |
| 2222 | 2209 | } | |
| 2223 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 207, "</tbody></table>") | |
| 2210 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 206, "</tbody></table>") | |
| 2224 | 2211 | if templ_7745c5c3_Err != nil { | |
| 2225 | 2212 | return templ_7745c5c3_Err | |
| 2226 | 2213 | } | |
| 2227 | 2214 | if len(p.Commits) == 0 { | |
| 2228 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 208, "<p class=\"dim\">no commit to merge.</p>") | |
| 2215 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 207, "<p class=\"dim\">no commit to merge.</p>") | |
| 2229 | 2216 | if templ_7745c5c3_Err != nil { | |
| 2230 | 2217 | return templ_7745c5c3_Err | |
| 2231 | 2218 | } | |
| 2232 | 2219 | } | |
| 2233 | 2220 | if p.CommitsNote != "" { | |
| 2234 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 209, "<p class=\"note\">") | |
| 2221 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 208, "<p class=\"note\">") | |
| 2235 | 2222 | if templ_7745c5c3_Err != nil { | |
| 2236 | 2223 | return templ_7745c5c3_Err | |
| 2237 | 2224 | } | |
| 2238 | - | var templ_7745c5c3_Var108 string | |
| 2239 | - | templ_7745c5c3_Var108, templ_7745c5c3_Err = templ.JoinStringErrs(p.CommitsNote) | |
| 2225 | + | var templ_7745c5c3_Var107 string | |
| 2226 | + | templ_7745c5c3_Var107, templ_7745c5c3_Err = templ.JoinStringErrs(p.CommitsNote) | |
| 2240 | 2227 | if templ_7745c5c3_Err != nil { | |
| 2241 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 428, Col: 36} | |
| 2228 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 426, Col: 35} | |
| 2242 | 2229 | } | |
| 2243 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var108)) | |
| 2230 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var107)) | |
| 2244 | 2231 | if templ_7745c5c3_Err != nil { | |
| 2245 | 2232 | return templ_7745c5c3_Err | |
| 2246 | 2233 | } | |
| 2247 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 210, "</p>") | |
| 2234 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 209, "</p>") | |
| 2248 | 2235 | if templ_7745c5c3_Err != nil { | |
| 2249 | 2236 | return templ_7745c5c3_Err | |
| 2250 | 2237 | } | |
| 2251 | 2238 | } | |
| 2252 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 211, "</div><div id=\"mr-checks-panel\" data-mr-panel aria-labelledby=\"mr-tab-checks\">") | |
| 2239 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 210, "</div><div id=\"mr-checks-panel\" data-mr-panel hidden aria-labelledby=\"mr-tab-checks\">") | |
| 2253 | 2240 | if templ_7745c5c3_Err != nil { | |
| 2254 | 2241 | return templ_7745c5c3_Err | |
| 2255 | 2242 | } | |
| @@ -2257,7 +2244,7 @@ func mrFooter(p MRPage) templ.Component { | |||
| 2257 | 2244 | if templ_7745c5c3_Err != nil { | |
| 2258 | 2245 | return templ_7745c5c3_Err | |
| 2259 | 2246 | } | |
| 2260 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 212, "</div></details></footer>") | |
| 2247 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 211, "</div></footer>") | |
| 2261 | 2248 | if templ_7745c5c3_Err != nil { | |
| 2262 | 2249 | return templ_7745c5c3_Err | |
| 2263 | 2250 | } | |
| @@ -2281,25 +2268,25 @@ func mrRail(p MRPage) templ.Component { | |||
| 2281 | 2268 | }() | |
| 2282 | 2269 | } | |
| 2283 | 2270 | ctx = templ.InitializeContext(ctx) | |
| 2284 | - | templ_7745c5c3_Var109 := templ.GetChildren(ctx) | |
| 2285 | - | if templ_7745c5c3_Var109 == nil { | |
| 2286 | - | templ_7745c5c3_Var109 = templ.NopComponent | |
| 2271 | + | templ_7745c5c3_Var108 := templ.GetChildren(ctx) | |
| 2272 | + | if templ_7745c5c3_Var108 == nil { | |
| 2273 | + | templ_7745c5c3_Var108 = templ.NopComponent | |
| 2287 | 2274 | } | |
| 2288 | 2275 | ctx = templ.ClearChildren(ctx) | |
| 2289 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 213, "<section aria-labelledby=\"r-files\" class=\"r-files\"><h2 id=\"r-files\">Files <span class=\"count\">") | |
| 2276 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 212, "<section aria-labelledby=\"r-files\" class=\"r-files\"><h2 id=\"r-files\">Files <span class=\"count\">") | |
| 2290 | 2277 | if templ_7745c5c3_Err != nil { | |
| 2291 | 2278 | return templ_7745c5c3_Err | |
| 2292 | 2279 | } | |
| 2293 | - | var templ_7745c5c3_Var110 string | |
| 2294 | - | templ_7745c5c3_Var110, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(len(p.Files))) | |
| 2280 | + | var templ_7745c5c3_Var109 string | |
| 2281 | + | templ_7745c5c3_Var109, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(len(p.Files))) | |
| 2295 | 2282 | if templ_7745c5c3_Err != nil { | |
| 2296 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 441, Col: 49} | |
| 2283 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 438, Col: 49} | |
| 2297 | 2284 | } | |
| 2298 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var110)) | |
| 2285 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var109)) | |
| 2299 | 2286 | if templ_7745c5c3_Err != nil { | |
| 2300 | 2287 | return templ_7745c5c3_Err | |
| 2301 | 2288 | } | |
| 2302 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 214, "</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>") | |
| 2289 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 213, "</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>") | |
| 2303 | 2290 | if templ_7745c5c3_Err != nil { | |
| 2304 | 2291 | return templ_7745c5c3_Err | |
| 2305 | 2292 | } | |
| @@ -2307,71 +2294,71 @@ func mrRail(p MRPage) templ.Component { | |||
| 2307 | 2294 | if templ_7745c5c3_Err != nil { | |
| 2308 | 2295 | return templ_7745c5c3_Err | |
| 2309 | 2296 | } | |
| 2310 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 215, "</section>") | |
| 2297 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 214, "</section>") | |
| 2311 | 2298 | if templ_7745c5c3_Err != nil { | |
| 2312 | 2299 | return templ_7745c5c3_Err | |
| 2313 | 2300 | } | |
| 2314 | 2301 | if len(p.Verdicts) > 0 { | |
| 2315 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 216, "<section><h2>Verdicts</h2><ul>") | |
| 2302 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 215, "<section><h2>Verdicts</h2><ul>") | |
| 2316 | 2303 | if templ_7745c5c3_Err != nil { | |
| 2317 | 2304 | return templ_7745c5c3_Err | |
| 2318 | 2305 | } | |
| 2319 | 2306 | for _, v := range p.Verdicts { | |
| 2320 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 217, "<li><a href=\"") | |
| 2307 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 216, "<li><a href=\"") | |
| 2321 | 2308 | if templ_7745c5c3_Err != nil { | |
| 2322 | 2309 | return templ_7745c5c3_Err | |
| 2323 | 2310 | } | |
| 2324 | - | var templ_7745c5c3_Var111 templ.SafeURL | |
| 2325 | - | templ_7745c5c3_Var111, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(v.Href)) | |
| 2311 | + | var templ_7745c5c3_Var110 templ.SafeURL | |
| 2312 | + | templ_7745c5c3_Var110, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(v.Href)) | |
| 2326 | 2313 | if templ_7745c5c3_Err != nil { | |
| 2327 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 454, Col: 37} | |
| 2314 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 451, Col: 37} | |
| 2328 | 2315 | } | |
| 2329 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var111)) | |
| 2316 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var110)) | |
| 2330 | 2317 | if templ_7745c5c3_Err != nil { | |
| 2331 | 2318 | return templ_7745c5c3_Err | |
| 2332 | 2319 | } | |
| 2333 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 218, "\">") | |
| 2320 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 217, "\">") | |
| 2334 | 2321 | if templ_7745c5c3_Err != nil { | |
| 2335 | 2322 | return templ_7745c5c3_Err | |
| 2336 | 2323 | } | |
| 2337 | - | var templ_7745c5c3_Var112 string | |
| 2338 | - | templ_7745c5c3_Var112, templ_7745c5c3_Err = templ.JoinStringErrs(v.Author) | |
| 2324 | + | var templ_7745c5c3_Var111 string | |
| 2325 | + | templ_7745c5c3_Var111, templ_7745c5c3_Err = templ.JoinStringErrs(v.Author) | |
| 2339 | 2326 | if templ_7745c5c3_Err != nil { | |
| 2340 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 454, Col: 50} | |
| 2327 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 451, Col: 50} | |
| 2341 | 2328 | } | |
| 2342 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var112)) | |
| 2329 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var111)) | |
| 2343 | 2330 | if templ_7745c5c3_Err != nil { | |
| 2344 | 2331 | return templ_7745c5c3_Err | |
| 2345 | 2332 | } | |
| 2346 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 219, ": ") | |
| 2333 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 218, ": ") | |
| 2347 | 2334 | if templ_7745c5c3_Err != nil { | |
| 2348 | 2335 | return templ_7745c5c3_Err | |
| 2349 | 2336 | } | |
| 2350 | - | var templ_7745c5c3_Var113 string | |
| 2351 | - | templ_7745c5c3_Var113, templ_7745c5c3_Err = templ.JoinStringErrs(v.Label) | |
| 2337 | + | var templ_7745c5c3_Var112 string | |
| 2338 | + | templ_7745c5c3_Var112, templ_7745c5c3_Err = templ.JoinStringErrs(v.Label) | |
| 2352 | 2339 | if templ_7745c5c3_Err != nil { | |
| 2353 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 454, Col: 63} | |
| 2340 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 451, Col: 63} | |
| 2354 | 2341 | } | |
| 2355 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var113)) | |
| 2342 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var112)) | |
| 2356 | 2343 | if templ_7745c5c3_Err != nil { | |
| 2357 | 2344 | return templ_7745c5c3_Err | |
| 2358 | 2345 | } | |
| 2359 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 220, "</a> ") | |
| 2346 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 219, "</a> ") | |
| 2360 | 2347 | if templ_7745c5c3_Err != nil { | |
| 2361 | 2348 | return templ_7745c5c3_Err | |
| 2362 | 2349 | } | |
| 2363 | 2350 | if v.Stale { | |
| 2364 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 221, "<span class=\"mute\">(stale)</span>") | |
| 2351 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 220, "<span class=\"mute\">(stale)</span>") | |
| 2365 | 2352 | if templ_7745c5c3_Err != nil { | |
| 2366 | 2353 | return templ_7745c5c3_Err | |
| 2367 | 2354 | } | |
| 2368 | 2355 | } | |
| 2369 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 222, "</li>") | |
| 2356 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 221, "</li>") | |
| 2370 | 2357 | if templ_7745c5c3_Err != nil { | |
| 2371 | 2358 | return templ_7745c5c3_Err | |
| 2372 | 2359 | } | |
| 2373 | 2360 | } | |
| 2374 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 223, "</ul></section>") | |
| 2361 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 222, "</ul></section>") | |
| 2375 | 2362 | if templ_7745c5c3_Err != nil { | |
| 2376 | 2363 | return templ_7745c5c3_Err | |
| 2377 | 2364 | } | |
| @@ -2400,51 +2387,51 @@ func mrBar(p MRPage) templ.Component { | |||
| 2400 | 2387 | }() | |
| 2401 | 2388 | } | |
| 2402 | 2389 | ctx = templ.InitializeContext(ctx) | |
| 2403 | - | templ_7745c5c3_Var114 := templ.GetChildren(ctx) | |
| 2404 | - | if templ_7745c5c3_Var114 == nil { | |
| 2405 | - | templ_7745c5c3_Var114 = templ.NopComponent | |
| 2390 | + | templ_7745c5c3_Var113 := templ.GetChildren(ctx) | |
| 2391 | + | if templ_7745c5c3_Var113 == nil { | |
| 2392 | + | templ_7745c5c3_Var113 = templ.NopComponent | |
| 2406 | 2393 | } | |
| 2407 | 2394 | ctx = templ.ClearChildren(ctx) | |
| 2408 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 224, "<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, 223, "<div class=\"diff-tools mr-bar\" role=\"group\" aria-label=\"Diff view and merge\"><span class=\"dim\">") | |
| 2409 | 2396 | if templ_7745c5c3_Err != nil { | |
| 2410 | 2397 | return templ_7745c5c3_Err | |
| 2411 | 2398 | } | |
| 2412 | - | var templ_7745c5c3_Var115 string | |
| 2413 | - | templ_7745c5c3_Var115, templ_7745c5c3_Err = templ.JoinStringErrs(plural(p.NFiles, "file", "files")) | |
| 2399 | + | var templ_7745c5c3_Var114 string | |
| 2400 | + | templ_7745c5c3_Var114, templ_7745c5c3_Err = templ.JoinStringErrs(plural(p.NFiles, "file", "files")) | |
| 2414 | 2401 | if templ_7745c5c3_Err != nil { | |
| 2415 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 471, Col: 55} | |
| 2402 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 468, Col: 55} | |
| 2416 | 2403 | } | |
| 2417 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var115)) | |
| 2404 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var114)) | |
| 2418 | 2405 | if templ_7745c5c3_Err != nil { | |
| 2419 | 2406 | return templ_7745c5c3_Err | |
| 2420 | 2407 | } | |
| 2421 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 225, " · <span class=\"plus\">+") | |
| 2408 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 224, " · <span class=\"plus\">+") | |
| 2422 | 2409 | if templ_7745c5c3_Err != nil { | |
| 2423 | 2410 | return templ_7745c5c3_Err | |
| 2424 | 2411 | } | |
| 2425 | - | var templ_7745c5c3_Var116 string | |
| 2426 | - | templ_7745c5c3_Var116, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Adds)) | |
| 2412 | + | var templ_7745c5c3_Var115 string | |
| 2413 | + | templ_7745c5c3_Var115, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Adds)) | |
| 2427 | 2414 | if templ_7745c5c3_Err != nil { | |
| 2428 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 471, Col: 95} | |
| 2415 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 468, Col: 95} | |
| 2429 | 2416 | } | |
| 2430 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var116)) | |
| 2417 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var115)) | |
| 2431 | 2418 | if templ_7745c5c3_Err != nil { | |
| 2432 | 2419 | return templ_7745c5c3_Err | |
| 2433 | 2420 | } | |
| 2434 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 226, "</span> <span class=\"minus\">-") | |
| 2421 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 225, "</span> <span class=\"minus\">-") | |
| 2435 | 2422 | if templ_7745c5c3_Err != nil { | |
| 2436 | 2423 | return templ_7745c5c3_Err | |
| 2437 | 2424 | } | |
| 2438 | - | var templ_7745c5c3_Var117 string | |
| 2439 | - | templ_7745c5c3_Var117, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Dels)) | |
| 2425 | + | var templ_7745c5c3_Var116 string | |
| 2426 | + | templ_7745c5c3_Var116, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Dels)) | |
| 2440 | 2427 | if templ_7745c5c3_Err != nil { | |
| 2441 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 471, Col: 140} | |
| 2428 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 468, Col: 140} | |
| 2442 | 2429 | } | |
| 2443 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var117)) | |
| 2430 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var116)) | |
| 2444 | 2431 | if templ_7745c5c3_Err != nil { | |
| 2445 | 2432 | return templ_7745c5c3_Err | |
| 2446 | 2433 | } | |
| 2447 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 227, "</span></span>") | |
| 2434 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 226, "</span></span>") | |
| 2448 | 2435 | if templ_7745c5c3_Err != nil { | |
| 2449 | 2436 | return templ_7745c5c3_Err | |
| 2450 | 2437 | } | |
| @@ -2452,7 +2439,7 @@ func mrBar(p MRPage) templ.Component { | |||
| 2452 | 2439 | if templ_7745c5c3_Err != nil { | |
| 2453 | 2440 | return templ_7745c5c3_Err | |
| 2454 | 2441 | } | |
| 2455 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 228, "<span class=\"grow\"></span>") | |
| 2442 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 227, "<span class=\"grow\"></span>") | |
| 2456 | 2443 | if templ_7745c5c3_Err != nil { | |
| 2457 | 2444 | return templ_7745c5c3_Err | |
| 2458 | 2445 | } | |
| @@ -2470,7 +2457,7 @@ func mrBar(p MRPage) templ.Component { | |||
| 2470 | 2457 | if templ_7745c5c3_Err != nil { | |
| 2471 | 2458 | return templ_7745c5c3_Err | |
| 2472 | 2459 | } | |
| 2473 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 229, "</div>") | |
| 2460 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 228, "</div>") | |
| 2474 | 2461 | if templ_7745c5c3_Err != nil { | |
| 2475 | 2462 | return templ_7745c5c3_Err | |
| 2476 | 2463 | } | |
| @@ -2502,80 +2489,80 @@ func mergeMenu(p MRPage) templ.Component { | |||
| 2502 | 2489 | }() | |
| 2503 | 2490 | } | |
| 2504 | 2491 | ctx = templ.InitializeContext(ctx) | |
| 2505 | - | templ_7745c5c3_Var118 := templ.GetChildren(ctx) | |
| 2506 | - | if templ_7745c5c3_Var118 == nil { | |
| 2507 | - | templ_7745c5c3_Var118 = templ.NopComponent | |
| 2492 | + | templ_7745c5c3_Var117 := templ.GetChildren(ctx) | |
| 2493 | + | if templ_7745c5c3_Var117 == nil { | |
| 2494 | + | templ_7745c5c3_Var117 = templ.NopComponent | |
| 2508 | 2495 | } | |
| 2509 | 2496 | ctx = templ.ClearChildren(ctx) | |
| 2510 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 230, "<details class=\"menu mmenu\" id=\"merge-menu\" data-state=\"open\"") | |
| 2497 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 229, "<details class=\"menu mmenu\" id=\"merge-menu\" data-state=\"open\"") | |
| 2511 | 2498 | if templ_7745c5c3_Err != nil { | |
| 2512 | 2499 | return templ_7745c5c3_Err | |
| 2513 | 2500 | } | |
| 2514 | 2501 | if p.Box.Error != "" { | |
| 2515 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 231, " open") | |
| 2502 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 230, " open") | |
| 2516 | 2503 | if templ_7745c5c3_Err != nil { | |
| 2517 | 2504 | return templ_7745c5c3_Err | |
| 2518 | 2505 | } | |
| 2519 | 2506 | } | |
| 2520 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 232, "><summary class=\"btn primary\" aria-keyshortcuts=\"Shift+M\">") | |
| 2507 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 231, "><summary class=\"btn primary\" aria-keyshortcuts=\"Shift+M\">") | |
| 2521 | 2508 | if templ_7745c5c3_Err != nil { | |
| 2522 | 2509 | return templ_7745c5c3_Err | |
| 2523 | 2510 | } | |
| 2524 | 2511 | if p.Box.ReadyAction != "" { | |
| 2525 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 233, "Draft ") | |
| 2512 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 232, "Draft ") | |
| 2526 | 2513 | if templ_7745c5c3_Err != nil { | |
| 2527 | 2514 | return templ_7745c5c3_Err | |
| 2528 | 2515 | } | |
| 2529 | 2516 | } else { | |
| 2530 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 234, "Merge ") | |
| 2517 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 233, "Merge ") | |
| 2531 | 2518 | if templ_7745c5c3_Err != nil { | |
| 2532 | 2519 | return templ_7745c5c3_Err | |
| 2533 | 2520 | } | |
| 2534 | 2521 | } | |
| 2535 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 235, "<kbd aria-hidden=\"true\">M</kbd></summary><div class=\"menu-pop\" role=\"group\" aria-label=\"Merge\">") | |
| 2522 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 234, "<kbd aria-hidden=\"true\">M</kbd></summary><div class=\"menu-pop\" role=\"group\" aria-label=\"Merge\">") | |
| 2536 | 2523 | if templ_7745c5c3_Err != nil { | |
| 2537 | 2524 | return templ_7745c5c3_Err | |
| 2538 | 2525 | } | |
| 2539 | 2526 | if p.Box.HeadGone { | |
| 2540 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 236, "<p class=\"dim\">the source branch was deleted</p>") | |
| 2527 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 235, "<p class=\"dim\">the source branch was deleted</p>") | |
| 2541 | 2528 | if templ_7745c5c3_Err != nil { | |
| 2542 | 2529 | return templ_7745c5c3_Err | |
| 2543 | 2530 | } | |
| 2544 | 2531 | } | |
| 2545 | 2532 | if p.Box.Error != "" { | |
| 2546 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 237, "<p class=\"d-err\" role=\"alert\">") | |
| 2533 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 236, "<p class=\"d-err\" role=\"alert\">") | |
| 2547 | 2534 | if templ_7745c5c3_Err != nil { | |
| 2548 | 2535 | return templ_7745c5c3_Err | |
| 2549 | 2536 | } | |
| 2550 | - | var templ_7745c5c3_Var119 string | |
| 2551 | - | templ_7745c5c3_Var119, templ_7745c5c3_Err = templ.JoinStringErrs(p.Box.Error) | |
| 2537 | + | var templ_7745c5c3_Var118 string | |
| 2538 | + | templ_7745c5c3_Var118, templ_7745c5c3_Err = templ.JoinStringErrs(p.Box.Error) | |
| 2552 | 2539 | if templ_7745c5c3_Err != nil { | |
| 2553 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 505, Col: 47} | |
| 2540 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 502, Col: 47} | |
| 2554 | 2541 | } | |
| 2555 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var119)) | |
| 2542 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var118)) | |
| 2556 | 2543 | if templ_7745c5c3_Err != nil { | |
| 2557 | 2544 | return templ_7745c5c3_Err | |
| 2558 | 2545 | } | |
| 2559 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 238, "</p>") | |
| 2546 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 237, "</p>") | |
| 2560 | 2547 | if templ_7745c5c3_Err != nil { | |
| 2561 | 2548 | return templ_7745c5c3_Err | |
| 2562 | 2549 | } | |
| 2563 | 2550 | } | |
| 2564 | 2551 | if p.Box.ReadyAction != "" { | |
| 2565 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 239, "<p class=\"d-draft\">this is a draft: it cannot be merged until it is ready for review.</p><form class=\"d-btns\" method=\"post\" action=\"") | |
| 2552 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 238, "<p class=\"d-draft\">this is a draft: it cannot be merged until it is ready for review.</p><form class=\"d-btns\" method=\"post\" action=\"") | |
| 2566 | 2553 | if templ_7745c5c3_Err != nil { | |
| 2567 | 2554 | return templ_7745c5c3_Err | |
| 2568 | 2555 | } | |
| 2569 | - | var templ_7745c5c3_Var120 templ.SafeURL | |
| 2570 | - | templ_7745c5c3_Var120, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.ReadyAction)) | |
| 2556 | + | var templ_7745c5c3_Var119 templ.SafeURL | |
| 2557 | + | templ_7745c5c3_Var119, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.ReadyAction)) | |
| 2571 | 2558 | if templ_7745c5c3_Err != nil { | |
| 2572 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 509, Col: 80} | |
| 2559 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 506, Col: 80} | |
| 2573 | 2560 | } | |
| 2574 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var120)) | |
| 2561 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var119)) | |
| 2575 | 2562 | if templ_7745c5c3_Err != nil { | |
| 2576 | 2563 | return templ_7745c5c3_Err | |
| 2577 | 2564 | } | |
| 2578 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 240, "\"><button type=\"submit\" class=\"btn primary\" data-default title=\"remove the draft prefix from the title\">Ready for review</button></form>") | |
| 2565 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 239, "\"><button type=\"submit\" class=\"btn primary\" data-default title=\"remove the draft prefix from the title\">Ready for review</button></form>") | |
| 2579 | 2566 | if templ_7745c5c3_Err != nil { | |
| 2580 | 2567 | return templ_7745c5c3_Err | |
| 2581 | 2568 | } | |
| @@ -2584,185 +2571,185 @@ func mergeMenu(p MRPage) templ.Component { | |||
| 2584 | 2571 | if templ_7745c5c3_Err != nil { | |
| 2585 | 2572 | return templ_7745c5c3_Err | |
| 2586 | 2573 | } | |
| 2587 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 241, " <form class=\"d-acts\" method=\"post\" action=\"") | |
| 2574 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 240, " <form class=\"d-acts\" method=\"post\" action=\"") | |
| 2588 | 2575 | if templ_7745c5c3_Err != nil { | |
| 2589 | 2576 | return templ_7745c5c3_Err | |
| 2590 | 2577 | } | |
| 2591 | - | var templ_7745c5c3_Var121 templ.SafeURL | |
| 2592 | - | templ_7745c5c3_Var121, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.MergeAction)) | |
| 2578 | + | var templ_7745c5c3_Var120 templ.SafeURL | |
| 2579 | + | templ_7745c5c3_Var120, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.MergeAction)) | |
| 2593 | 2580 | if templ_7745c5c3_Err != nil { | |
| 2594 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 514, Col: 80} | |
| 2581 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 511, Col: 80} | |
| 2595 | 2582 | } | |
| 2596 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var121)) | |
| 2583 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var120)) | |
| 2597 | 2584 | if templ_7745c5c3_Err != nil { | |
| 2598 | 2585 | return templ_7745c5c3_Err | |
| 2599 | 2586 | } | |
| 2600 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 242, "\"><input type=\"hidden\" name=\"head_id\" value=\"") | |
| 2587 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 241, "\"><input type=\"hidden\" name=\"head_id\" value=\"") | |
| 2601 | 2588 | if templ_7745c5c3_Err != nil { | |
| 2602 | 2589 | return templ_7745c5c3_Err | |
| 2603 | 2590 | } | |
| 2604 | - | var templ_7745c5c3_Var122 string | |
| 2605 | - | templ_7745c5c3_Var122, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Box.Head) | |
| 2591 | + | var templ_7745c5c3_Var121 string | |
| 2592 | + | templ_7745c5c3_Var121, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Box.Head) | |
| 2606 | 2593 | if templ_7745c5c3_Err != nil { | |
| 2607 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 515, Col: 59} | |
| 2594 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 512, Col: 59} | |
| 2608 | 2595 | } | |
| 2609 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var122) | |
| 2596 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var121) | |
| 2610 | 2597 | if templ_7745c5c3_Err != nil { | |
| 2611 | 2598 | return templ_7745c5c3_Err | |
| 2612 | 2599 | } | |
| 2613 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 243, "\"><fieldset class=\"d-modes\"><legend class=\"sr\">merge mode</legend> ") | |
| 2600 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 242, "\"><fieldset class=\"d-modes\"><legend class=\"sr\">merge mode</legend> ") | |
| 2614 | 2601 | if templ_7745c5c3_Err != nil { | |
| 2615 | 2602 | return templ_7745c5c3_Err | |
| 2616 | 2603 | } | |
| 2617 | 2604 | for i, m := range p.Box.Modes { | |
| 2618 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 244, "<label><input type=\"radio\" name=\"mode\" value=\"") | |
| 2605 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 243, "<label><input type=\"radio\" name=\"mode\" value=\"") | |
| 2619 | 2606 | if templ_7745c5c3_Err != nil { | |
| 2620 | 2607 | return templ_7745c5c3_Err | |
| 2621 | 2608 | } | |
| 2622 | - | var templ_7745c5c3_Var123 string | |
| 2623 | - | templ_7745c5c3_Var123, templ_7745c5c3_Err = templ.ResolveAttributeValue(m.Value) | |
| 2609 | + | var templ_7745c5c3_Var122 string | |
| 2610 | + | templ_7745c5c3_Var122, templ_7745c5c3_Err = templ.ResolveAttributeValue(m.Value) | |
| 2624 | 2611 | if templ_7745c5c3_Err != nil { | |
| 2625 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 523, Col: 24} | |
| 2612 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 520, Col: 24} | |
| 2626 | 2613 | } | |
| 2627 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var123) | |
| 2614 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var122) | |
| 2628 | 2615 | if templ_7745c5c3_Err != nil { | |
| 2629 | 2616 | return templ_7745c5c3_Err | |
| 2630 | 2617 | } | |
| 2631 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 245, "\"") | |
| 2618 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 244, "\"") | |
| 2632 | 2619 | if templ_7745c5c3_Err != nil { | |
| 2633 | 2620 | return templ_7745c5c3_Err | |
| 2634 | 2621 | } | |
| 2635 | 2622 | if i == p.Box.Checked() { | |
| 2636 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 246, " checked") | |
| 2623 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 245, " checked") | |
| 2637 | 2624 | if templ_7745c5c3_Err != nil { | |
| 2638 | 2625 | return templ_7745c5c3_Err | |
| 2639 | 2626 | } | |
| 2640 | 2627 | } | |
| 2641 | 2628 | if m.Disabled { | |
| 2642 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 247, " disabled") | |
| 2629 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 246, " disabled") | |
| 2643 | 2630 | if templ_7745c5c3_Err != nil { | |
| 2644 | 2631 | return templ_7745c5c3_Err | |
| 2645 | 2632 | } | |
| 2646 | 2633 | } | |
| 2647 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 248, " title=\"") | |
| 2634 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 247, " title=\"") | |
| 2648 | 2635 | if templ_7745c5c3_Err != nil { | |
| 2649 | 2636 | return templ_7745c5c3_Err | |
| 2650 | 2637 | } | |
| 2651 | - | var templ_7745c5c3_Var124 string | |
| 2652 | - | templ_7745c5c3_Var124, templ_7745c5c3_Err = templ.ResolveAttributeValue(m.Reason) | |
| 2638 | + | var templ_7745c5c3_Var123 string | |
| 2639 | + | templ_7745c5c3_Var123, templ_7745c5c3_Err = templ.ResolveAttributeValue(m.Reason) | |
| 2653 | 2640 | if templ_7745c5c3_Err != nil { | |
| 2654 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 526, Col: 25} | |
| 2641 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 523, Col: 25} | |
| 2655 | 2642 | } | |
| 2656 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var124) | |
| 2643 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var123) | |
| 2657 | 2644 | if templ_7745c5c3_Err != nil { | |
| 2658 | 2645 | return templ_7745c5c3_Err | |
| 2659 | 2646 | } | |
| 2660 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 249, "\" :disabled=\"this.value === 'fast-forward' ? q('[data-mergeability]').data.ffOk !== true : q('[data-mergeability]').data.mergeOk !== true\" :title=\"this.value === 'fast-forward' ? q('[data-mergeability]').data.ffReason : q('[data-mergeability]').data.mergeReason\"> ") | |
| 2647 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 248, "\" :disabled=\"this.value === 'fast-forward' ? q('[data-mergeability]').data.ffOk !== true : q('[data-mergeability]').data.mergeOk !== true\" :title=\"this.value === 'fast-forward' ? q('[data-mergeability]').data.ffReason : q('[data-mergeability]').data.mergeReason\"> ") | |
| 2661 | 2648 | if templ_7745c5c3_Err != nil { | |
| 2662 | 2649 | return templ_7745c5c3_Err | |
| 2663 | 2650 | } | |
| 2664 | - | var templ_7745c5c3_Var125 string | |
| 2665 | - | templ_7745c5c3_Var125, templ_7745c5c3_Err = templ.JoinStringErrs(m.Label) | |
| 2651 | + | var templ_7745c5c3_Var124 string | |
| 2652 | + | templ_7745c5c3_Var124, templ_7745c5c3_Err = templ.JoinStringErrs(m.Label) | |
| 2666 | 2653 | if templ_7745c5c3_Err != nil { | |
| 2667 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 530, Col: 17} | |
| 2654 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 527, Col: 17} | |
| 2668 | 2655 | } | |
| 2669 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var125)) | |
| 2656 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var124)) | |
| 2670 | 2657 | if templ_7745c5c3_Err != nil { | |
| 2671 | 2658 | return templ_7745c5c3_Err | |
| 2672 | 2659 | } | |
| 2673 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 250, " ") | |
| 2660 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 249, " ") | |
| 2674 | 2661 | if templ_7745c5c3_Err != nil { | |
| 2675 | 2662 | return templ_7745c5c3_Err | |
| 2676 | 2663 | } | |
| 2677 | 2664 | if i < 9 { | |
| 2678 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 251, "<kbd aria-hidden=\"true\">") | |
| 2665 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 250, "<kbd aria-hidden=\"true\">") | |
| 2679 | 2666 | if templ_7745c5c3_Err != nil { | |
| 2680 | 2667 | return templ_7745c5c3_Err | |
| 2681 | 2668 | } | |
| 2682 | - | var templ_7745c5c3_Var126 string | |
| 2683 | - | templ_7745c5c3_Var126, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(i + 1)) | |
| 2669 | + | var templ_7745c5c3_Var125 string | |
| 2670 | + | templ_7745c5c3_Var125, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(i + 1)) | |
| 2684 | 2671 | if templ_7745c5c3_Err != nil { | |
| 2685 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 532, Col: 46} | |
| 2672 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 529, Col: 46} | |
| 2686 | 2673 | } | |
| 2687 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var126)) | |
| 2674 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var125)) | |
| 2688 | 2675 | if templ_7745c5c3_Err != nil { | |
| 2689 | 2676 | return templ_7745c5c3_Err | |
| 2690 | 2677 | } | |
| 2691 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 252, "</kbd>") | |
| 2678 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 251, "</kbd>") | |
| 2692 | 2679 | if templ_7745c5c3_Err != nil { | |
| 2693 | 2680 | return templ_7745c5c3_Err | |
| 2694 | 2681 | } | |
| 2695 | 2682 | } | |
| 2696 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 253, "</label>") | |
| 2683 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 252, "</label>") | |
| 2697 | 2684 | if templ_7745c5c3_Err != nil { | |
| 2698 | 2685 | return templ_7745c5c3_Err | |
| 2699 | 2686 | } | |
| 2700 | 2687 | } | |
| 2701 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 254, "</fieldset>") | |
| 2688 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 253, "</fieldset>") | |
| 2702 | 2689 | if templ_7745c5c3_Err != nil { | |
| 2703 | 2690 | return templ_7745c5c3_Err | |
| 2704 | 2691 | } | |
| 2705 | 2692 | if p.Box.CanDeleteBranch { | |
| 2706 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 255, "<label class=\"d-check\"><input type=\"checkbox\" name=\"delete_branch\" value=\"1\"> delete ") | |
| 2693 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 254, "<label class=\"d-check\"><input type=\"checkbox\" name=\"delete_branch\" value=\"1\"> delete ") | |
| 2707 | 2694 | if templ_7745c5c3_Err != nil { | |
| 2708 | 2695 | return templ_7745c5c3_Err | |
| 2709 | 2696 | } | |
| 2710 | - | var templ_7745c5c3_Var127 string | |
| 2711 | - | templ_7745c5c3_Var127, templ_7745c5c3_Err = templ.JoinStringErrs(p.Source) | |
| 2697 | + | var templ_7745c5c3_Var126 string | |
| 2698 | + | templ_7745c5c3_Var126, templ_7745c5c3_Err = templ.JoinStringErrs(p.Source) | |
| 2712 | 2699 | if templ_7745c5c3_Err != nil { | |
| 2713 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 538, Col: 102} | |
| 2700 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 535, Col: 102} | |
| 2714 | 2701 | } | |
| 2715 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var127)) | |
| 2702 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var126)) | |
| 2716 | 2703 | if templ_7745c5c3_Err != nil { | |
| 2717 | 2704 | return templ_7745c5c3_Err | |
| 2718 | 2705 | } | |
| 2719 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 256, " after the merge <kbd aria-hidden=\"true\">D</kbd></label>") | |
| 2706 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 255, " after the merge <kbd aria-hidden=\"true\">D</kbd></label>") | |
| 2720 | 2707 | if templ_7745c5c3_Err != nil { | |
| 2721 | 2708 | return templ_7745c5c3_Err | |
| 2722 | 2709 | } | |
| 2723 | 2710 | } | |
| 2724 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 257, "<div class=\"d-btns\"><button type=\"submit\" class=\"btn primary\" data-default") | |
| 2711 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 256, "<div class=\"d-btns\"><button type=\"submit\" class=\"btn primary\" data-default") | |
| 2725 | 2712 | if templ_7745c5c3_Err != nil { | |
| 2726 | 2713 | return templ_7745c5c3_Err | |
| 2727 | 2714 | } | |
| 2728 | 2715 | if !p.Box.CanMerge() { | |
| 2729 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 258, " disabled") | |
| 2716 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 257, " disabled") | |
| 2730 | 2717 | if templ_7745c5c3_Err != nil { | |
| 2731 | 2718 | return templ_7745c5c3_Err | |
| 2732 | 2719 | } | |
| 2733 | 2720 | } | |
| 2734 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 259, " title=\"") | |
| 2721 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 258, " title=\"") | |
| 2735 | 2722 | if templ_7745c5c3_Err != nil { | |
| 2736 | 2723 | return templ_7745c5c3_Err | |
| 2737 | 2724 | } | |
| 2738 | - | var templ_7745c5c3_Var128 string | |
| 2739 | - | templ_7745c5c3_Var128, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Box.MergeTitle()) | |
| 2725 | + | var templ_7745c5c3_Var127 string | |
| 2726 | + | templ_7745c5c3_Var127, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Box.MergeTitle()) | |
| 2740 | 2727 | if templ_7745c5c3_Err != nil { | |
| 2741 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 546, Col: 33} | |
| 2728 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 543, Col: 33} | |
| 2742 | 2729 | } | |
| 2743 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var128) | |
| 2730 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var127) | |
| 2744 | 2731 | if templ_7745c5c3_Err != nil { | |
| 2745 | 2732 | return templ_7745c5c3_Err | |
| 2746 | 2733 | } | |
| 2747 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 260, "\" :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, 259, "\" :disabled=\"!this.form.querySelector('input[name=mode]:checked:not(:disabled)')\" :title=\"(this.form.querySelector('input[name=mode]:checked') || {}).title || ''\">Merge into ") | |
| 2748 | 2735 | if templ_7745c5c3_Err != nil { | |
| 2749 | 2736 | return templ_7745c5c3_Err | |
| 2750 | 2737 | } | |
| 2751 | - | var templ_7745c5c3_Var129 string | |
| 2752 | - | templ_7745c5c3_Var129, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | |
| 2738 | + | var templ_7745c5c3_Var128 string | |
| 2739 | + | templ_7745c5c3_Var128, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | |
| 2753 | 2740 | if templ_7745c5c3_Err != nil { | |
| 2754 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 549, Col: 28} | |
| 2741 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 546, Col: 28} | |
| 2755 | 2742 | } | |
| 2756 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var129)) | |
| 2743 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var128)) | |
| 2757 | 2744 | if templ_7745c5c3_Err != nil { | |
| 2758 | 2745 | return templ_7745c5c3_Err | |
| 2759 | 2746 | } | |
| 2760 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 261, "</button></div></form>") | |
| 2747 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 260, "</button></div></form>") | |
| 2761 | 2748 | if templ_7745c5c3_Err != nil { | |
| 2762 | 2749 | return templ_7745c5c3_Err | |
| 2763 | 2750 | } | |
| 2764 | 2751 | } | |
| 2765 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 262, "</div></details>") | |
| 2752 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 261, "</div></details>") | |
| 2766 | 2753 | if templ_7745c5c3_Err != nil { | |
| 2767 | 2754 | return templ_7745c5c3_Err | |
| 2768 | 2755 | } | |
| @@ -2788,182 +2775,182 @@ func MRMergeability(v MergeabilityView) templ.Component { | |||
| 2788 | 2775 | }() | |
| 2789 | 2776 | } | |
| 2790 | 2777 | ctx = templ.InitializeContext(ctx) | |
| 2791 | - | templ_7745c5c3_Var130 := templ.GetChildren(ctx) | |
| 2792 | - | if templ_7745c5c3_Var130 == nil { | |
| 2793 | - | templ_7745c5c3_Var130 = templ.NopComponent | |
| 2778 | + | templ_7745c5c3_Var129 := templ.GetChildren(ctx) | |
| 2779 | + | if templ_7745c5c3_Var129 == nil { | |
| 2780 | + | templ_7745c5c3_Var129 = templ.NopComponent | |
| 2794 | 2781 | } | |
| 2795 | 2782 | ctx = templ.ClearChildren(ctx) | |
| 2796 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 263, "<span data-mergeability data-state=\"") | |
| 2783 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 262, "<span data-mergeability data-state=\"") | |
| 2784 | + | if templ_7745c5c3_Err != nil { | |
| 2785 | + | return templ_7745c5c3_Err | |
| 2786 | + | } | |
| 2787 | + | var templ_7745c5c3_Var130 string | |
| 2788 | + | templ_7745c5c3_Var130, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.State) | |
| 2789 | + | if templ_7745c5c3_Err != nil { | |
| 2790 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 559, Col: 22} | |
| 2791 | + | } | |
| 2792 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var130) | |
| 2793 | + | if templ_7745c5c3_Err != nil { | |
| 2794 | + | return templ_7745c5c3_Err | |
| 2795 | + | } | |
| 2796 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 263, "\" data-ff-ok=\"") | |
| 2797 | 2797 | if templ_7745c5c3_Err != nil { | |
| 2798 | 2798 | return templ_7745c5c3_Err | |
| 2799 | 2799 | } | |
| 2800 | 2800 | var templ_7745c5c3_Var131 string | |
| 2801 | - | templ_7745c5c3_Var131, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.State) | |
| 2801 | + | templ_7745c5c3_Var131, templ_7745c5c3_Err = templ.ResolveAttributeValue(strconv.FormatBool(v.FFOk)) | |
| 2802 | 2802 | if templ_7745c5c3_Err != nil { | |
| 2803 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 562, Col: 22} | |
| 2803 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 560, Col: 41} | |
| 2804 | 2804 | } | |
| 2805 | 2805 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var131) | |
| 2806 | 2806 | if templ_7745c5c3_Err != nil { | |
| 2807 | 2807 | return templ_7745c5c3_Err | |
| 2808 | 2808 | } | |
| 2809 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 264, "\" data-ff-ok=\"") | |
| 2809 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 264, "\" data-merge-ok=\"") | |
| 2810 | 2810 | if templ_7745c5c3_Err != nil { | |
| 2811 | 2811 | return templ_7745c5c3_Err | |
| 2812 | 2812 | } | |
| 2813 | 2813 | var templ_7745c5c3_Var132 string | |
| 2814 | - | templ_7745c5c3_Var132, templ_7745c5c3_Err = templ.ResolveAttributeValue(strconv.FormatBool(v.FFOk)) | |
| 2814 | + | templ_7745c5c3_Var132, templ_7745c5c3_Err = templ.ResolveAttributeValue(strconv.FormatBool(v.MergeOk)) | |
| 2815 | 2815 | if templ_7745c5c3_Err != nil { | |
| 2816 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 563, Col: 41} | |
| 2816 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 561, Col: 47} | |
| 2817 | 2817 | } | |
| 2818 | 2818 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var132) | |
| 2819 | 2819 | if templ_7745c5c3_Err != nil { | |
| 2820 | 2820 | return templ_7745c5c3_Err | |
| 2821 | 2821 | } | |
| 2822 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 265, "\" data-merge-ok=\"") | |
| 2822 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 265, "\" data-ff-reason=\"") | |
| 2823 | 2823 | if templ_7745c5c3_Err != nil { | |
| 2824 | 2824 | return templ_7745c5c3_Err | |
| 2825 | 2825 | } | |
| 2826 | 2826 | var templ_7745c5c3_Var133 string | |
| 2827 | - | templ_7745c5c3_Var133, templ_7745c5c3_Err = templ.ResolveAttributeValue(strconv.FormatBool(v.MergeOk)) | |
| 2827 | + | templ_7745c5c3_Var133, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.FFReason) | |
| 2828 | 2828 | if templ_7745c5c3_Err != nil { | |
| 2829 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 564, Col: 47} | |
| 2829 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 562, Col: 29} | |
| 2830 | 2830 | } | |
| 2831 | 2831 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var133) | |
| 2832 | 2832 | if templ_7745c5c3_Err != nil { | |
| 2833 | 2833 | return templ_7745c5c3_Err | |
| 2834 | 2834 | } | |
| 2835 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 266, "\" data-ff-reason=\"") | |
| 2835 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 266, "\" data-merge-reason=\"") | |
| 2836 | 2836 | if templ_7745c5c3_Err != nil { | |
| 2837 | 2837 | return templ_7745c5c3_Err | |
| 2838 | 2838 | } | |
| 2839 | 2839 | var templ_7745c5c3_Var134 string | |
| 2840 | - | templ_7745c5c3_Var134, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.FFReason) | |
| 2840 | + | templ_7745c5c3_Var134, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.MergeReason) | |
| 2841 | 2841 | if templ_7745c5c3_Err != nil { | |
| 2842 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 565, Col: 29} | |
| 2842 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 563, Col: 35} | |
| 2843 | 2843 | } | |
| 2844 | 2844 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var134) | |
| 2845 | 2845 | if templ_7745c5c3_Err != nil { | |
| 2846 | 2846 | return templ_7745c5c3_Err | |
| 2847 | 2847 | } | |
| 2848 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 267, "\" data-merge-reason=\"") | |
| 2848 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 267, "\"><span class=\"badge\" data-state=\"") | |
| 2849 | 2849 | if templ_7745c5c3_Err != nil { | |
| 2850 | 2850 | return templ_7745c5c3_Err | |
| 2851 | 2851 | } | |
| 2852 | 2852 | var templ_7745c5c3_Var135 string | |
| 2853 | - | templ_7745c5c3_Var135, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.MergeReason) | |
| 2853 | + | templ_7745c5c3_Var135, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.State) | |
| 2854 | 2854 | if templ_7745c5c3_Err != nil { | |
| 2855 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 566, Col: 35} | |
| 2855 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 565, Col: 42} | |
| 2856 | 2856 | } | |
| 2857 | 2857 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var135) | |
| 2858 | 2858 | if templ_7745c5c3_Err != nil { | |
| 2859 | 2859 | return templ_7745c5c3_Err | |
| 2860 | 2860 | } | |
| 2861 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 268, "\"><span class=\"badge\" data-state=\"") | |
| 2861 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 268, "\">") | |
| 2862 | 2862 | if templ_7745c5c3_Err != nil { | |
| 2863 | 2863 | return templ_7745c5c3_Err | |
| 2864 | 2864 | } | |
| 2865 | 2865 | var templ_7745c5c3_Var136 string | |
| 2866 | - | templ_7745c5c3_Var136, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.State) | |
| 2867 | - | if templ_7745c5c3_Err != nil { | |
| 2868 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 568, Col: 42} | |
| 2869 | - | } | |
| 2870 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var136) | |
| 2871 | - | if templ_7745c5c3_Err != nil { | |
| 2872 | - | return templ_7745c5c3_Err | |
| 2873 | - | } | |
| 2874 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 269, "\">") | |
| 2866 | + | templ_7745c5c3_Var136, templ_7745c5c3_Err = templ.JoinStringErrs(v.Label) | |
| 2875 | 2867 | if templ_7745c5c3_Err != nil { | |
| 2876 | - | return templ_7745c5c3_Err | |
| 2868 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 565, Col: 54} | |
| 2877 | 2869 | } | |
| 2878 | - | var templ_7745c5c3_Var137 string | |
| 2879 | - | templ_7745c5c3_Var137, templ_7745c5c3_Err = templ.JoinStringErrs(v.Label) | |
| 2880 | - | if templ_7745c5c3_Err != nil { | |
| 2881 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 568, Col: 54} | |
| 2882 | - | } | |
| 2883 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var137)) | |
| 2870 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var136)) | |
| 2884 | 2871 | if templ_7745c5c3_Err != nil { | |
| 2885 | 2872 | return templ_7745c5c3_Err | |
| 2886 | 2873 | } | |
| 2887 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 270, "</span> ") | |
| 2874 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 269, "</span> ") | |
| 2888 | 2875 | if templ_7745c5c3_Err != nil { | |
| 2889 | 2876 | return templ_7745c5c3_Err | |
| 2890 | 2877 | } | |
| 2891 | 2878 | if v.Detail != "" { | |
| 2892 | - | var templ_7745c5c3_Var138 string | |
| 2893 | - | templ_7745c5c3_Var138, templ_7745c5c3_Err = templ.JoinStringErrs(" ") | |
| 2879 | + | var templ_7745c5c3_Var137 string | |
| 2880 | + | templ_7745c5c3_Var137, templ_7745c5c3_Err = templ.JoinStringErrs(" ") | |
| 2894 | 2881 | if templ_7745c5c3_Err != nil { | |
| 2895 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 570, Col: 8} | |
| 2882 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 567, Col: 8} | |
| 2896 | 2883 | } | |
| 2897 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var138)) | |
| 2884 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var137)) | |
| 2898 | 2885 | if templ_7745c5c3_Err != nil { | |
| 2899 | 2886 | return templ_7745c5c3_Err | |
| 2900 | 2887 | } | |
| 2901 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 271, "<span class=\"dim\">") | |
| 2888 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 270, "<span class=\"dim\">") | |
| 2902 | 2889 | if templ_7745c5c3_Err != nil { | |
| 2903 | 2890 | return templ_7745c5c3_Err | |
| 2904 | 2891 | } | |
| 2905 | - | var templ_7745c5c3_Var139 string | |
| 2906 | - | templ_7745c5c3_Var139, templ_7745c5c3_Err = templ.JoinStringErrs(v.Detail) | |
| 2892 | + | var templ_7745c5c3_Var138 string | |
| 2893 | + | templ_7745c5c3_Var138, templ_7745c5c3_Err = templ.JoinStringErrs(v.Detail) | |
| 2907 | 2894 | if templ_7745c5c3_Err != nil { | |
| 2908 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 570, Col: 38} | |
| 2895 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 567, Col: 38} | |
| 2909 | 2896 | } | |
| 2910 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var139)) | |
| 2897 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var138)) | |
| 2911 | 2898 | if templ_7745c5c3_Err != nil { | |
| 2912 | 2899 | return templ_7745c5c3_Err | |
| 2913 | 2900 | } | |
| 2914 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 272, "</span>") | |
| 2901 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 271, "</span>") | |
| 2915 | 2902 | if templ_7745c5c3_Err != nil { | |
| 2916 | 2903 | return templ_7745c5c3_Err | |
| 2917 | 2904 | } | |
| 2918 | 2905 | } | |
| 2919 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 273, "</span> ") | |
| 2906 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 272, "</span> ") | |
| 2920 | 2907 | if templ_7745c5c3_Err != nil { | |
| 2921 | 2908 | return templ_7745c5c3_Err | |
| 2922 | 2909 | } | |
| 2923 | 2910 | if len(v.Paths) > 0 { | |
| 2924 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 274, "<ul class=\"mg-paths\" aria-label=\"conflicting files\">") | |
| 2911 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 273, "<ul class=\"mg-paths\" aria-label=\"conflicting files\">") | |
| 2925 | 2912 | if templ_7745c5c3_Err != nil { | |
| 2926 | 2913 | return templ_7745c5c3_Err | |
| 2927 | 2914 | } | |
| 2928 | 2915 | for _, path := range v.Paths { | |
| 2929 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 275, "<li><code>") | |
| 2916 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 274, "<li><code>") | |
| 2930 | 2917 | if templ_7745c5c3_Err != nil { | |
| 2931 | 2918 | return templ_7745c5c3_Err | |
| 2932 | 2919 | } | |
| 2933 | - | var templ_7745c5c3_Var140 string | |
| 2934 | - | templ_7745c5c3_Var140, templ_7745c5c3_Err = templ.JoinStringErrs(path) | |
| 2920 | + | var templ_7745c5c3_Var139 string | |
| 2921 | + | templ_7745c5c3_Var139, templ_7745c5c3_Err = templ.JoinStringErrs(path) | |
| 2935 | 2922 | if templ_7745c5c3_Err != nil { | |
| 2936 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 576, Col: 20} | |
| 2923 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 573, Col: 20} | |
| 2937 | 2924 | } | |
| 2938 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var140)) | |
| 2925 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var139)) | |
| 2939 | 2926 | if templ_7745c5c3_Err != nil { | |
| 2940 | 2927 | return templ_7745c5c3_Err | |
| 2941 | 2928 | } | |
| 2942 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 276, "</code></li>") | |
| 2929 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 275, "</code></li>") | |
| 2943 | 2930 | if templ_7745c5c3_Err != nil { | |
| 2944 | 2931 | return templ_7745c5c3_Err | |
| 2945 | 2932 | } | |
| 2946 | 2933 | } | |
| 2947 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 277, "</ul>") | |
| 2934 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 276, "</ul>") | |
| 2948 | 2935 | if templ_7745c5c3_Err != nil { | |
| 2949 | 2936 | return templ_7745c5c3_Err | |
| 2950 | 2937 | } | |
| 2951 | 2938 | } | |
| 2952 | 2939 | if v.PathsNote != "" { | |
| 2953 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 278, "<p class=\"dim\">") | |
| 2940 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 277, "<p class=\"dim\">") | |
| 2954 | 2941 | if templ_7745c5c3_Err != nil { | |
| 2955 | 2942 | return templ_7745c5c3_Err | |
| 2956 | 2943 | } | |
| 2957 | - | var templ_7745c5c3_Var141 string | |
| 2958 | - | templ_7745c5c3_Var141, templ_7745c5c3_Err = templ.JoinStringErrs(v.PathsNote) | |
| 2944 | + | var templ_7745c5c3_Var140 string | |
| 2945 | + | templ_7745c5c3_Var140, templ_7745c5c3_Err = templ.JoinStringErrs(v.PathsNote) | |
| 2959 | 2946 | if templ_7745c5c3_Err != nil { | |
| 2960 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 581, Col: 30} | |
| 2947 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 578, Col: 30} | |
| 2961 | 2948 | } | |
| 2962 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var141)) | |
| 2949 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var140)) | |
| 2963 | 2950 | if templ_7745c5c3_Err != nil { | |
| 2964 | 2951 | return templ_7745c5c3_Err | |
| 2965 | 2952 | } | |
| 2966 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 279, "</p>") | |
| 2953 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 278, "</p>") | |
| 2967 | 2954 | if templ_7745c5c3_Err != nil { | |
| 2968 | 2955 | return templ_7745c5c3_Err | |
| 2969 | 2956 | } | |
| @@ -2990,12 +2977,12 @@ func mrMergeabilitySlot(v MergeabilityView) templ.Component { | |||
| 2990 | 2977 | }() | |
| 2991 | 2978 | } | |
| 2992 | 2979 | ctx = templ.InitializeContext(ctx) | |
| 2993 | - | templ_7745c5c3_Var142 := templ.GetChildren(ctx) | |
| 2994 | - | if templ_7745c5c3_Var142 == nil { | |
| 2995 | - | templ_7745c5c3_Var142 = templ.NopComponent | |
| 2980 | + | templ_7745c5c3_Var141 := templ.GetChildren(ctx) | |
| 2981 | + | if templ_7745c5c3_Var141 == nil { | |
| 2982 | + | templ_7745c5c3_Var141 = templ.NopComponent | |
| 2996 | 2983 | } | |
| 2997 | 2984 | ctx = templ.ClearChildren(ctx) | |
| 2998 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 280, "<div id=\"mr-mergeability\" class=\"live-slot\" role=\"status\" data-slot>") | |
| 2985 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 279, "<div id=\"mr-mergeability\" class=\"live-slot\" role=\"status\" data-slot>") | |
| 2999 | 2986 | if templ_7745c5c3_Err != nil { | |
| 3000 | 2987 | return templ_7745c5c3_Err | |
| 3001 | 2988 | } | |
| @@ -3003,7 +2990,7 @@ func mrMergeabilitySlot(v MergeabilityView) templ.Component { | |||
| 3003 | 2990 | if templ_7745c5c3_Err != nil { | |
| 3004 | 2991 | return templ_7745c5c3_Err | |
| 3005 | 2992 | } | |
| 3006 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 281, "</div>") | |
| 2993 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 280, "</div>") | |
| 3007 | 2994 | if templ_7745c5c3_Err != nil { | |
| 3008 | 2995 | return templ_7745c5c3_Err | |
| 3009 | 2996 | } | |
| @@ -3028,9 +3015,9 @@ func MRMergeabilityFragment(v MergeabilityView) templ.Component { | |||
| 3028 | 3015 | }() | |
| 3029 | 3016 | } | |
| 3030 | 3017 | ctx = templ.InitializeContext(ctx) | |
| 3031 | - | templ_7745c5c3_Var143 := templ.GetChildren(ctx) | |
| 3032 | - | if templ_7745c5c3_Var143 == nil { | |
| 3033 | - | templ_7745c5c3_Var143 = templ.NopComponent | |
| 3018 | + | templ_7745c5c3_Var142 := templ.GetChildren(ctx) | |
| 3019 | + | if templ_7745c5c3_Var142 == nil { | |
| 3020 | + | templ_7745c5c3_Var142 = templ.NopComponent | |
| 3034 | 3021 | } | |
| 3035 | 3022 | ctx = templ.ClearChildren(ctx) | |
| 3036 | 3023 | templ_7745c5c3_Err = mrMergeabilitySlot(v).Render(ctx, templ_7745c5c3_Buffer) | |
| @@ -3059,128 +3046,128 @@ func moreMenu(p MRPage) templ.Component { | |||
| 3059 | 3046 | }() | |
| 3060 | 3047 | } | |
| 3061 | 3048 | ctx = templ.InitializeContext(ctx) | |
| 3062 | - | templ_7745c5c3_Var144 := templ.GetChildren(ctx) | |
| 3063 | - | if templ_7745c5c3_Var144 == nil { | |
| 3064 | - | templ_7745c5c3_Var144 = templ.NopComponent | |
| 3049 | + | templ_7745c5c3_Var143 := templ.GetChildren(ctx) | |
| 3050 | + | if templ_7745c5c3_Var143 == nil { | |
| 3051 | + | templ_7745c5c3_Var143 = templ.NopComponent | |
| 3065 | 3052 | } | |
| 3066 | 3053 | ctx = templ.ClearChildren(ctx) | |
| 3067 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 282, "<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>") | |
| 3054 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 281, "<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>") | |
| 3068 | 3055 | if templ_7745c5c3_Err != nil { | |
| 3069 | 3056 | return templ_7745c5c3_Err | |
| 3070 | 3057 | } | |
| 3071 | - | var templ_7745c5c3_Var145 string | |
| 3072 | - | templ_7745c5c3_Var145, templ_7745c5c3_Err = templ.JoinStringErrs(strings.Join(p.Modes, ", ")) | |
| 3058 | + | var templ_7745c5c3_Var144 string | |
| 3059 | + | templ_7745c5c3_Var144, templ_7745c5c3_Err = templ.JoinStringErrs(strings.Join(p.Modes, ", ")) | |
| 3073 | 3060 | if templ_7745c5c3_Err != nil { | |
| 3074 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 608, Col: 38} | |
| 3061 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 605, Col: 38} | |
| 3075 | 3062 | } | |
| 3076 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var145)) | |
| 3063 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var144)) | |
| 3077 | 3064 | if templ_7745c5c3_Err != nil { | |
| 3078 | 3065 | return templ_7745c5c3_Err | |
| 3079 | 3066 | } | |
| 3080 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 283, "</dd><dt>checks</dt><dd>") | |
| 3067 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 282, "</dd><dt>checks</dt><dd>") | |
| 3081 | 3068 | if templ_7745c5c3_Err != nil { | |
| 3082 | 3069 | return templ_7745c5c3_Err | |
| 3083 | 3070 | } | |
| 3084 | 3071 | if p.ChecksBlock { | |
| 3085 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 284, "failing ones block the merge") | |
| 3072 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 283, "failing ones block the merge") | |
| 3086 | 3073 | if templ_7745c5c3_Err != nil { | |
| 3087 | 3074 | return templ_7745c5c3_Err | |
| 3088 | 3075 | } | |
| 3089 | 3076 | } else { | |
| 3090 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 285, "do not block the merge") | |
| 3077 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 284, "do not block the merge") | |
| 3091 | 3078 | if templ_7745c5c3_Err != nil { | |
| 3092 | 3079 | return templ_7745c5c3_Err | |
| 3093 | 3080 | } | |
| 3094 | 3081 | } | |
| 3095 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 286, "</dd></dl></section>") | |
| 3082 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 285, "</dd></dl></section>") | |
| 3096 | 3083 | if templ_7745c5c3_Err != nil { | |
| 3097 | 3084 | return templ_7745c5c3_Err | |
| 3098 | 3085 | } | |
| 3099 | 3086 | if p.Box != nil { | |
| 3100 | 3087 | if p.Box.Signed { | |
| 3101 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 287, "<p class=\"d-note\" id=\"mr-signing\">squash and merge commits are signed with ermite's own key (generated on first start). ") | |
| 3088 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 286, "<p class=\"d-note\" id=\"mr-signing\">squash and merge commits are signed with ermite's own key (generated on first start). ") | |
| 3102 | 3089 | if templ_7745c5c3_Err != nil { | |
| 3103 | 3090 | return templ_7745c5c3_Err | |
| 3104 | 3091 | } | |
| 3105 | 3092 | if p.Box.Fingerprint != "" { | |
| 3106 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 288, "fingerprint <code>") | |
| 3093 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 287, "fingerprint <code>") | |
| 3107 | 3094 | if templ_7745c5c3_Err != nil { | |
| 3108 | 3095 | return templ_7745c5c3_Err | |
| 3109 | 3096 | } | |
| 3110 | - | var templ_7745c5c3_Var146 string | |
| 3111 | - | templ_7745c5c3_Var146, templ_7745c5c3_Err = templ.JoinStringErrs(p.Box.Fingerprint) | |
| 3097 | + | var templ_7745c5c3_Var145 string | |
| 3098 | + | templ_7745c5c3_Var145, templ_7745c5c3_Err = templ.JoinStringErrs(p.Box.Fingerprint) | |
| 3112 | 3099 | if templ_7745c5c3_Err != nil { | |
| 3113 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 624, Col: 44} | |
| 3100 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 621, Col: 44} | |
| 3114 | 3101 | } | |
| 3115 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var146)) | |
| 3102 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var145)) | |
| 3116 | 3103 | if templ_7745c5c3_Err != nil { | |
| 3117 | 3104 | return templ_7745c5c3_Err | |
| 3118 | 3105 | } | |
| 3119 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 289, "</code> ") | |
| 3106 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 288, "</code> ") | |
| 3120 | 3107 | if templ_7745c5c3_Err != nil { | |
| 3121 | 3108 | return templ_7745c5c3_Err | |
| 3122 | 3109 | } | |
| 3123 | 3110 | } | |
| 3124 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 290, "<code>ermite signing-key show</code> prints it.</p>") | |
| 3111 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 289, "<code>ermite signing-key show</code> prints it.</p>") | |
| 3125 | 3112 | if templ_7745c5c3_Err != nil { | |
| 3126 | 3113 | return templ_7745c5c3_Err | |
| 3127 | 3114 | } | |
| 3128 | 3115 | } | |
| 3129 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 291, " ") | |
| 3116 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 290, " ") | |
| 3130 | 3117 | if templ_7745c5c3_Err != nil { | |
| 3131 | 3118 | return templ_7745c5c3_Err | |
| 3132 | 3119 | } | |
| 3133 | 3120 | if p.Box.CanMarkRead { | |
| 3134 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 292, "<form method=\"post\" action=\"") | |
| 3121 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 291, "<form method=\"post\" action=\"") | |
| 3135 | 3122 | if templ_7745c5c3_Err != nil { | |
| 3136 | 3123 | return templ_7745c5c3_Err | |
| 3137 | 3124 | } | |
| 3138 | - | var templ_7745c5c3_Var147 templ.SafeURL | |
| 3139 | - | templ_7745c5c3_Var147, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.ReadAction)) | |
| 3125 | + | var templ_7745c5c3_Var146 templ.SafeURL | |
| 3126 | + | templ_7745c5c3_Var146, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.ReadAction)) | |
| 3140 | 3127 | if templ_7745c5c3_Err != nil { | |
| 3141 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 630, Col: 65} | |
| 3128 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 627, Col: 65} | |
| 3142 | 3129 | } | |
| 3143 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var147)) | |
| 3130 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var146)) | |
| 3144 | 3131 | if templ_7745c5c3_Err != nil { | |
| 3145 | 3132 | return templ_7745c5c3_Err | |
| 3146 | 3133 | } | |
| 3147 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 293, "\"><input type=\"hidden\" name=\"head_id\" value=\"") | |
| 3134 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 292, "\"><input type=\"hidden\" name=\"head_id\" value=\"") | |
| 3148 | 3135 | if templ_7745c5c3_Err != nil { | |
| 3149 | 3136 | return templ_7745c5c3_Err | |
| 3150 | 3137 | } | |
| 3151 | - | var templ_7745c5c3_Var148 string | |
| 3152 | - | templ_7745c5c3_Var148, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Box.Head) | |
| 3138 | + | var templ_7745c5c3_Var147 string | |
| 3139 | + | templ_7745c5c3_Var147, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Box.Head) | |
| 3153 | 3140 | if templ_7745c5c3_Err != nil { | |
| 3154 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 631, Col: 60} | |
| 3141 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 628, Col: 60} | |
| 3155 | 3142 | } | |
| 3156 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var148) | |
| 3143 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var147) | |
| 3157 | 3144 | if templ_7745c5c3_Err != nil { | |
| 3158 | 3145 | return templ_7745c5c3_Err | |
| 3159 | 3146 | } | |
| 3160 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 294, "\"> <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>") | |
| 3147 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 293, "\"> <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>") | |
| 3161 | 3148 | if templ_7745c5c3_Err != nil { | |
| 3162 | 3149 | return templ_7745c5c3_Err | |
| 3163 | 3150 | } | |
| 3164 | 3151 | } | |
| 3165 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 295, " <form method=\"post\" action=\"") | |
| 3152 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 294, " <form method=\"post\" action=\"") | |
| 3166 | 3153 | if templ_7745c5c3_Err != nil { | |
| 3167 | 3154 | return templ_7745c5c3_Err | |
| 3168 | 3155 | } | |
| 3169 | - | var templ_7745c5c3_Var149 templ.SafeURL | |
| 3170 | - | templ_7745c5c3_Var149, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.CloseAction)) | |
| 3156 | + | var templ_7745c5c3_Var148 templ.SafeURL | |
| 3157 | + | templ_7745c5c3_Var148, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.CloseAction)) | |
| 3171 | 3158 | if templ_7745c5c3_Err != nil { | |
| 3172 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 635, Col: 65} | |
| 3159 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 632, Col: 65} | |
| 3173 | 3160 | } | |
| 3174 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var149)) | |
| 3161 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var148)) | |
| 3175 | 3162 | if templ_7745c5c3_Err != nil { | |
| 3176 | 3163 | return templ_7745c5c3_Err | |
| 3177 | 3164 | } | |
| 3178 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 296, "\"><button type=\"submit\" title=\"close without merging; the branch is kept\" class=\"btn danger\">Close</button></form>") | |
| 3165 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 295, "\"><button type=\"submit\" title=\"close without merging; the branch is kept\" class=\"btn danger\">Close</button></form>") | |
| 3179 | 3166 | if templ_7745c5c3_Err != nil { | |
| 3180 | 3167 | return templ_7745c5c3_Err | |
| 3181 | 3168 | } | |
| 3182 | 3169 | if !p.Box.HeadGone && p.Box.ReadyAction == "" { | |
| 3183 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 297, "<details class=\"d-or\"><summary class=\"mute\">or from a terminal</summary>") | |
| 3170 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 296, "<details class=\"d-or\"><summary class=\"mute\">or from a terminal</summary>") | |
| 3184 | 3171 | if templ_7745c5c3_Err != nil { | |
| 3185 | 3172 | return templ_7745c5c3_Err | |
| 3186 | 3173 | } | |
| @@ -3188,13 +3175,13 @@ func moreMenu(p MRPage) templ.Component { | |||
| 3188 | 3175 | if templ_7745c5c3_Err != nil { | |
| 3189 | 3176 | return templ_7745c5c3_Err | |
| 3190 | 3177 | } | |
| 3191 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 298, "</details>") | |
| 3178 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 297, "</details>") | |
| 3192 | 3179 | if templ_7745c5c3_Err != nil { | |
| 3193 | 3180 | return templ_7745c5c3_Err | |
| 3194 | 3181 | } | |
| 3195 | 3182 | } | |
| 3196 | 3183 | } | |
| 3197 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 299, "</div></details>") | |
| 3184 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 298, "</div></details>") | |
| 3198 | 3185 | if templ_7745c5c3_Err != nil { | |
| 3199 | 3186 | return templ_7745c5c3_Err | |
| 3200 | 3187 | } | |
| @@ -3218,12 +3205,12 @@ func Compare(l Layout, p ComparePage) templ.Component { | |||
| 3218 | 3205 | }() | |
| 3219 | 3206 | } | |
| 3220 | 3207 | ctx = templ.InitializeContext(ctx) | |
| 3221 | - | templ_7745c5c3_Var150 := templ.GetChildren(ctx) | |
| 3222 | - | if templ_7745c5c3_Var150 == nil { | |
| 3223 | - | templ_7745c5c3_Var150 = templ.NopComponent | |
| 3208 | + | templ_7745c5c3_Var149 := templ.GetChildren(ctx) | |
| 3209 | + | if templ_7745c5c3_Var149 == nil { | |
| 3210 | + | templ_7745c5c3_Var149 = templ.NopComponent | |
| 3224 | 3211 | } | |
| 3225 | 3212 | ctx = templ.ClearChildren(ctx) | |
| 3226 | - | templ_7745c5c3_Var151 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { | |
| 3213 | + | templ_7745c5c3_Var150 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { | |
| 3227 | 3214 | templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context | |
| 3228 | 3215 | templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) | |
| 3229 | 3216 | if !templ_7745c5c3_IsBuffer { | |
| @@ -3235,263 +3222,263 @@ func Compare(l Layout, p ComparePage) templ.Component { | |||
| 3235 | 3222 | }() | |
| 3236 | 3223 | } | |
| 3237 | 3224 | ctx = templ.InitializeContext(ctx) | |
| 3238 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 300, "<header class=\"show mr-h\"><h1>") | |
| 3225 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 299, "<header class=\"show mr-h\"><h1>") | |
| 3239 | 3226 | if templ_7745c5c3_Err != nil { | |
| 3240 | 3227 | return templ_7745c5c3_Err | |
| 3241 | 3228 | } | |
| 3242 | - | var templ_7745c5c3_Var152 string | |
| 3243 | - | templ_7745c5c3_Var152, templ_7745c5c3_Err = templ.JoinStringErrs(p.Source) | |
| 3229 | + | var templ_7745c5c3_Var151 string | |
| 3230 | + | templ_7745c5c3_Var151, templ_7745c5c3_Err = templ.JoinStringErrs(p.Source) | |
| 3244 | 3231 | if templ_7745c5c3_Err != nil { | |
| 3245 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 652, Col: 17} | |
| 3232 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 649, Col: 17} | |
| 3246 | 3233 | } | |
| 3247 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var152)) | |
| 3234 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var151)) | |
| 3248 | 3235 | if templ_7745c5c3_Err != nil { | |
| 3249 | 3236 | return templ_7745c5c3_Err | |
| 3250 | 3237 | } | |
| 3251 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 301, " → ") | |
| 3238 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 300, " → ") | |
| 3252 | 3239 | if templ_7745c5c3_Err != nil { | |
| 3253 | 3240 | return templ_7745c5c3_Err | |
| 3254 | 3241 | } | |
| 3255 | - | var templ_7745c5c3_Var153 string | |
| 3256 | - | templ_7745c5c3_Var153, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | |
| 3242 | + | var templ_7745c5c3_Var152 string | |
| 3243 | + | templ_7745c5c3_Var152, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | |
| 3257 | 3244 | if templ_7745c5c3_Err != nil { | |
| 3258 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 652, Col: 34} | |
| 3245 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 649, Col: 34} | |
| 3259 | 3246 | } | |
| 3260 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var153)) | |
| 3247 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var152)) | |
| 3261 | 3248 | if templ_7745c5c3_Err != nil { | |
| 3262 | 3249 | return templ_7745c5c3_Err | |
| 3263 | 3250 | } | |
| 3264 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 302, "</h1><dl class=\"kv show-kv\"><dt>branch</dt><dd><a href=\"") | |
| 3251 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 301, "</h1><dl class=\"kv show-kv\"><dt>branch</dt><dd><a href=\"") | |
| 3265 | 3252 | if templ_7745c5c3_Err != nil { | |
| 3266 | 3253 | return templ_7745c5c3_Err | |
| 3267 | 3254 | } | |
| 3268 | - | var templ_7745c5c3_Var154 templ.SafeURL | |
| 3269 | - | templ_7745c5c3_Var154, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.SourceHref)) | |
| 3255 | + | var templ_7745c5c3_Var153 templ.SafeURL | |
| 3256 | + | templ_7745c5c3_Var153, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.SourceHref)) | |
| 3270 | 3257 | if templ_7745c5c3_Err != nil { | |
| 3271 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 655, Col: 45} | |
| 3258 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 652, Col: 45} | |
| 3272 | 3259 | } | |
| 3273 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var154)) | |
| 3260 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var153)) | |
| 3274 | 3261 | if templ_7745c5c3_Err != nil { | |
| 3275 | 3262 | return templ_7745c5c3_Err | |
| 3276 | 3263 | } | |
| 3277 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 303, "\">") | |
| 3264 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 302, "\">") | |
| 3278 | 3265 | if templ_7745c5c3_Err != nil { | |
| 3279 | 3266 | return templ_7745c5c3_Err | |
| 3280 | 3267 | } | |
| 3281 | - | var templ_7745c5c3_Var155 string | |
| 3282 | - | templ_7745c5c3_Var155, templ_7745c5c3_Err = templ.JoinStringErrs(p.Source) | |
| 3268 | + | var templ_7745c5c3_Var154 string | |
| 3269 | + | templ_7745c5c3_Var154, templ_7745c5c3_Err = templ.JoinStringErrs(p.Source) | |
| 3283 | 3270 | if templ_7745c5c3_Err != nil { | |
| 3284 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 655, Col: 58} | |
| 3271 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 652, Col: 58} | |
| 3285 | 3272 | } | |
| 3286 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var155)) | |
| 3273 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var154)) | |
| 3287 | 3274 | if templ_7745c5c3_Err != nil { | |
| 3288 | 3275 | return templ_7745c5c3_Err | |
| 3289 | 3276 | } | |
| 3290 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 304, "</a></dd><dt>target</dt><dd><a href=\"") | |
| 3277 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 303, "</a></dd><dt>target</dt><dd><a href=\"") | |
| 3291 | 3278 | if templ_7745c5c3_Err != nil { | |
| 3292 | 3279 | return templ_7745c5c3_Err | |
| 3293 | 3280 | } | |
| 3294 | - | var templ_7745c5c3_Var156 templ.SafeURL | |
| 3295 | - | templ_7745c5c3_Var156, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.TargetHref)) | |
| 3281 | + | var templ_7745c5c3_Var155 templ.SafeURL | |
| 3282 | + | templ_7745c5c3_Var155, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.TargetHref)) | |
| 3296 | 3283 | if templ_7745c5c3_Err != nil { | |
| 3297 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 657, Col: 45} | |
| 3284 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 654, Col: 45} | |
| 3298 | 3285 | } | |
| 3299 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var156)) | |
| 3286 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var155)) | |
| 3300 | 3287 | if templ_7745c5c3_Err != nil { | |
| 3301 | 3288 | return templ_7745c5c3_Err | |
| 3302 | 3289 | } | |
| 3303 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 305, "\">") | |
| 3290 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 304, "\">") | |
| 3304 | 3291 | if templ_7745c5c3_Err != nil { | |
| 3305 | 3292 | return templ_7745c5c3_Err | |
| 3306 | 3293 | } | |
| 3307 | - | var templ_7745c5c3_Var157 string | |
| 3308 | - | templ_7745c5c3_Var157, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | |
| 3294 | + | var templ_7745c5c3_Var156 string | |
| 3295 | + | templ_7745c5c3_Var156, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | |
| 3309 | 3296 | if templ_7745c5c3_Err != nil { | |
| 3310 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 657, Col: 58} | |
| 3297 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 654, Col: 58} | |
| 3311 | 3298 | } | |
| 3312 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var157)) | |
| 3299 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var156)) | |
| 3313 | 3300 | if templ_7745c5c3_Err != nil { | |
| 3314 | 3301 | return templ_7745c5c3_Err | |
| 3315 | 3302 | } | |
| 3316 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 306, "</a></dd><dt>ahead</dt><dd>") | |
| 3303 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 305, "</a></dd><dt>ahead</dt><dd>") | |
| 3317 | 3304 | if templ_7745c5c3_Err != nil { | |
| 3318 | 3305 | return templ_7745c5c3_Err | |
| 3319 | 3306 | } | |
| 3320 | - | var templ_7745c5c3_Var158 string | |
| 3321 | - | templ_7745c5c3_Var158, templ_7745c5c3_Err = templ.JoinStringErrs(p.AheadText) | |
| 3307 | + | var templ_7745c5c3_Var157 string | |
| 3308 | + | templ_7745c5c3_Var157, templ_7745c5c3_Err = templ.JoinStringErrs(p.AheadText) | |
| 3322 | 3309 | if templ_7745c5c3_Err != nil { | |
| 3323 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 659, Col: 21} | |
| 3310 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 656, Col: 21} | |
| 3324 | 3311 | } | |
| 3325 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var158)) | |
| 3312 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var157)) | |
| 3326 | 3313 | if templ_7745c5c3_Err != nil { | |
| 3327 | 3314 | return templ_7745c5c3_Err | |
| 3328 | 3315 | } | |
| 3329 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 307, "</dd></dl></header>") | |
| 3316 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 306, "</dd></dl></header>") | |
| 3330 | 3317 | if templ_7745c5c3_Err != nil { | |
| 3331 | 3318 | return templ_7745c5c3_Err | |
| 3332 | 3319 | } | |
| 3333 | 3320 | if p.Note != "" { | |
| 3334 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 308, "<p class=\"notice\">") | |
| 3321 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 307, "<p class=\"notice\">") | |
| 3335 | 3322 | if templ_7745c5c3_Err != nil { | |
| 3336 | 3323 | return templ_7745c5c3_Err | |
| 3337 | 3324 | } | |
| 3338 | - | var templ_7745c5c3_Var159 string | |
| 3339 | - | templ_7745c5c3_Var159, templ_7745c5c3_Err = templ.JoinStringErrs(p.Note) | |
| 3325 | + | var templ_7745c5c3_Var158 string | |
| 3326 | + | templ_7745c5c3_Var158, templ_7745c5c3_Err = templ.JoinStringErrs(p.Note) | |
| 3340 | 3327 | if templ_7745c5c3_Err != nil { | |
| 3341 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 663, Col: 29} | |
| 3328 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 660, Col: 29} | |
| 3342 | 3329 | } | |
| 3343 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var159)) | |
| 3330 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var158)) | |
| 3344 | 3331 | if templ_7745c5c3_Err != nil { | |
| 3345 | 3332 | return templ_7745c5c3_Err | |
| 3346 | 3333 | } | |
| 3347 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 309, "</p>") | |
| 3334 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 308, "</p>") | |
| 3348 | 3335 | if templ_7745c5c3_Err != nil { | |
| 3349 | 3336 | return templ_7745c5c3_Err | |
| 3350 | 3337 | } | |
| 3351 | 3338 | } | |
| 3352 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 310, " ") | |
| 3339 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 309, " ") | |
| 3353 | 3340 | if templ_7745c5c3_Err != nil { | |
| 3354 | 3341 | return templ_7745c5c3_Err | |
| 3355 | 3342 | } | |
| 3356 | 3343 | if p.Existing != nil { | |
| 3357 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 311, "<p class=\"notice\">an open merge request already covers these branches: <a href=\"") | |
| 3344 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 310, "<p class=\"notice\">an open merge request already covers these branches: <a href=\"") | |
| 3358 | 3345 | if templ_7745c5c3_Err != nil { | |
| 3359 | 3346 | return templ_7745c5c3_Err | |
| 3360 | 3347 | } | |
| 3361 | - | var templ_7745c5c3_Var160 templ.SafeURL | |
| 3362 | - | templ_7745c5c3_Var160, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Existing.Href)) | |
| 3348 | + | var templ_7745c5c3_Var159 templ.SafeURL | |
| 3349 | + | templ_7745c5c3_Var159, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Existing.Href)) | |
| 3363 | 3350 | if templ_7745c5c3_Err != nil { | |
| 3364 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 666, Col: 114} | |
| 3351 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 663, Col: 114} | |
| 3365 | 3352 | } | |
| 3366 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var160)) | |
| 3353 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var159)) | |
| 3367 | 3354 | if templ_7745c5c3_Err != nil { | |
| 3368 | 3355 | return templ_7745c5c3_Err | |
| 3369 | 3356 | } | |
| 3370 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 312, "\">") | |
| 3357 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 311, "\">") | |
| 3371 | 3358 | if templ_7745c5c3_Err != nil { | |
| 3372 | 3359 | return templ_7745c5c3_Err | |
| 3373 | 3360 | } | |
| 3374 | - | var templ_7745c5c3_Var161 string | |
| 3375 | - | templ_7745c5c3_Var161, templ_7745c5c3_Err = templ.JoinStringErrs(p.Existing.Label) | |
| 3361 | + | var templ_7745c5c3_Var160 string | |
| 3362 | + | templ_7745c5c3_Var160, templ_7745c5c3_Err = templ.JoinStringErrs(p.Existing.Label) | |
| 3376 | 3363 | if templ_7745c5c3_Err != nil { | |
| 3377 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 666, Col: 135} | |
| 3364 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 663, Col: 135} | |
| 3378 | 3365 | } | |
| 3379 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var161)) | |
| 3366 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var160)) | |
| 3380 | 3367 | if templ_7745c5c3_Err != nil { | |
| 3381 | 3368 | return templ_7745c5c3_Err | |
| 3382 | 3369 | } | |
| 3383 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 313, "</a></p>") | |
| 3370 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 312, "</a></p>") | |
| 3384 | 3371 | if templ_7745c5c3_Err != nil { | |
| 3385 | 3372 | return templ_7745c5c3_Err | |
| 3386 | 3373 | } | |
| 3387 | 3374 | } | |
| 3388 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 314, " ") | |
| 3375 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 313, " ") | |
| 3389 | 3376 | if templ_7745c5c3_Err != nil { | |
| 3390 | 3377 | return templ_7745c5c3_Err | |
| 3391 | 3378 | } | |
| 3392 | 3379 | if p.Create != nil { | |
| 3393 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 315, "<form class=\"cform create\" method=\"post\" action=\"") | |
| 3380 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 314, "<form class=\"cform create\" method=\"post\" action=\"") | |
| 3394 | 3381 | if templ_7745c5c3_Err != nil { | |
| 3395 | 3382 | return templ_7745c5c3_Err | |
| 3396 | 3383 | } | |
| 3397 | - | var templ_7745c5c3_Var162 templ.SafeURL | |
| 3398 | - | templ_7745c5c3_Var162, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Create.Action)) | |
| 3384 | + | var templ_7745c5c3_Var161 templ.SafeURL | |
| 3385 | + | templ_7745c5c3_Var161, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Create.Action)) | |
| 3399 | 3386 | if templ_7745c5c3_Err != nil { | |
| 3400 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 669, Col: 83} | |
| 3387 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 666, Col: 83} | |
| 3401 | 3388 | } | |
| 3402 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var162)) | |
| 3389 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var161)) | |
| 3403 | 3390 | if templ_7745c5c3_Err != nil { | |
| 3404 | 3391 | return templ_7745c5c3_Err | |
| 3405 | 3392 | } | |
| 3406 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 316, "\"><input type=\"hidden\" name=\"source\" value=\"") | |
| 3393 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 315, "\"><input type=\"hidden\" name=\"source\" value=\"") | |
| 3407 | 3394 | if templ_7745c5c3_Err != nil { | |
| 3408 | 3395 | return templ_7745c5c3_Err | |
| 3409 | 3396 | } | |
| 3410 | - | var templ_7745c5c3_Var163 string | |
| 3411 | - | templ_7745c5c3_Var163, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Create.Source) | |
| 3397 | + | var templ_7745c5c3_Var162 string | |
| 3398 | + | templ_7745c5c3_Var162, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Create.Source) | |
| 3412 | 3399 | if templ_7745c5c3_Err != nil { | |
| 3413 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 670, Col: 62} | |
| 3400 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 667, Col: 62} | |
| 3414 | 3401 | } | |
| 3415 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var163) | |
| 3402 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var162) | |
| 3416 | 3403 | if templ_7745c5c3_Err != nil { | |
| 3417 | 3404 | return templ_7745c5c3_Err | |
| 3418 | 3405 | } | |
| 3419 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 317, "\"> <input type=\"hidden\" name=\"target\" value=\"") | |
| 3406 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 316, "\"> <input type=\"hidden\" name=\"target\" value=\"") | |
| 3420 | 3407 | if templ_7745c5c3_Err != nil { | |
| 3421 | 3408 | return templ_7745c5c3_Err | |
| 3422 | 3409 | } | |
| 3423 | - | var templ_7745c5c3_Var164 string | |
| 3424 | - | templ_7745c5c3_Var164, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Create.Target) | |
| 3410 | + | var templ_7745c5c3_Var163 string | |
| 3411 | + | templ_7745c5c3_Var163, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Create.Target) | |
| 3425 | 3412 | if templ_7745c5c3_Err != nil { | |
| 3426 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 671, Col: 62} | |
| 3413 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 668, Col: 62} | |
| 3427 | 3414 | } | |
| 3428 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var164) | |
| 3415 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var163) | |
| 3429 | 3416 | if templ_7745c5c3_Err != nil { | |
| 3430 | 3417 | return templ_7745c5c3_Err | |
| 3431 | 3418 | } | |
| 3432 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 318, "\"> <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, 317, "\"> <label for=\"mr-title\">title</label> <input id=\"mr-title\" name=\"title\" type=\"text\" maxlength=\"120\" required value=\"") | |
| 3433 | 3420 | if templ_7745c5c3_Err != nil { | |
| 3434 | 3421 | return templ_7745c5c3_Err | |
| 3435 | 3422 | } | |
| 3436 | - | var templ_7745c5c3_Var165 string | |
| 3437 | - | templ_7745c5c3_Var165, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Create.Title) | |
| 3423 | + | var templ_7745c5c3_Var164 string | |
| 3424 | + | templ_7745c5c3_Var164, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Create.Title) | |
| 3438 | 3425 | if templ_7745c5c3_Err != nil { | |
| 3439 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 673, Col: 97} | |
| 3426 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 670, Col: 97} | |
| 3440 | 3427 | } | |
| 3441 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var165) | |
| 3428 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var164) | |
| 3442 | 3429 | if templ_7745c5c3_Err != nil { | |
| 3443 | 3430 | return templ_7745c5c3_Err | |
| 3444 | 3431 | } | |
| 3445 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 319, "\" 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, 318, "\" 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>") | |
| 3446 | 3433 | if templ_7745c5c3_Err != nil { | |
| 3447 | 3434 | return templ_7745c5c3_Err | |
| 3448 | 3435 | } | |
| 3449 | 3436 | } | |
| 3450 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 320, " ") | |
| 3437 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 319, " ") | |
| 3451 | 3438 | if templ_7745c5c3_Err != nil { | |
| 3452 | 3439 | return templ_7745c5c3_Err | |
| 3453 | 3440 | } | |
| 3454 | 3441 | if p.HasDiff { | |
| 3455 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 321, "<div class=\"diff-tools\" role=\"group\" aria-label=\"Diff view\"><span class=\"dim\">") | |
| 3442 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 320, "<div class=\"diff-tools\" role=\"group\" aria-label=\"Diff view\"><span class=\"dim\">") | |
| 3456 | 3443 | if templ_7745c5c3_Err != nil { | |
| 3457 | 3444 | return templ_7745c5c3_Err | |
| 3458 | 3445 | } | |
| 3459 | - | var templ_7745c5c3_Var166 string | |
| 3460 | - | templ_7745c5c3_Var166, templ_7745c5c3_Err = templ.JoinStringErrs(plural(p.NFiles, "file", "files")) | |
| 3446 | + | var templ_7745c5c3_Var165 string | |
| 3447 | + | templ_7745c5c3_Var165, templ_7745c5c3_Err = templ.JoinStringErrs(plural(p.NFiles, "file", "files")) | |
| 3461 | 3448 | if templ_7745c5c3_Err != nil { | |
| 3462 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 683, Col: 57} | |
| 3449 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 680, Col: 57} | |
| 3463 | 3450 | } | |
| 3464 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var166)) | |
| 3451 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var165)) | |
| 3465 | 3452 | if templ_7745c5c3_Err != nil { | |
| 3466 | 3453 | return templ_7745c5c3_Err | |
| 3467 | 3454 | } | |
| 3468 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 322, " · <span class=\"plus\">+") | |
| 3455 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 321, " · <span class=\"plus\">+") | |
| 3469 | 3456 | if templ_7745c5c3_Err != nil { | |
| 3470 | 3457 | return templ_7745c5c3_Err | |
| 3471 | 3458 | } | |
| 3472 | - | var templ_7745c5c3_Var167 string | |
| 3473 | - | templ_7745c5c3_Var167, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Adds)) | |
| 3459 | + | var templ_7745c5c3_Var166 string | |
| 3460 | + | templ_7745c5c3_Var166, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Adds)) | |
| 3474 | 3461 | if templ_7745c5c3_Err != nil { | |
| 3475 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 683, Col: 97} | |
| 3462 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 680, Col: 97} | |
| 3476 | 3463 | } | |
| 3477 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var167)) | |
| 3464 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var166)) | |
| 3478 | 3465 | if templ_7745c5c3_Err != nil { | |
| 3479 | 3466 | return templ_7745c5c3_Err | |
| 3480 | 3467 | } | |
| 3481 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 323, "</span> <span class=\"minus\">-") | |
| 3468 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 322, "</span> <span class=\"minus\">-") | |
| 3482 | 3469 | if templ_7745c5c3_Err != nil { | |
| 3483 | 3470 | return templ_7745c5c3_Err | |
| 3484 | 3471 | } | |
| 3485 | - | var templ_7745c5c3_Var168 string | |
| 3486 | - | templ_7745c5c3_Var168, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Dels)) | |
| 3472 | + | var templ_7745c5c3_Var167 string | |
| 3473 | + | templ_7745c5c3_Var167, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Dels)) | |
| 3487 | 3474 | if templ_7745c5c3_Err != nil { | |
| 3488 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 683, Col: 142} | |
| 3475 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 680, Col: 142} | |
| 3489 | 3476 | } | |
| 3490 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var168)) | |
| 3477 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var167)) | |
| 3491 | 3478 | if templ_7745c5c3_Err != nil { | |
| 3492 | 3479 | return templ_7745c5c3_Err | |
| 3493 | 3480 | } | |
| 3494 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 324, "</span></span> <span class=\"grow\"></span>") | |
| 3481 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 323, "</span></span> <span class=\"grow\"></span>") | |
| 3495 | 3482 | if templ_7745c5c3_Err != nil { | |
| 3496 | 3483 | return templ_7745c5c3_Err | |
| 3497 | 3484 | } | |
| @@ -3499,64 +3486,64 @@ func Compare(l Layout, p ComparePage) templ.Component { | |||
| 3499 | 3486 | if templ_7745c5c3_Err != nil { | |
| 3500 | 3487 | return templ_7745c5c3_Err | |
| 3501 | 3488 | } | |
| 3502 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 325, "</div>") | |
| 3489 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 324, "</div>") | |
| 3503 | 3490 | if templ_7745c5c3_Err != nil { | |
| 3504 | 3491 | return templ_7745c5c3_Err | |
| 3505 | 3492 | } | |
| 3506 | 3493 | if p.Invisible { | |
| 3507 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 326, "<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, 325, "<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>") | |
| 3508 | 3495 | if templ_7745c5c3_Err != nil { | |
| 3509 | 3496 | return templ_7745c5c3_Err | |
| 3510 | 3497 | } | |
| 3511 | 3498 | } | |
| 3512 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 327, " <div id=\"diffs\"") | |
| 3499 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 326, " <div id=\"diffs\"") | |
| 3513 | 3500 | if templ_7745c5c3_Err != nil { | |
| 3514 | 3501 | return templ_7745c5c3_Err | |
| 3515 | 3502 | } | |
| 3516 | 3503 | if p.Both { | |
| 3517 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 328, " data-diff=\"") | |
| 3504 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 327, " data-diff=\"") | |
| 3518 | 3505 | if templ_7745c5c3_Err != nil { | |
| 3519 | 3506 | return templ_7745c5c3_Err | |
| 3520 | 3507 | } | |
| 3521 | - | var templ_7745c5c3_Var169 string | |
| 3522 | - | templ_7745c5c3_Var169, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.View) | |
| 3508 | + | var templ_7745c5c3_Var168 string | |
| 3509 | + | templ_7745c5c3_Var168, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.View) | |
| 3523 | 3510 | if templ_7745c5c3_Err != nil { | |
| 3524 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 696, Col: 23} | |
| 3511 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 693, Col: 23} | |
| 3525 | 3512 | } | |
| 3526 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var169) | |
| 3513 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var168) | |
| 3527 | 3514 | if templ_7745c5c3_Err != nil { | |
| 3528 | 3515 | return templ_7745c5c3_Err | |
| 3529 | 3516 | } | |
| 3530 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 329, "\"") | |
| 3517 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 328, "\"") | |
| 3531 | 3518 | if templ_7745c5c3_Err != nil { | |
| 3532 | 3519 | return templ_7745c5c3_Err | |
| 3533 | 3520 | } | |
| 3534 | 3521 | } else { | |
| 3535 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 330, " data-view=\"") | |
| 3522 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 329, " data-view=\"") | |
| 3536 | 3523 | if templ_7745c5c3_Err != nil { | |
| 3537 | 3524 | return templ_7745c5c3_Err | |
| 3538 | 3525 | } | |
| 3539 | - | var templ_7745c5c3_Var170 string | |
| 3540 | - | templ_7745c5c3_Var170, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.View) | |
| 3526 | + | var templ_7745c5c3_Var169 string | |
| 3527 | + | templ_7745c5c3_Var169, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.View) | |
| 3541 | 3528 | if templ_7745c5c3_Err != nil { | |
| 3542 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 698, Col: 23} | |
| 3529 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 695, Col: 23} | |
| 3543 | 3530 | } | |
| 3544 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var170) | |
| 3531 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var169) | |
| 3545 | 3532 | if templ_7745c5c3_Err != nil { | |
| 3546 | 3533 | return templ_7745c5c3_Err | |
| 3547 | 3534 | } | |
| 3548 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 331, "\"") | |
| 3535 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 330, "\"") | |
| 3549 | 3536 | if templ_7745c5c3_Err != nil { | |
| 3550 | 3537 | return templ_7745c5c3_Err | |
| 3551 | 3538 | } | |
| 3552 | 3539 | } | |
| 3553 | 3540 | if p.Both && !p.Pinned { | |
| 3554 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 332, " hx-live=\"this.dataset.diff = sessionStorage.getItem('diff') || this.dataset.diff\"") | |
| 3541 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 331, " hx-live=\"this.dataset.diff = sessionStorage.getItem('diff') || this.dataset.diff\"") | |
| 3555 | 3542 | if templ_7745c5c3_Err != nil { | |
| 3556 | 3543 | return templ_7745c5c3_Err | |
| 3557 | 3544 | } | |
| 3558 | 3545 | } | |
| 3559 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 333, ">") | |
| 3546 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 332, ">") | |
| 3560 | 3547 | if templ_7745c5c3_Err != nil { | |
| 3561 | 3548 | return templ_7745c5c3_Err | |
| 3562 | 3549 | } | |
| @@ -3566,14 +3553,14 @@ func Compare(l Layout, p ComparePage) templ.Component { | |||
| 3566 | 3553 | return templ_7745c5c3_Err | |
| 3567 | 3554 | } | |
| 3568 | 3555 | } | |
| 3569 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 334, "</div>") | |
| 3556 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 333, "</div>") | |
| 3570 | 3557 | if templ_7745c5c3_Err != nil { | |
| 3571 | 3558 | return templ_7745c5c3_Err | |
| 3572 | 3559 | } | |
| 3573 | 3560 | } | |
| 3574 | 3561 | return nil | |
| 3575 | 3562 | }) | |
| 3576 | - | templ_7745c5c3_Err = Shell(l, compareRail(p)).Render(templ.WithChildren(ctx, templ_7745c5c3_Var151), templ_7745c5c3_Buffer) | |
| 3563 | + | templ_7745c5c3_Err = Shell(l, compareRail(p)).Render(templ.WithChildren(ctx, templ_7745c5c3_Var150), templ_7745c5c3_Buffer) | |
| 3577 | 3564 | if templ_7745c5c3_Err != nil { | |
| 3578 | 3565 | return templ_7745c5c3_Err | |
| 3579 | 3566 | } | |
| @@ -3597,173 +3584,173 @@ func compareRail(p ComparePage) templ.Component { | |||
| 3597 | 3584 | }() | |
| 3598 | 3585 | } | |
| 3599 | 3586 | ctx = templ.InitializeContext(ctx) | |
| 3600 | - | templ_7745c5c3_Var171 := templ.GetChildren(ctx) | |
| 3601 | - | if templ_7745c5c3_Var171 == nil { | |
| 3602 | - | templ_7745c5c3_Var171 = templ.NopComponent | |
| 3587 | + | templ_7745c5c3_Var170 := templ.GetChildren(ctx) | |
| 3588 | + | if templ_7745c5c3_Var170 == nil { | |
| 3589 | + | templ_7745c5c3_Var170 = templ.NopComponent | |
| 3603 | 3590 | } | |
| 3604 | 3591 | ctx = templ.ClearChildren(ctx) | |
| 3605 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 335, "<section aria-labelledby=\"r-ahead\"><h2 id=\"r-ahead\">Commits <span class=\"count\">") | |
| 3592 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 334, "<section aria-labelledby=\"r-ahead\"><h2 id=\"r-ahead\">Commits <span class=\"count\">") | |
| 3606 | 3593 | if templ_7745c5c3_Err != nil { | |
| 3607 | 3594 | return templ_7745c5c3_Err | |
| 3608 | 3595 | } | |
| 3609 | - | var templ_7745c5c3_Var172 string | |
| 3610 | - | templ_7745c5c3_Var172, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(len(p.Ahead))) | |
| 3596 | + | var templ_7745c5c3_Var171 string | |
| 3597 | + | templ_7745c5c3_Var171, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(len(p.Ahead))) | |
| 3611 | 3598 | if templ_7745c5c3_Err != nil { | |
| 3612 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 714, Col: 67} | |
| 3599 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 711, Col: 67} | |
| 3613 | 3600 | } | |
| 3614 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var172)) | |
| 3601 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var171)) | |
| 3615 | 3602 | if templ_7745c5c3_Err != nil { | |
| 3616 | 3603 | return templ_7745c5c3_Err | |
| 3617 | 3604 | } | |
| 3618 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 336, "</span></h2><ul class=\"pcommits\">") | |
| 3605 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 335, "</span></h2><ul class=\"pcommits\">") | |
| 3619 | 3606 | if templ_7745c5c3_Err != nil { | |
| 3620 | 3607 | return templ_7745c5c3_Err | |
| 3621 | 3608 | } | |
| 3622 | 3609 | for _, c := range p.Ahead { | |
| 3623 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 337, "<li><a href=\"") | |
| 3610 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 336, "<li><a href=\"") | |
| 3624 | 3611 | if templ_7745c5c3_Err != nil { | |
| 3625 | 3612 | return templ_7745c5c3_Err | |
| 3626 | 3613 | } | |
| 3627 | - | var templ_7745c5c3_Var173 templ.SafeURL | |
| 3628 | - | templ_7745c5c3_Var173, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(c.CHref)) | |
| 3614 | + | var templ_7745c5c3_Var172 templ.SafeURL | |
| 3615 | + | templ_7745c5c3_Var172, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(c.CHref)) | |
| 3629 | 3616 | if templ_7745c5c3_Err != nil { | |
| 3630 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 718, Col: 37} | |
| 3617 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 715, Col: 37} | |
| 3631 | 3618 | } | |
| 3632 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var173)) | |
| 3619 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var172)) | |
| 3633 | 3620 | if templ_7745c5c3_Err != nil { | |
| 3634 | 3621 | return templ_7745c5c3_Err | |
| 3635 | 3622 | } | |
| 3636 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 338, "\">") | |
| 3623 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 337, "\">") | |
| 3637 | 3624 | if templ_7745c5c3_Err != nil { | |
| 3638 | 3625 | return templ_7745c5c3_Err | |
| 3639 | 3626 | } | |
| 3640 | - | var templ_7745c5c3_Var174 string | |
| 3641 | - | templ_7745c5c3_Var174, templ_7745c5c3_Err = templ.JoinStringErrs(c.Short) | |
| 3627 | + | var templ_7745c5c3_Var173 string | |
| 3628 | + | templ_7745c5c3_Var173, templ_7745c5c3_Err = templ.JoinStringErrs(c.Short) | |
| 3642 | 3629 | if templ_7745c5c3_Err != nil { | |
| 3643 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 718, Col: 49} | |
| 3630 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 715, Col: 49} | |
| 3644 | 3631 | } | |
| 3645 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var174)) | |
| 3632 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var173)) | |
| 3646 | 3633 | if templ_7745c5c3_Err != nil { | |
| 3647 | 3634 | return templ_7745c5c3_Err | |
| 3648 | 3635 | } | |
| 3649 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 339, "</a> <span class=\"s\">") | |
| 3636 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 338, "</a> <span class=\"s\">") | |
| 3650 | 3637 | if templ_7745c5c3_Err != nil { | |
| 3651 | 3638 | return templ_7745c5c3_Err | |
| 3652 | 3639 | } | |
| 3653 | - | var templ_7745c5c3_Var175 string | |
| 3654 | - | templ_7745c5c3_Var175, templ_7745c5c3_Err = templ.JoinStringErrs(c.Subject) | |
| 3640 | + | var templ_7745c5c3_Var174 string | |
| 3641 | + | templ_7745c5c3_Var174, templ_7745c5c3_Err = templ.JoinStringErrs(c.Subject) | |
| 3655 | 3642 | if templ_7745c5c3_Err != nil { | |
| 3656 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 719, Col: 32} | |
| 3643 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 716, Col: 32} | |
| 3657 | 3644 | } | |
| 3658 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var175)) | |
| 3645 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var174)) | |
| 3659 | 3646 | if templ_7745c5c3_Err != nil { | |
| 3660 | 3647 | return templ_7745c5c3_Err | |
| 3661 | 3648 | } | |
| 3662 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 340, "</span> <span class=\"mute\">") | |
| 3649 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 339, "</span> <span class=\"mute\">") | |
| 3663 | 3650 | if templ_7745c5c3_Err != nil { | |
| 3664 | 3651 | return templ_7745c5c3_Err | |
| 3665 | 3652 | } | |
| 3666 | - | var templ_7745c5c3_Var176 string | |
| 3667 | - | templ_7745c5c3_Var176, templ_7745c5c3_Err = templ.JoinStringErrs(c.Author) | |
| 3653 | + | var templ_7745c5c3_Var175 string | |
| 3654 | + | templ_7745c5c3_Var175, templ_7745c5c3_Err = templ.JoinStringErrs(c.Author) | |
| 3668 | 3655 | if templ_7745c5c3_Err != nil { | |
| 3669 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 721, Col: 16} | |
| 3656 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 718, Col: 16} | |
| 3670 | 3657 | } | |
| 3671 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var176)) | |
| 3658 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var175)) | |
| 3672 | 3659 | if templ_7745c5c3_Err != nil { | |
| 3673 | 3660 | return templ_7745c5c3_Err | |
| 3674 | 3661 | } | |
| 3675 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 341, " ") | |
| 3662 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 340, " ") | |
| 3676 | 3663 | if templ_7745c5c3_Err != nil { | |
| 3677 | 3664 | return templ_7745c5c3_Err | |
| 3678 | 3665 | } | |
| 3679 | 3666 | if c.WhenAt != "" { | |
| 3680 | - | var templ_7745c5c3_Var177 string | |
| 3681 | - | templ_7745c5c3_Var177, templ_7745c5c3_Err = templ.JoinStringErrs(" · ") | |
| 3667 | + | var templ_7745c5c3_Var176 string | |
| 3668 | + | templ_7745c5c3_Var176, templ_7745c5c3_Err = templ.JoinStringErrs(" · ") | |
| 3682 | 3669 | if templ_7745c5c3_Err != nil { | |
| 3683 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 723, Col: 15} | |
| 3670 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 720, Col: 15} | |
| 3684 | 3671 | } | |
| 3685 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var177)) | |
| 3672 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var176)) | |
| 3686 | 3673 | if templ_7745c5c3_Err != nil { | |
| 3687 | 3674 | return templ_7745c5c3_Err | |
| 3688 | 3675 | } | |
| 3689 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 342, "<time datetime=\"") | |
| 3676 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 341, "<time datetime=\"") | |
| 3690 | 3677 | if templ_7745c5c3_Err != nil { | |
| 3691 | 3678 | return templ_7745c5c3_Err | |
| 3692 | 3679 | } | |
| 3693 | - | var templ_7745c5c3_Var178 string | |
| 3694 | - | templ_7745c5c3_Var178, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.WhenAt) | |
| 3680 | + | var templ_7745c5c3_Var177 string | |
| 3681 | + | templ_7745c5c3_Var177, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.WhenAt) | |
| 3695 | 3682 | if templ_7745c5c3_Err != nil { | |
| 3696 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 723, Col: 42} | |
| 3683 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 720, Col: 42} | |
| 3697 | 3684 | } | |
| 3698 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var178) | |
| 3685 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var177) | |
| 3699 | 3686 | if templ_7745c5c3_Err != nil { | |
| 3700 | 3687 | return templ_7745c5c3_Err | |
| 3701 | 3688 | } | |
| 3702 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 343, "\">") | |
| 3689 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 342, "\">") | |
| 3703 | 3690 | if templ_7745c5c3_Err != nil { | |
| 3704 | 3691 | return templ_7745c5c3_Err | |
| 3705 | 3692 | } | |
| 3706 | - | var templ_7745c5c3_Var179 string | |
| 3707 | - | templ_7745c5c3_Var179, templ_7745c5c3_Err = templ.JoinStringErrs(c.When) | |
| 3693 | + | var templ_7745c5c3_Var178 string | |
| 3694 | + | templ_7745c5c3_Var178, templ_7745c5c3_Err = templ.JoinStringErrs(c.When) | |
| 3708 | 3695 | if templ_7745c5c3_Err != nil { | |
| 3709 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 723, Col: 53} | |
| 3696 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 720, Col: 53} | |
| 3710 | 3697 | } | |
| 3711 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var179)) | |
| 3698 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var178)) | |
| 3712 | 3699 | if templ_7745c5c3_Err != nil { | |
| 3713 | 3700 | return templ_7745c5c3_Err | |
| 3714 | 3701 | } | |
| 3715 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 344, "</time>") | |
| 3702 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 343, "</time>") | |
| 3716 | 3703 | if templ_7745c5c3_Err != nil { | |
| 3717 | 3704 | return templ_7745c5c3_Err | |
| 3718 | 3705 | } | |
| 3719 | 3706 | } | |
| 3720 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 345, "</span></li>") | |
| 3707 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 344, "</span></li>") | |
| 3721 | 3708 | if templ_7745c5c3_Err != nil { | |
| 3722 | 3709 | return templ_7745c5c3_Err | |
| 3723 | 3710 | } | |
| 3724 | 3711 | } | |
| 3725 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 346, "</ul>") | |
| 3712 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 345, "</ul>") | |
| 3726 | 3713 | if templ_7745c5c3_Err != nil { | |
| 3727 | 3714 | return templ_7745c5c3_Err | |
| 3728 | 3715 | } | |
| 3729 | 3716 | if len(p.Ahead) == 0 { | |
| 3730 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 347, "<p class=\"dim\">no commit ahead of ") | |
| 3717 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 346, "<p class=\"dim\">no commit ahead of ") | |
| 3731 | 3718 | if templ_7745c5c3_Err != nil { | |
| 3732 | 3719 | return templ_7745c5c3_Err | |
| 3733 | 3720 | } | |
| 3734 | - | var templ_7745c5c3_Var180 string | |
| 3735 | - | templ_7745c5c3_Var180, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | |
| 3721 | + | var templ_7745c5c3_Var179 string | |
| 3722 | + | templ_7745c5c3_Var179, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | |
| 3736 | 3723 | if templ_7745c5c3_Err != nil { | |
| 3737 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 730, Col: 47} | |
| 3724 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 727, Col: 47} | |
| 3738 | 3725 | } | |
| 3739 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var180)) | |
| 3726 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var179)) | |
| 3740 | 3727 | if templ_7745c5c3_Err != nil { | |
| 3741 | 3728 | return templ_7745c5c3_Err | |
| 3742 | 3729 | } | |
| 3743 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 348, ".</p>") | |
| 3730 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 347, ".</p>") | |
| 3744 | 3731 | if templ_7745c5c3_Err != nil { | |
| 3745 | 3732 | return templ_7745c5c3_Err | |
| 3746 | 3733 | } | |
| 3747 | 3734 | } | |
| 3748 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 349, "</section>") | |
| 3735 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 348, "</section>") | |
| 3749 | 3736 | if templ_7745c5c3_Err != nil { | |
| 3750 | 3737 | return templ_7745c5c3_Err | |
| 3751 | 3738 | } | |
| 3752 | 3739 | if p.HasDiff { | |
| 3753 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 350, "<section aria-labelledby=\"r-files\"><h2 id=\"r-files\">Files <span class=\"count\">") | |
| 3740 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 349, "<section aria-labelledby=\"r-files\"><h2 id=\"r-files\">Files <span class=\"count\">") | |
| 3754 | 3741 | if templ_7745c5c3_Err != nil { | |
| 3755 | 3742 | return templ_7745c5c3_Err | |
| 3756 | 3743 | } | |
| 3757 | - | var templ_7745c5c3_Var181 string | |
| 3758 | - | templ_7745c5c3_Var181, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(len(p.Files))) | |
| 3744 | + | var templ_7745c5c3_Var180 string | |
| 3745 | + | templ_7745c5c3_Var180, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(len(p.Files))) | |
| 3759 | 3746 | if templ_7745c5c3_Err != nil { | |
| 3760 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 735, Col: 66} | |
| 3747 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 732, Col: 66} | |
| 3761 | 3748 | } | |
| 3762 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var181)) | |
| 3749 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var180)) | |
| 3763 | 3750 | if templ_7745c5c3_Err != nil { | |
| 3764 | 3751 | return templ_7745c5c3_Err | |
| 3765 | 3752 | } | |
| 3766 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 351, "</span></h2>") | |
| 3753 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 350, "</span></h2>") | |
| 3767 | 3754 | if templ_7745c5c3_Err != nil { | |
| 3768 | 3755 | return templ_7745c5c3_Err | |
| 3769 | 3756 | } | |
| @@ -3771,12 +3758,12 @@ func compareRail(p ComparePage) templ.Component { | |||
| 3771 | 3758 | if templ_7745c5c3_Err != nil { | |
| 3772 | 3759 | return templ_7745c5c3_Err | |
| 3773 | 3760 | } | |
| 3774 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 352, "</section>") | |
| 3761 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 351, "</section>") | |
| 3775 | 3762 | if templ_7745c5c3_Err != nil { | |
| 3776 | 3763 | return templ_7745c5c3_Err | |
| 3777 | 3764 | } | |
| 3778 | 3765 | } | |
| 3779 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 353, "<section aria-labelledby=\"r-cli\"><h2 id=\"r-cli\">From a terminal</h2>") | |
| 3766 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 352, "<section aria-labelledby=\"r-cli\"><h2 id=\"r-cli\">From a terminal</h2>") | |
| 3780 | 3767 | if templ_7745c5c3_Err != nil { | |
| 3781 | 3768 | return templ_7745c5c3_Err | |
| 3782 | 3769 | } | |
| @@ -3784,7 +3771,7 @@ func compareRail(p ComparePage) templ.Component { | |||
| 3784 | 3771 | if templ_7745c5c3_Err != nil { | |
| 3785 | 3772 | return templ_7745c5c3_Err | |
| 3786 | 3773 | } | |
| 3787 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 354, "</section>") | |
| 3774 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 353, "</section>") | |
| 3788 | 3775 | if templ_7745c5c3_Err != nil { | |
| 3789 | 3776 | return templ_7745c5c3_Err | |
| 3790 | 3777 | } | |
| @@ -2033,169 +2033,156 @@ func mrFooter(p MRPage) templ.Component { | |||||
| 2033 | templ_7745c5c3_Var97 = templ.NopComponent | 2033 | templ_7745c5c3_Var97 = templ.NopComponent | ||
| 2034 | } | 2034 | } | ||
| 2035 | ctx = templ.ClearChildren(ctx) | 2035 | ctx = templ.ClearChildren(ctx) | ||
| 2036 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 187, "<footer class=\"mr-footer\"><details id=\"mr-panels\"><summary>Commits <span class=\"count\">") | 2036 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 187, "<footer class=\"mr-footer\"><nav data-mr-tabs aria-label=\"Branch details\"><a id=\"mr-tab-commits\" href=\"#mr-commits\">Commits <span class=\"count\">") |
| 2037 | if templ_7745c5c3_Err != nil { | 2037 | if templ_7745c5c3_Err != nil { | ||
| 2038 | return templ_7745c5c3_Err | 2038 | return templ_7745c5c3_Err | ||
| 2039 | } | 2039 | } | ||
| 2040 | var templ_7745c5c3_Var98 string | 2040 | var templ_7745c5c3_Var98 string | ||
| 2041 | templ_7745c5c3_Var98, templ_7745c5c3_Err = templ.JoinStringErrs(p.CommitCount) | 2041 | templ_7745c5c3_Var98, templ_7745c5c3_Err = templ.JoinStringErrs(p.CommitCount) | ||
| 2042 | if templ_7745c5c3_Err != nil { | 2042 | if templ_7745c5c3_Err != nil { | ||
| 2043 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 382, Col: 55} | 2043 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 382, Col: 88} |
| 2044 | } | 2044 | } | ||
| 2045 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var98)) | 2045 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var98)) | ||
| 2046 | if templ_7745c5c3_Err != nil { | 2046 | if templ_7745c5c3_Err != nil { | ||
| 2047 | return templ_7745c5c3_Err | 2047 | return templ_7745c5c3_Err | ||
| 2048 | } | 2048 | } | ||
| 2049 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 188, "</span> · Checks</summary><nav data-mr-tabs aria-label=\"Branch details\"><a id=\"mr-tab-commits\" href=\"#mr-commits\">Commits <span class=\"count\">") | 2049 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 188, "</span></a> <a id=\"mr-tab-checks\" href=\"#mr-checks\">") |
| 2050 | if templ_7745c5c3_Err != nil { | 2050 | if templ_7745c5c3_Err != nil { | ||
| 2051 | return templ_7745c5c3_Err | 2051 | return templ_7745c5c3_Err | ||
| 2052 | } | 2052 | } | ||
| 2053 | var templ_7745c5c3_Var99 string | 2053 | var templ_7745c5c3_Var99 string | ||
| 2054 | - | templ_7745c5c3_Var99, templ_7745c5c3_Err = templ.JoinStringErrs(p.CommitCount) | 2054 | + | templ_7745c5c3_Var99, templ_7745c5c3_Err = templ.JoinStringErrs("Checks ") |
| 2055 | if templ_7745c5c3_Err != nil { | 2055 | if templ_7745c5c3_Err != nil { | ||
| 2056 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 384, Col: 89} | 2056 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 384, Col: 15} |
| 2057 | } | 2057 | } | ||
| 2058 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var99)) | 2058 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var99)) | ||
| 2059 | if templ_7745c5c3_Err != nil { | 2059 | if templ_7745c5c3_Err != nil { | ||
| 2060 | return templ_7745c5c3_Err | 2060 | return templ_7745c5c3_Err | ||
| 2061 | } | 2061 | } | ||
| 2062 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 189, "</span></a> <a id=\"mr-tab-checks\" href=\"#mr-checks\">") | 2062 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 189, " <span data-checks-label>") |
| 2063 | - | if templ_7745c5c3_Err != nil { | |||
| 2064 | - | return templ_7745c5c3_Err | |||
| 2065 | - | } | |||
| 2066 | - | var templ_7745c5c3_Var100 string | |||
| 2067 | - | templ_7745c5c3_Var100, templ_7745c5c3_Err = templ.JoinStringErrs("Checks ") | |||
| 2068 | - | if templ_7745c5c3_Err != nil { | |||
| 2069 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 386, Col: 16} | |||
| 2070 | - | } | |||
| 2071 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var100)) | |||
| 2072 | - | if templ_7745c5c3_Err != nil { | |||
| 2073 | - | return templ_7745c5c3_Err | |||
| 2074 | - | } | |||
| 2075 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 190, " <span data-checks-label>") | |||
| 2076 | if templ_7745c5c3_Err != nil { | 2063 | if templ_7745c5c3_Err != nil { | ||
| 2077 | return templ_7745c5c3_Err | 2064 | return templ_7745c5c3_Err | ||
| 2078 | } | 2065 | } | ||
| 2079 | if p.ChecksSum.Total > 0 { | 2066 | if p.ChecksSum.Total > 0 { | ||
| 2080 | - | var templ_7745c5c3_Var101 string | 2067 | + | var templ_7745c5c3_Var100 string |
| 2081 | - | templ_7745c5c3_Var101, templ_7745c5c3_Err = templ.JoinStringErrs(p.ChecksSum.Title) | 2068 | + | templ_7745c5c3_Var100, templ_7745c5c3_Err = templ.JoinStringErrs(p.ChecksSum.Title) |
| 2082 | if templ_7745c5c3_Err != nil { | 2069 | if templ_7745c5c3_Err != nil { | ||
| 2083 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 389, Col: 26} | 2070 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 387, Col: 25} |
| 2084 | } | 2071 | } | ||
| 2085 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var101)) | 2072 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var100)) |
| 2086 | if templ_7745c5c3_Err != nil { | 2073 | if templ_7745c5c3_Err != nil { | ||
| 2087 | return templ_7745c5c3_Err | 2074 | return templ_7745c5c3_Err | ||
| 2088 | } | 2075 | } | ||
| 2089 | } else { | 2076 | } else { | ||
| 2090 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 191, "no checks") | 2077 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 190, "no checks") |
| 2091 | if templ_7745c5c3_Err != nil { | 2078 | if templ_7745c5c3_Err != nil { | ||
| 2092 | return templ_7745c5c3_Err | 2079 | return templ_7745c5c3_Err | ||
| 2093 | } | 2080 | } | ||
| 2094 | } | 2081 | } | ||
| 2095 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 192, "</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>") | 2082 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 191, "</span></a></nav><div id=\"mr-commits\" data-mr-panel hidden 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>") |
| 2096 | if templ_7745c5c3_Err != nil { | 2083 | if templ_7745c5c3_Err != nil { | ||
| 2097 | return templ_7745c5c3_Err | 2084 | return templ_7745c5c3_Err | ||
| 2098 | } | 2085 | } | ||
| 2099 | for _, c := range p.Commits { | 2086 | for _, c := range p.Commits { | ||
| 2100 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 193, "<tr") | 2087 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 192, "<tr") |
| 2101 | if templ_7745c5c3_Err != nil { | 2088 | if templ_7745c5c3_Err != nil { | ||
| 2102 | return templ_7745c5c3_Err | 2089 | return templ_7745c5c3_Err | ||
| 2103 | } | 2090 | } | ||
| 2104 | if c.New { | 2091 | if c.New { | ||
| 2105 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 194, " data-new") | 2092 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 193, " data-new") |
| 2106 | if templ_7745c5c3_Err != nil { | 2093 | if templ_7745c5c3_Err != nil { | ||
| 2107 | return templ_7745c5c3_Err | 2094 | return templ_7745c5c3_Err | ||
| 2108 | } | 2095 | } | ||
| 2109 | } | 2096 | } | ||
| 2110 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 195, "><td><a href=\"") | 2097 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 194, "><td><a href=\"") |
| 2111 | if templ_7745c5c3_Err != nil { | 2098 | if templ_7745c5c3_Err != nil { | ||
| 2112 | return templ_7745c5c3_Err | 2099 | return templ_7745c5c3_Err | ||
| 2113 | } | 2100 | } | ||
| 2114 | - | var templ_7745c5c3_Var102 templ.SafeURL | 2101 | + | var templ_7745c5c3_Var101 templ.SafeURL |
| 2115 | - | templ_7745c5c3_Var102, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(c.Href)) | 2102 | + | templ_7745c5c3_Var101, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(c.Href)) |
| 2116 | if templ_7745c5c3_Err != nil { | 2103 | if templ_7745c5c3_Err != nil { | ||
| 2117 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 402, Col: 43} | 2104 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 400, Col: 42} |
| 2118 | } | 2105 | } | ||
| 2119 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var102)) | 2106 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var101)) |
| 2120 | if templ_7745c5c3_Err != nil { | 2107 | if templ_7745c5c3_Err != nil { | ||
| 2121 | return templ_7745c5c3_Err | 2108 | return templ_7745c5c3_Err | ||
| 2122 | } | 2109 | } | ||
| 2123 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 196, "\">") | 2110 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 195, "\">") |
| 2124 | if templ_7745c5c3_Err != nil { | 2111 | if templ_7745c5c3_Err != nil { | ||
| 2125 | return templ_7745c5c3_Err | 2112 | return templ_7745c5c3_Err | ||
| 2126 | } | 2113 | } | ||
| 2127 | - | var templ_7745c5c3_Var103 string | 2114 | + | var templ_7745c5c3_Var102 string |
| 2128 | - | templ_7745c5c3_Var103, templ_7745c5c3_Err = templ.JoinStringErrs(c.Short) | 2115 | + | templ_7745c5c3_Var102, templ_7745c5c3_Err = templ.JoinStringErrs(c.Short) |
| 2129 | if templ_7745c5c3_Err != nil { | 2116 | if templ_7745c5c3_Err != nil { | ||
| 2130 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 402, Col: 55} | 2117 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 400, Col: 54} |
| 2131 | } | 2118 | } | ||
| 2132 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var103)) | 2119 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var102)) |
| 2133 | if templ_7745c5c3_Err != nil { | 2120 | if templ_7745c5c3_Err != nil { | ||
| 2134 | return templ_7745c5c3_Err | 2121 | return templ_7745c5c3_Err | ||
| 2135 | } | 2122 | } | ||
| 2136 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 197, "</a></td><td>") | 2123 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 196, "</a></td><td>") |
| 2137 | if templ_7745c5c3_Err != nil { | 2124 | if templ_7745c5c3_Err != nil { | ||
| 2138 | return templ_7745c5c3_Err | 2125 | return templ_7745c5c3_Err | ||
| 2139 | } | 2126 | } | ||
| 2140 | - | var templ_7745c5c3_Var104 string | 2127 | + | var templ_7745c5c3_Var103 string |
| 2141 | - | templ_7745c5c3_Var104, templ_7745c5c3_Err = templ.JoinStringErrs(c.Subject) | 2128 | + | templ_7745c5c3_Var103, templ_7745c5c3_Err = templ.JoinStringErrs(c.Subject) |
| 2142 | if templ_7745c5c3_Err != nil { | 2129 | if templ_7745c5c3_Err != nil { | ||
| 2143 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 403, Col: 23} | 2130 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 401, Col: 22} |
| 2144 | } | 2131 | } | ||
| 2145 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var104)) | 2132 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var103)) |
| 2146 | if templ_7745c5c3_Err != nil { | 2133 | if templ_7745c5c3_Err != nil { | ||
| 2147 | return templ_7745c5c3_Err | 2134 | return templ_7745c5c3_Err | ||
| 2148 | } | 2135 | } | ||
| 2149 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 198, "</td><td>") | 2136 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 197, "</td><td>") |
| 2150 | if templ_7745c5c3_Err != nil { | 2137 | if templ_7745c5c3_Err != nil { | ||
| 2151 | return templ_7745c5c3_Err | 2138 | return templ_7745c5c3_Err | ||
| 2152 | } | 2139 | } | ||
| 2153 | - | var templ_7745c5c3_Var105 string | 2140 | + | var templ_7745c5c3_Var104 string |
| 2154 | - | templ_7745c5c3_Var105, templ_7745c5c3_Err = templ.JoinStringErrs(c.Author) | 2141 | + | templ_7745c5c3_Var104, templ_7745c5c3_Err = templ.JoinStringErrs(c.Author) |
| 2155 | if templ_7745c5c3_Err != nil { | 2142 | if templ_7745c5c3_Err != nil { | ||
| 2156 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 404, Col: 22} | 2143 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 402, Col: 21} |
| 2157 | } | 2144 | } | ||
| 2158 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var105)) | 2145 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var104)) |
| 2159 | if templ_7745c5c3_Err != nil { | 2146 | if templ_7745c5c3_Err != nil { | ||
| 2160 | return templ_7745c5c3_Err | 2147 | return templ_7745c5c3_Err | ||
| 2161 | } | 2148 | } | ||
| 2162 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 199, "</td><td>") | 2149 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 198, "</td><td>") |
| 2163 | if templ_7745c5c3_Err != nil { | 2150 | if templ_7745c5c3_Err != nil { | ||
| 2164 | return templ_7745c5c3_Err | 2151 | return templ_7745c5c3_Err | ||
| 2165 | } | 2152 | } | ||
| 2166 | if c.WhenAt != "" { | 2153 | if c.WhenAt != "" { | ||
| 2167 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 200, "<time datetime=\"") | 2154 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 199, "<time datetime=\"") |
| 2168 | if templ_7745c5c3_Err != nil { | 2155 | if templ_7745c5c3_Err != nil { | ||
| 2169 | return templ_7745c5c3_Err | 2156 | return templ_7745c5c3_Err | ||
| 2170 | } | 2157 | } | ||
| 2171 | - | var templ_7745c5c3_Var106 string | 2158 | + | var templ_7745c5c3_Var105 string |
| 2172 | - | templ_7745c5c3_Var106, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.WhenAt) | 2159 | + | templ_7745c5c3_Var105, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.WhenAt) |
| 2173 | if templ_7745c5c3_Err != nil { | 2160 | if templ_7745c5c3_Err != nil { | ||
| 2174 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 407, Col: 35} | 2161 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 405, Col: 34} |
| 2175 | } | 2162 | } | ||
| 2176 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var106) | 2163 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var105) |
| 2177 | if templ_7745c5c3_Err != nil { | 2164 | if templ_7745c5c3_Err != nil { | ||
| 2178 | return templ_7745c5c3_Err | 2165 | return templ_7745c5c3_Err | ||
| 2179 | } | 2166 | } | ||
| 2180 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 201, "\">") | 2167 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 200, "\">") |
| 2181 | if templ_7745c5c3_Err != nil { | 2168 | if templ_7745c5c3_Err != nil { | ||
| 2182 | return templ_7745c5c3_Err | 2169 | return templ_7745c5c3_Err | ||
| 2183 | } | 2170 | } | ||
| 2184 | - | var templ_7745c5c3_Var107 string | 2171 | + | var templ_7745c5c3_Var106 string |
| 2185 | - | templ_7745c5c3_Var107, templ_7745c5c3_Err = templ.JoinStringErrs(c.When) | 2172 | + | templ_7745c5c3_Var106, templ_7745c5c3_Err = templ.JoinStringErrs(c.When) |
| 2186 | if templ_7745c5c3_Err != nil { | 2173 | if templ_7745c5c3_Err != nil { | ||
| 2187 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 407, Col: 46} | 2174 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 405, Col: 45} |
| 2188 | } | 2175 | } | ||
| 2189 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var107)) | 2176 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var106)) |
| 2190 | if templ_7745c5c3_Err != nil { | 2177 | if templ_7745c5c3_Err != nil { | ||
| 2191 | return templ_7745c5c3_Err | 2178 | return templ_7745c5c3_Err | ||
| 2192 | } | 2179 | } | ||
| 2193 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 202, "</time>") | 2180 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 201, "</time>") |
| 2194 | if templ_7745c5c3_Err != nil { | 2181 | if templ_7745c5c3_Err != nil { | ||
| 2195 | return templ_7745c5c3_Err | 2182 | return templ_7745c5c3_Err | ||
| 2196 | } | 2183 | } | ||
| 2197 | } | 2184 | } | ||
| 2198 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 203, "</td><td>") | 2185 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 202, "</td><td>") |
| 2199 | if templ_7745c5c3_Err != nil { | 2186 | if templ_7745c5c3_Err != nil { | ||
| 2200 | return templ_7745c5c3_Err | 2187 | return templ_7745c5c3_Err | ||
| 2201 | } | 2188 | } | ||
| @@ -2205,51 +2192,51 @@ func mrFooter(p MRPage) templ.Component { | |||||
| 2205 | return templ_7745c5c3_Err | 2192 | return templ_7745c5c3_Err | ||
| 2206 | } | 2193 | } | ||
| 2207 | } | 2194 | } | ||
| 2208 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 204, "</td><td>") | 2195 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 203, "</td><td>") |
| 2209 | if templ_7745c5c3_Err != nil { | 2196 | if templ_7745c5c3_Err != nil { | ||
| 2210 | return templ_7745c5c3_Err | 2197 | return templ_7745c5c3_Err | ||
| 2211 | } | 2198 | } | ||
| 2212 | if c.New { | 2199 | if c.New { | ||
| 2213 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 205, "<span>new</span>") | 2200 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 204, "<span>new</span>") |
| 2214 | if templ_7745c5c3_Err != nil { | 2201 | if templ_7745c5c3_Err != nil { | ||
| 2215 | return templ_7745c5c3_Err | 2202 | return templ_7745c5c3_Err | ||
| 2216 | } | 2203 | } | ||
| 2217 | } | 2204 | } | ||
| 2218 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 206, "</td></tr>") | 2205 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 205, "</td></tr>") |
| 2219 | if templ_7745c5c3_Err != nil { | 2206 | if templ_7745c5c3_Err != nil { | ||
| 2220 | return templ_7745c5c3_Err | 2207 | return templ_7745c5c3_Err | ||
| 2221 | } | 2208 | } | ||
| 2222 | } | 2209 | } | ||
| 2223 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 207, "</tbody></table>") | 2210 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 206, "</tbody></table>") |
| 2224 | if templ_7745c5c3_Err != nil { | 2211 | if templ_7745c5c3_Err != nil { | ||
| 2225 | return templ_7745c5c3_Err | 2212 | return templ_7745c5c3_Err | ||
| 2226 | } | 2213 | } | ||
| 2227 | if len(p.Commits) == 0 { | 2214 | if len(p.Commits) == 0 { | ||
| 2228 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 208, "<p class=\"dim\">no commit to merge.</p>") | 2215 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 207, "<p class=\"dim\">no commit to merge.</p>") |
| 2229 | if templ_7745c5c3_Err != nil { | 2216 | if templ_7745c5c3_Err != nil { | ||
| 2230 | return templ_7745c5c3_Err | 2217 | return templ_7745c5c3_Err | ||
| 2231 | } | 2218 | } | ||
| 2232 | } | 2219 | } | ||
| 2233 | if p.CommitsNote != "" { | 2220 | if p.CommitsNote != "" { | ||
| 2234 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 209, "<p class=\"note\">") | 2221 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 208, "<p class=\"note\">") |
| 2235 | if templ_7745c5c3_Err != nil { | 2222 | if templ_7745c5c3_Err != nil { | ||
| 2236 | return templ_7745c5c3_Err | 2223 | return templ_7745c5c3_Err | ||
| 2237 | } | 2224 | } | ||
| 2238 | - | var templ_7745c5c3_Var108 string | 2225 | + | var templ_7745c5c3_Var107 string |
| 2239 | - | templ_7745c5c3_Var108, templ_7745c5c3_Err = templ.JoinStringErrs(p.CommitsNote) | 2226 | + | templ_7745c5c3_Var107, templ_7745c5c3_Err = templ.JoinStringErrs(p.CommitsNote) |
| 2240 | if templ_7745c5c3_Err != nil { | 2227 | if templ_7745c5c3_Err != nil { | ||
| 2241 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 428, Col: 36} | 2228 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 426, Col: 35} |
| 2242 | } | 2229 | } | ||
| 2243 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var108)) | 2230 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var107)) |
| 2244 | if templ_7745c5c3_Err != nil { | 2231 | if templ_7745c5c3_Err != nil { | ||
| 2245 | return templ_7745c5c3_Err | 2232 | return templ_7745c5c3_Err | ||
| 2246 | } | 2233 | } | ||
| 2247 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 210, "</p>") | 2234 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 209, "</p>") |
| 2248 | if templ_7745c5c3_Err != nil { | 2235 | if templ_7745c5c3_Err != nil { | ||
| 2249 | return templ_7745c5c3_Err | 2236 | return templ_7745c5c3_Err | ||
| 2250 | } | 2237 | } | ||
| 2251 | } | 2238 | } | ||
| 2252 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 211, "</div><div id=\"mr-checks-panel\" data-mr-panel aria-labelledby=\"mr-tab-checks\">") | 2239 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 210, "</div><div id=\"mr-checks-panel\" data-mr-panel hidden aria-labelledby=\"mr-tab-checks\">") |
| 2253 | if templ_7745c5c3_Err != nil { | 2240 | if templ_7745c5c3_Err != nil { | ||
| 2254 | return templ_7745c5c3_Err | 2241 | return templ_7745c5c3_Err | ||
| 2255 | } | 2242 | } | ||
| @@ -2257,7 +2244,7 @@ func mrFooter(p MRPage) templ.Component { | |||||
| 2257 | if templ_7745c5c3_Err != nil { | 2244 | if templ_7745c5c3_Err != nil { | ||
| 2258 | return templ_7745c5c3_Err | 2245 | return templ_7745c5c3_Err | ||
| 2259 | } | 2246 | } | ||
| 2260 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 212, "</div></details></footer>") | 2247 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 211, "</div></footer>") |
| 2261 | if templ_7745c5c3_Err != nil { | 2248 | if templ_7745c5c3_Err != nil { | ||
| 2262 | return templ_7745c5c3_Err | 2249 | return templ_7745c5c3_Err | ||
| 2263 | } | 2250 | } | ||
| @@ -2281,25 +2268,25 @@ func mrRail(p MRPage) templ.Component { | |||||
| 2281 | }() | 2268 | }() | ||
| 2282 | } | 2269 | } | ||
| 2283 | ctx = templ.InitializeContext(ctx) | 2270 | ctx = templ.InitializeContext(ctx) | ||
| 2284 | - | templ_7745c5c3_Var109 := templ.GetChildren(ctx) | 2271 | + | templ_7745c5c3_Var108 := templ.GetChildren(ctx) |
| 2285 | - | if templ_7745c5c3_Var109 == nil { | 2272 | + | if templ_7745c5c3_Var108 == nil { |
| 2286 | - | templ_7745c5c3_Var109 = templ.NopComponent | 2273 | + | templ_7745c5c3_Var108 = templ.NopComponent |
| 2287 | } | 2274 | } | ||
| 2288 | ctx = templ.ClearChildren(ctx) | 2275 | ctx = templ.ClearChildren(ctx) | ||
| 2289 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 213, "<section aria-labelledby=\"r-files\" class=\"r-files\"><h2 id=\"r-files\">Files <span class=\"count\">") | 2276 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 212, "<section aria-labelledby=\"r-files\" class=\"r-files\"><h2 id=\"r-files\">Files <span class=\"count\">") |
| 2290 | if templ_7745c5c3_Err != nil { | 2277 | if templ_7745c5c3_Err != nil { | ||
| 2291 | return templ_7745c5c3_Err | 2278 | return templ_7745c5c3_Err | ||
| 2292 | } | 2279 | } | ||
| 2293 | - | var templ_7745c5c3_Var110 string | 2280 | + | var templ_7745c5c3_Var109 string |
| 2294 | - | templ_7745c5c3_Var110, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(len(p.Files))) | 2281 | + | templ_7745c5c3_Var109, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(len(p.Files))) |
| 2295 | if templ_7745c5c3_Err != nil { | 2282 | if templ_7745c5c3_Err != nil { | ||
| 2296 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 441, Col: 49} | 2283 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 438, Col: 49} |
| 2297 | } | 2284 | } | ||
| 2298 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var110)) | 2285 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var109)) |
| 2299 | if templ_7745c5c3_Err != nil { | 2286 | if templ_7745c5c3_Err != nil { | ||
| 2300 | return templ_7745c5c3_Err | 2287 | return templ_7745c5c3_Err | ||
| 2301 | } | 2288 | } | ||
| 2302 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 214, "</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>") | 2289 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 213, "</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>") |
| 2303 | if templ_7745c5c3_Err != nil { | 2290 | if templ_7745c5c3_Err != nil { | ||
| 2304 | return templ_7745c5c3_Err | 2291 | return templ_7745c5c3_Err | ||
| 2305 | } | 2292 | } | ||
| @@ -2307,71 +2294,71 @@ func mrRail(p MRPage) templ.Component { | |||||
| 2307 | if templ_7745c5c3_Err != nil { | 2294 | if templ_7745c5c3_Err != nil { | ||
| 2308 | return templ_7745c5c3_Err | 2295 | return templ_7745c5c3_Err | ||
| 2309 | } | 2296 | } | ||
| 2310 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 215, "</section>") | 2297 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 214, "</section>") |
| 2311 | if templ_7745c5c3_Err != nil { | 2298 | if templ_7745c5c3_Err != nil { | ||
| 2312 | return templ_7745c5c3_Err | 2299 | return templ_7745c5c3_Err | ||
| 2313 | } | 2300 | } | ||
| 2314 | if len(p.Verdicts) > 0 { | 2301 | if len(p.Verdicts) > 0 { | ||
| 2315 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 216, "<section><h2>Verdicts</h2><ul>") | 2302 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 215, "<section><h2>Verdicts</h2><ul>") |
| 2316 | if templ_7745c5c3_Err != nil { | 2303 | if templ_7745c5c3_Err != nil { | ||
| 2317 | return templ_7745c5c3_Err | 2304 | return templ_7745c5c3_Err | ||
| 2318 | } | 2305 | } | ||
| 2319 | for _, v := range p.Verdicts { | 2306 | for _, v := range p.Verdicts { | ||
| 2320 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 217, "<li><a href=\"") | 2307 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 216, "<li><a href=\"") |
| 2321 | if templ_7745c5c3_Err != nil { | 2308 | if templ_7745c5c3_Err != nil { | ||
| 2322 | return templ_7745c5c3_Err | 2309 | return templ_7745c5c3_Err | ||
| 2323 | } | 2310 | } | ||
| 2324 | - | var templ_7745c5c3_Var111 templ.SafeURL | 2311 | + | var templ_7745c5c3_Var110 templ.SafeURL |
| 2325 | - | templ_7745c5c3_Var111, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(v.Href)) | 2312 | + | templ_7745c5c3_Var110, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(v.Href)) |
| 2326 | if templ_7745c5c3_Err != nil { | 2313 | if templ_7745c5c3_Err != nil { | ||
| 2327 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 454, Col: 37} | 2314 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 451, Col: 37} |
| 2328 | } | 2315 | } | ||
| 2329 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var111)) | 2316 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var110)) |
| 2330 | if templ_7745c5c3_Err != nil { | 2317 | if templ_7745c5c3_Err != nil { | ||
| 2331 | return templ_7745c5c3_Err | 2318 | return templ_7745c5c3_Err | ||
| 2332 | } | 2319 | } | ||
| 2333 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 218, "\">") | 2320 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 217, "\">") |
| 2334 | if templ_7745c5c3_Err != nil { | 2321 | if templ_7745c5c3_Err != nil { | ||
| 2335 | return templ_7745c5c3_Err | 2322 | return templ_7745c5c3_Err | ||
| 2336 | } | 2323 | } | ||
| 2337 | - | var templ_7745c5c3_Var112 string | 2324 | + | var templ_7745c5c3_Var111 string |
| 2338 | - | templ_7745c5c3_Var112, templ_7745c5c3_Err = templ.JoinStringErrs(v.Author) | 2325 | + | templ_7745c5c3_Var111, templ_7745c5c3_Err = templ.JoinStringErrs(v.Author) |
| 2339 | if templ_7745c5c3_Err != nil { | 2326 | if templ_7745c5c3_Err != nil { | ||
| 2340 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 454, Col: 50} | 2327 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 451, Col: 50} |
| 2341 | } | 2328 | } | ||
| 2342 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var112)) | 2329 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var111)) |
| 2343 | if templ_7745c5c3_Err != nil { | 2330 | if templ_7745c5c3_Err != nil { | ||
| 2344 | return templ_7745c5c3_Err | 2331 | return templ_7745c5c3_Err | ||
| 2345 | } | 2332 | } | ||
| 2346 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 219, ": ") | 2333 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 218, ": ") |
| 2347 | if templ_7745c5c3_Err != nil { | 2334 | if templ_7745c5c3_Err != nil { | ||
| 2348 | return templ_7745c5c3_Err | 2335 | return templ_7745c5c3_Err | ||
| 2349 | } | 2336 | } | ||
| 2350 | - | var templ_7745c5c3_Var113 string | 2337 | + | var templ_7745c5c3_Var112 string |
| 2351 | - | templ_7745c5c3_Var113, templ_7745c5c3_Err = templ.JoinStringErrs(v.Label) | 2338 | + | templ_7745c5c3_Var112, templ_7745c5c3_Err = templ.JoinStringErrs(v.Label) |
| 2352 | if templ_7745c5c3_Err != nil { | 2339 | if templ_7745c5c3_Err != nil { | ||
| 2353 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 454, Col: 63} | 2340 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 451, Col: 63} |
| 2354 | } | 2341 | } | ||
| 2355 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var113)) | 2342 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var112)) |
| 2356 | if templ_7745c5c3_Err != nil { | 2343 | if templ_7745c5c3_Err != nil { | ||
| 2357 | return templ_7745c5c3_Err | 2344 | return templ_7745c5c3_Err | ||
| 2358 | } | 2345 | } | ||
| 2359 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 220, "</a> ") | 2346 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 219, "</a> ") |
| 2360 | if templ_7745c5c3_Err != nil { | 2347 | if templ_7745c5c3_Err != nil { | ||
| 2361 | return templ_7745c5c3_Err | 2348 | return templ_7745c5c3_Err | ||
| 2362 | } | 2349 | } | ||
| 2363 | if v.Stale { | 2350 | if v.Stale { | ||
| 2364 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 221, "<span class=\"mute\">(stale)</span>") | 2351 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 220, "<span class=\"mute\">(stale)</span>") |
| 2365 | if templ_7745c5c3_Err != nil { | 2352 | if templ_7745c5c3_Err != nil { | ||
| 2366 | return templ_7745c5c3_Err | 2353 | return templ_7745c5c3_Err | ||
| 2367 | } | 2354 | } | ||
| 2368 | } | 2355 | } | ||
| 2369 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 222, "</li>") | 2356 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 221, "</li>") |
| 2370 | if templ_7745c5c3_Err != nil { | 2357 | if templ_7745c5c3_Err != nil { | ||
| 2371 | return templ_7745c5c3_Err | 2358 | return templ_7745c5c3_Err | ||
| 2372 | } | 2359 | } | ||
| 2373 | } | 2360 | } | ||
| 2374 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 223, "</ul></section>") | 2361 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 222, "</ul></section>") |
| 2375 | if templ_7745c5c3_Err != nil { | 2362 | if templ_7745c5c3_Err != nil { | ||
| 2376 | return templ_7745c5c3_Err | 2363 | return templ_7745c5c3_Err | ||
| 2377 | } | 2364 | } | ||
| @@ -2400,51 +2387,51 @@ func mrBar(p MRPage) templ.Component { | |||||
| 2400 | }() | 2387 | }() | ||
| 2401 | } | 2388 | } | ||
| 2402 | ctx = templ.InitializeContext(ctx) | 2389 | ctx = templ.InitializeContext(ctx) | ||
| 2403 | - | templ_7745c5c3_Var114 := templ.GetChildren(ctx) | 2390 | + | templ_7745c5c3_Var113 := templ.GetChildren(ctx) |
| 2404 | - | if templ_7745c5c3_Var114 == nil { | 2391 | + | if templ_7745c5c3_Var113 == nil { |
| 2405 | - | templ_7745c5c3_Var114 = templ.NopComponent | 2392 | + | templ_7745c5c3_Var113 = templ.NopComponent |
| 2406 | } | 2393 | } | ||
| 2407 | ctx = templ.ClearChildren(ctx) | 2394 | ctx = templ.ClearChildren(ctx) | ||
| 2408 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 224, "<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, 223, "<div class=\"diff-tools mr-bar\" role=\"group\" aria-label=\"Diff view and merge\"><span class=\"dim\">") |
| 2409 | if templ_7745c5c3_Err != nil { | 2396 | if templ_7745c5c3_Err != nil { | ||
| 2410 | return templ_7745c5c3_Err | 2397 | return templ_7745c5c3_Err | ||
| 2411 | } | 2398 | } | ||
| 2412 | - | var templ_7745c5c3_Var115 string | 2399 | + | var templ_7745c5c3_Var114 string |
| 2413 | - | templ_7745c5c3_Var115, templ_7745c5c3_Err = templ.JoinStringErrs(plural(p.NFiles, "file", "files")) | 2400 | + | templ_7745c5c3_Var114, templ_7745c5c3_Err = templ.JoinStringErrs(plural(p.NFiles, "file", "files")) |
| 2414 | if templ_7745c5c3_Err != nil { | 2401 | if templ_7745c5c3_Err != nil { | ||
| 2415 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 471, Col: 55} | 2402 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 468, Col: 55} |
| 2416 | } | 2403 | } | ||
| 2417 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var115)) | 2404 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var114)) |
| 2418 | if templ_7745c5c3_Err != nil { | 2405 | if templ_7745c5c3_Err != nil { | ||
| 2419 | return templ_7745c5c3_Err | 2406 | return templ_7745c5c3_Err | ||
| 2420 | } | 2407 | } | ||
| 2421 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 225, " · <span class=\"plus\">+") | 2408 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 224, " · <span class=\"plus\">+") |
| 2422 | if templ_7745c5c3_Err != nil { | 2409 | if templ_7745c5c3_Err != nil { | ||
| 2423 | return templ_7745c5c3_Err | 2410 | return templ_7745c5c3_Err | ||
| 2424 | } | 2411 | } | ||
| 2425 | - | var templ_7745c5c3_Var116 string | 2412 | + | var templ_7745c5c3_Var115 string |
| 2426 | - | templ_7745c5c3_Var116, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Adds)) | 2413 | + | templ_7745c5c3_Var115, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Adds)) |
| 2427 | if templ_7745c5c3_Err != nil { | 2414 | if templ_7745c5c3_Err != nil { | ||
| 2428 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 471, Col: 95} | 2415 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 468, Col: 95} |
| 2429 | } | 2416 | } | ||
| 2430 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var116)) | 2417 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var115)) |
| 2431 | if templ_7745c5c3_Err != nil { | 2418 | if templ_7745c5c3_Err != nil { | ||
| 2432 | return templ_7745c5c3_Err | 2419 | return templ_7745c5c3_Err | ||
| 2433 | } | 2420 | } | ||
| 2434 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 226, "</span> <span class=\"minus\">-") | 2421 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 225, "</span> <span class=\"minus\">-") |
| 2435 | if templ_7745c5c3_Err != nil { | 2422 | if templ_7745c5c3_Err != nil { | ||
| 2436 | return templ_7745c5c3_Err | 2423 | return templ_7745c5c3_Err | ||
| 2437 | } | 2424 | } | ||
| 2438 | - | var templ_7745c5c3_Var117 string | 2425 | + | var templ_7745c5c3_Var116 string |
| 2439 | - | templ_7745c5c3_Var117, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Dels)) | 2426 | + | templ_7745c5c3_Var116, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Dels)) |
| 2440 | if templ_7745c5c3_Err != nil { | 2427 | if templ_7745c5c3_Err != nil { | ||
| 2441 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 471, Col: 140} | 2428 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 468, Col: 140} |
| 2442 | } | 2429 | } | ||
| 2443 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var117)) | 2430 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var116)) |
| 2444 | if templ_7745c5c3_Err != nil { | 2431 | if templ_7745c5c3_Err != nil { | ||
| 2445 | return templ_7745c5c3_Err | 2432 | return templ_7745c5c3_Err | ||
| 2446 | } | 2433 | } | ||
| 2447 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 227, "</span></span>") | 2434 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 226, "</span></span>") |
| 2448 | if templ_7745c5c3_Err != nil { | 2435 | if templ_7745c5c3_Err != nil { | ||
| 2449 | return templ_7745c5c3_Err | 2436 | return templ_7745c5c3_Err | ||
| 2450 | } | 2437 | } | ||
| @@ -2452,7 +2439,7 @@ func mrBar(p MRPage) templ.Component { | |||||
| 2452 | if templ_7745c5c3_Err != nil { | 2439 | if templ_7745c5c3_Err != nil { | ||
| 2453 | return templ_7745c5c3_Err | 2440 | return templ_7745c5c3_Err | ||
| 2454 | } | 2441 | } | ||
| 2455 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 228, "<span class=\"grow\"></span>") | 2442 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 227, "<span class=\"grow\"></span>") |
| 2456 | if templ_7745c5c3_Err != nil { | 2443 | if templ_7745c5c3_Err != nil { | ||
| 2457 | return templ_7745c5c3_Err | 2444 | return templ_7745c5c3_Err | ||
| 2458 | } | 2445 | } | ||
| @@ -2470,7 +2457,7 @@ func mrBar(p MRPage) templ.Component { | |||||
| 2470 | if templ_7745c5c3_Err != nil { | 2457 | if templ_7745c5c3_Err != nil { | ||
| 2471 | return templ_7745c5c3_Err | 2458 | return templ_7745c5c3_Err | ||
| 2472 | } | 2459 | } | ||
| 2473 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 229, "</div>") | 2460 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 228, "</div>") |
| 2474 | if templ_7745c5c3_Err != nil { | 2461 | if templ_7745c5c3_Err != nil { | ||
| 2475 | return templ_7745c5c3_Err | 2462 | return templ_7745c5c3_Err | ||
| 2476 | } | 2463 | } | ||
| @@ -2502,80 +2489,80 @@ func mergeMenu(p MRPage) templ.Component { | |||||
| 2502 | }() | 2489 | }() | ||
| 2503 | } | 2490 | } | ||
| 2504 | ctx = templ.InitializeContext(ctx) | 2491 | ctx = templ.InitializeContext(ctx) | ||
| 2505 | - | templ_7745c5c3_Var118 := templ.GetChildren(ctx) | 2492 | + | templ_7745c5c3_Var117 := templ.GetChildren(ctx) |
| 2506 | - | if templ_7745c5c3_Var118 == nil { | 2493 | + | if templ_7745c5c3_Var117 == nil { |
| 2507 | - | templ_7745c5c3_Var118 = templ.NopComponent | 2494 | + | templ_7745c5c3_Var117 = templ.NopComponent |
| 2508 | } | 2495 | } | ||
| 2509 | ctx = templ.ClearChildren(ctx) | 2496 | ctx = templ.ClearChildren(ctx) | ||
| 2510 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 230, "<details class=\"menu mmenu\" id=\"merge-menu\" data-state=\"open\"") | 2497 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 229, "<details class=\"menu mmenu\" id=\"merge-menu\" data-state=\"open\"") |
| 2511 | if templ_7745c5c3_Err != nil { | 2498 | if templ_7745c5c3_Err != nil { | ||
| 2512 | return templ_7745c5c3_Err | 2499 | return templ_7745c5c3_Err | ||
| 2513 | } | 2500 | } | ||
| 2514 | if p.Box.Error != "" { | 2501 | if p.Box.Error != "" { | ||
| 2515 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 231, " open") | 2502 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 230, " open") |
| 2516 | if templ_7745c5c3_Err != nil { | 2503 | if templ_7745c5c3_Err != nil { | ||
| 2517 | return templ_7745c5c3_Err | 2504 | return templ_7745c5c3_Err | ||
| 2518 | } | 2505 | } | ||
| 2519 | } | 2506 | } | ||
| 2520 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 232, "><summary class=\"btn primary\" aria-keyshortcuts=\"Shift+M\">") | 2507 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 231, "><summary class=\"btn primary\" aria-keyshortcuts=\"Shift+M\">") |
| 2521 | if templ_7745c5c3_Err != nil { | 2508 | if templ_7745c5c3_Err != nil { | ||
| 2522 | return templ_7745c5c3_Err | 2509 | return templ_7745c5c3_Err | ||
| 2523 | } | 2510 | } | ||
| 2524 | if p.Box.ReadyAction != "" { | 2511 | if p.Box.ReadyAction != "" { | ||
| 2525 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 233, "Draft ") | 2512 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 232, "Draft ") |
| 2526 | if templ_7745c5c3_Err != nil { | 2513 | if templ_7745c5c3_Err != nil { | ||
| 2527 | return templ_7745c5c3_Err | 2514 | return templ_7745c5c3_Err | ||
| 2528 | } | 2515 | } | ||
| 2529 | } else { | 2516 | } else { | ||
| 2530 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 234, "Merge ") | 2517 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 233, "Merge ") |
| 2531 | if templ_7745c5c3_Err != nil { | 2518 | if templ_7745c5c3_Err != nil { | ||
| 2532 | return templ_7745c5c3_Err | 2519 | return templ_7745c5c3_Err | ||
| 2533 | } | 2520 | } | ||
| 2534 | } | 2521 | } | ||
| 2535 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 235, "<kbd aria-hidden=\"true\">M</kbd></summary><div class=\"menu-pop\" role=\"group\" aria-label=\"Merge\">") | 2522 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 234, "<kbd aria-hidden=\"true\">M</kbd></summary><div class=\"menu-pop\" role=\"group\" aria-label=\"Merge\">") |
| 2536 | if templ_7745c5c3_Err != nil { | 2523 | if templ_7745c5c3_Err != nil { | ||
| 2537 | return templ_7745c5c3_Err | 2524 | return templ_7745c5c3_Err | ||
| 2538 | } | 2525 | } | ||
| 2539 | if p.Box.HeadGone { | 2526 | if p.Box.HeadGone { | ||
| 2540 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 236, "<p class=\"dim\">the source branch was deleted</p>") | 2527 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 235, "<p class=\"dim\">the source branch was deleted</p>") |
| 2541 | if templ_7745c5c3_Err != nil { | 2528 | if templ_7745c5c3_Err != nil { | ||
| 2542 | return templ_7745c5c3_Err | 2529 | return templ_7745c5c3_Err | ||
| 2543 | } | 2530 | } | ||
| 2544 | } | 2531 | } | ||
| 2545 | if p.Box.Error != "" { | 2532 | if p.Box.Error != "" { | ||
| 2546 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 237, "<p class=\"d-err\" role=\"alert\">") | 2533 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 236, "<p class=\"d-err\" role=\"alert\">") |
| 2547 | if templ_7745c5c3_Err != nil { | 2534 | if templ_7745c5c3_Err != nil { | ||
| 2548 | return templ_7745c5c3_Err | 2535 | return templ_7745c5c3_Err | ||
| 2549 | } | 2536 | } | ||
| 2550 | - | var templ_7745c5c3_Var119 string | 2537 | + | var templ_7745c5c3_Var118 string |
| 2551 | - | templ_7745c5c3_Var119, templ_7745c5c3_Err = templ.JoinStringErrs(p.Box.Error) | 2538 | + | templ_7745c5c3_Var118, templ_7745c5c3_Err = templ.JoinStringErrs(p.Box.Error) |
| 2552 | if templ_7745c5c3_Err != nil { | 2539 | if templ_7745c5c3_Err != nil { | ||
| 2553 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 505, Col: 47} | 2540 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 502, Col: 47} |
| 2554 | } | 2541 | } | ||
| 2555 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var119)) | 2542 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var118)) |
| 2556 | if templ_7745c5c3_Err != nil { | 2543 | if templ_7745c5c3_Err != nil { | ||
| 2557 | return templ_7745c5c3_Err | 2544 | return templ_7745c5c3_Err | ||
| 2558 | } | 2545 | } | ||
| 2559 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 238, "</p>") | 2546 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 237, "</p>") |
| 2560 | if templ_7745c5c3_Err != nil { | 2547 | if templ_7745c5c3_Err != nil { | ||
| 2561 | return templ_7745c5c3_Err | 2548 | return templ_7745c5c3_Err | ||
| 2562 | } | 2549 | } | ||
| 2563 | } | 2550 | } | ||
| 2564 | if p.Box.ReadyAction != "" { | 2551 | if p.Box.ReadyAction != "" { | ||
| 2565 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 239, "<p class=\"d-draft\">this is a draft: it cannot be merged until it is ready for review.</p><form class=\"d-btns\" method=\"post\" action=\"") | 2552 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 238, "<p class=\"d-draft\">this is a draft: it cannot be merged until it is ready for review.</p><form class=\"d-btns\" method=\"post\" action=\"") |
| 2566 | if templ_7745c5c3_Err != nil { | 2553 | if templ_7745c5c3_Err != nil { | ||
| 2567 | return templ_7745c5c3_Err | 2554 | return templ_7745c5c3_Err | ||
| 2568 | } | 2555 | } | ||
| 2569 | - | var templ_7745c5c3_Var120 templ.SafeURL | 2556 | + | var templ_7745c5c3_Var119 templ.SafeURL |
| 2570 | - | templ_7745c5c3_Var120, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.ReadyAction)) | 2557 | + | templ_7745c5c3_Var119, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.ReadyAction)) |
| 2571 | if templ_7745c5c3_Err != nil { | 2558 | if templ_7745c5c3_Err != nil { | ||
| 2572 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 509, Col: 80} | 2559 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 506, Col: 80} |
| 2573 | } | 2560 | } | ||
| 2574 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var120)) | 2561 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var119)) |
| 2575 | if templ_7745c5c3_Err != nil { | 2562 | if templ_7745c5c3_Err != nil { | ||
| 2576 | return templ_7745c5c3_Err | 2563 | return templ_7745c5c3_Err | ||
| 2577 | } | 2564 | } | ||
| 2578 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 240, "\"><button type=\"submit\" class=\"btn primary\" data-default title=\"remove the draft prefix from the title\">Ready for review</button></form>") | 2565 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 239, "\"><button type=\"submit\" class=\"btn primary\" data-default title=\"remove the draft prefix from the title\">Ready for review</button></form>") |
| 2579 | if templ_7745c5c3_Err != nil { | 2566 | if templ_7745c5c3_Err != nil { | ||
| 2580 | return templ_7745c5c3_Err | 2567 | return templ_7745c5c3_Err | ||
| 2581 | } | 2568 | } | ||
| @@ -2584,185 +2571,185 @@ func mergeMenu(p MRPage) templ.Component { | |||||
| 2584 | if templ_7745c5c3_Err != nil { | 2571 | if templ_7745c5c3_Err != nil { | ||
| 2585 | return templ_7745c5c3_Err | 2572 | return templ_7745c5c3_Err | ||
| 2586 | } | 2573 | } | ||
| 2587 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 241, " <form class=\"d-acts\" method=\"post\" action=\"") | 2574 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 240, " <form class=\"d-acts\" method=\"post\" action=\"") |
| 2588 | if templ_7745c5c3_Err != nil { | 2575 | if templ_7745c5c3_Err != nil { | ||
| 2589 | return templ_7745c5c3_Err | 2576 | return templ_7745c5c3_Err | ||
| 2590 | } | 2577 | } | ||
| 2591 | - | var templ_7745c5c3_Var121 templ.SafeURL | 2578 | + | var templ_7745c5c3_Var120 templ.SafeURL |
| 2592 | - | templ_7745c5c3_Var121, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.MergeAction)) | 2579 | + | templ_7745c5c3_Var120, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.MergeAction)) |
| 2593 | if templ_7745c5c3_Err != nil { | 2580 | if templ_7745c5c3_Err != nil { | ||
| 2594 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 514, Col: 80} | 2581 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 511, Col: 80} |
| 2595 | } | 2582 | } | ||
| 2596 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var121)) | 2583 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var120)) |
| 2597 | if templ_7745c5c3_Err != nil { | 2584 | if templ_7745c5c3_Err != nil { | ||
| 2598 | return templ_7745c5c3_Err | 2585 | return templ_7745c5c3_Err | ||
| 2599 | } | 2586 | } | ||
| 2600 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 242, "\"><input type=\"hidden\" name=\"head_id\" value=\"") | 2587 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 241, "\"><input type=\"hidden\" name=\"head_id\" value=\"") |
| 2601 | if templ_7745c5c3_Err != nil { | 2588 | if templ_7745c5c3_Err != nil { | ||
| 2602 | return templ_7745c5c3_Err | 2589 | return templ_7745c5c3_Err | ||
| 2603 | } | 2590 | } | ||
| 2604 | - | var templ_7745c5c3_Var122 string | 2591 | + | var templ_7745c5c3_Var121 string |
| 2605 | - | templ_7745c5c3_Var122, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Box.Head) | 2592 | + | templ_7745c5c3_Var121, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Box.Head) |
| 2606 | if templ_7745c5c3_Err != nil { | 2593 | if templ_7745c5c3_Err != nil { | ||
| 2607 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 515, Col: 59} | 2594 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 512, Col: 59} |
| 2608 | } | 2595 | } | ||
| 2609 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var122) | 2596 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var121) |
| 2610 | if templ_7745c5c3_Err != nil { | 2597 | if templ_7745c5c3_Err != nil { | ||
| 2611 | return templ_7745c5c3_Err | 2598 | return templ_7745c5c3_Err | ||
| 2612 | } | 2599 | } | ||
| 2613 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 243, "\"><fieldset class=\"d-modes\"><legend class=\"sr\">merge mode</legend> ") | 2600 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 242, "\"><fieldset class=\"d-modes\"><legend class=\"sr\">merge mode</legend> ") |
| 2614 | if templ_7745c5c3_Err != nil { | 2601 | if templ_7745c5c3_Err != nil { | ||
| 2615 | return templ_7745c5c3_Err | 2602 | return templ_7745c5c3_Err | ||
| 2616 | } | 2603 | } | ||
| 2617 | for i, m := range p.Box.Modes { | 2604 | for i, m := range p.Box.Modes { | ||
| 2618 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 244, "<label><input type=\"radio\" name=\"mode\" value=\"") | 2605 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 243, "<label><input type=\"radio\" name=\"mode\" value=\"") |
| 2619 | if templ_7745c5c3_Err != nil { | 2606 | if templ_7745c5c3_Err != nil { | ||
| 2620 | return templ_7745c5c3_Err | 2607 | return templ_7745c5c3_Err | ||
| 2621 | } | 2608 | } | ||
| 2622 | - | var templ_7745c5c3_Var123 string | 2609 | + | var templ_7745c5c3_Var122 string |
| 2623 | - | templ_7745c5c3_Var123, templ_7745c5c3_Err = templ.ResolveAttributeValue(m.Value) | 2610 | + | templ_7745c5c3_Var122, templ_7745c5c3_Err = templ.ResolveAttributeValue(m.Value) |
| 2624 | if templ_7745c5c3_Err != nil { | 2611 | if templ_7745c5c3_Err != nil { | ||
| 2625 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 523, Col: 24} | 2612 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 520, Col: 24} |
| 2626 | } | 2613 | } | ||
| 2627 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var123) | 2614 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var122) |
| 2628 | if templ_7745c5c3_Err != nil { | 2615 | if templ_7745c5c3_Err != nil { | ||
| 2629 | return templ_7745c5c3_Err | 2616 | return templ_7745c5c3_Err | ||
| 2630 | } | 2617 | } | ||
| 2631 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 245, "\"") | 2618 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 244, "\"") |
| 2632 | if templ_7745c5c3_Err != nil { | 2619 | if templ_7745c5c3_Err != nil { | ||
| 2633 | return templ_7745c5c3_Err | 2620 | return templ_7745c5c3_Err | ||
| 2634 | } | 2621 | } | ||
| 2635 | if i == p.Box.Checked() { | 2622 | if i == p.Box.Checked() { | ||
| 2636 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 246, " checked") | 2623 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 245, " checked") |
| 2637 | if templ_7745c5c3_Err != nil { | 2624 | if templ_7745c5c3_Err != nil { | ||
| 2638 | return templ_7745c5c3_Err | 2625 | return templ_7745c5c3_Err | ||
| 2639 | } | 2626 | } | ||
| 2640 | } | 2627 | } | ||
| 2641 | if m.Disabled { | 2628 | if m.Disabled { | ||
| 2642 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 247, " disabled") | 2629 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 246, " disabled") |
| 2643 | if templ_7745c5c3_Err != nil { | 2630 | if templ_7745c5c3_Err != nil { | ||
| 2644 | return templ_7745c5c3_Err | 2631 | return templ_7745c5c3_Err | ||
| 2645 | } | 2632 | } | ||
| 2646 | } | 2633 | } | ||
| 2647 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 248, " title=\"") | 2634 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 247, " title=\"") |
| 2648 | if templ_7745c5c3_Err != nil { | 2635 | if templ_7745c5c3_Err != nil { | ||
| 2649 | return templ_7745c5c3_Err | 2636 | return templ_7745c5c3_Err | ||
| 2650 | } | 2637 | } | ||
| 2651 | - | var templ_7745c5c3_Var124 string | 2638 | + | var templ_7745c5c3_Var123 string |
| 2652 | - | templ_7745c5c3_Var124, templ_7745c5c3_Err = templ.ResolveAttributeValue(m.Reason) | 2639 | + | templ_7745c5c3_Var123, templ_7745c5c3_Err = templ.ResolveAttributeValue(m.Reason) |
| 2653 | if templ_7745c5c3_Err != nil { | 2640 | if templ_7745c5c3_Err != nil { | ||
| 2654 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 526, Col: 25} | 2641 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 523, Col: 25} |
| 2655 | } | 2642 | } | ||
| 2656 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var124) | 2643 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var123) |
| 2657 | if templ_7745c5c3_Err != nil { | 2644 | if templ_7745c5c3_Err != nil { | ||
| 2658 | return templ_7745c5c3_Err | 2645 | return templ_7745c5c3_Err | ||
| 2659 | } | 2646 | } | ||
| 2660 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 249, "\" :disabled=\"this.value === 'fast-forward' ? q('[data-mergeability]').data.ffOk !== true : q('[data-mergeability]').data.mergeOk !== true\" :title=\"this.value === 'fast-forward' ? q('[data-mergeability]').data.ffReason : q('[data-mergeability]').data.mergeReason\"> ") | 2647 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 248, "\" :disabled=\"this.value === 'fast-forward' ? q('[data-mergeability]').data.ffOk !== true : q('[data-mergeability]').data.mergeOk !== true\" :title=\"this.value === 'fast-forward' ? q('[data-mergeability]').data.ffReason : q('[data-mergeability]').data.mergeReason\"> ") |
| 2661 | if templ_7745c5c3_Err != nil { | 2648 | if templ_7745c5c3_Err != nil { | ||
| 2662 | return templ_7745c5c3_Err | 2649 | return templ_7745c5c3_Err | ||
| 2663 | } | 2650 | } | ||
| 2664 | - | var templ_7745c5c3_Var125 string | 2651 | + | var templ_7745c5c3_Var124 string |
| 2665 | - | templ_7745c5c3_Var125, templ_7745c5c3_Err = templ.JoinStringErrs(m.Label) | 2652 | + | templ_7745c5c3_Var124, templ_7745c5c3_Err = templ.JoinStringErrs(m.Label) |
| 2666 | if templ_7745c5c3_Err != nil { | 2653 | if templ_7745c5c3_Err != nil { | ||
| 2667 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 530, Col: 17} | 2654 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 527, Col: 17} |
| 2668 | } | 2655 | } | ||
| 2669 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var125)) | 2656 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var124)) |
| 2670 | if templ_7745c5c3_Err != nil { | 2657 | if templ_7745c5c3_Err != nil { | ||
| 2671 | return templ_7745c5c3_Err | 2658 | return templ_7745c5c3_Err | ||
| 2672 | } | 2659 | } | ||
| 2673 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 250, " ") | 2660 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 249, " ") |
| 2674 | if templ_7745c5c3_Err != nil { | 2661 | if templ_7745c5c3_Err != nil { | ||
| 2675 | return templ_7745c5c3_Err | 2662 | return templ_7745c5c3_Err | ||
| 2676 | } | 2663 | } | ||
| 2677 | if i < 9 { | 2664 | if i < 9 { | ||
| 2678 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 251, "<kbd aria-hidden=\"true\">") | 2665 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 250, "<kbd aria-hidden=\"true\">") |
| 2679 | if templ_7745c5c3_Err != nil { | 2666 | if templ_7745c5c3_Err != nil { | ||
| 2680 | return templ_7745c5c3_Err | 2667 | return templ_7745c5c3_Err | ||
| 2681 | } | 2668 | } | ||
| 2682 | - | var templ_7745c5c3_Var126 string | 2669 | + | var templ_7745c5c3_Var125 string |
| 2683 | - | templ_7745c5c3_Var126, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(i + 1)) | 2670 | + | templ_7745c5c3_Var125, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(i + 1)) |
| 2684 | if templ_7745c5c3_Err != nil { | 2671 | if templ_7745c5c3_Err != nil { | ||
| 2685 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 532, Col: 46} | 2672 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 529, Col: 46} |
| 2686 | } | 2673 | } | ||
| 2687 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var126)) | 2674 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var125)) |
| 2688 | if templ_7745c5c3_Err != nil { | 2675 | if templ_7745c5c3_Err != nil { | ||
| 2689 | return templ_7745c5c3_Err | 2676 | return templ_7745c5c3_Err | ||
| 2690 | } | 2677 | } | ||
| 2691 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 252, "</kbd>") | 2678 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 251, "</kbd>") |
| 2692 | if templ_7745c5c3_Err != nil { | 2679 | if templ_7745c5c3_Err != nil { | ||
| 2693 | return templ_7745c5c3_Err | 2680 | return templ_7745c5c3_Err | ||
| 2694 | } | 2681 | } | ||
| 2695 | } | 2682 | } | ||
| 2696 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 253, "</label>") | 2683 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 252, "</label>") |
| 2697 | if templ_7745c5c3_Err != nil { | 2684 | if templ_7745c5c3_Err != nil { | ||
| 2698 | return templ_7745c5c3_Err | 2685 | return templ_7745c5c3_Err | ||
| 2699 | } | 2686 | } | ||
| 2700 | } | 2687 | } | ||
| 2701 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 254, "</fieldset>") | 2688 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 253, "</fieldset>") |
| 2702 | if templ_7745c5c3_Err != nil { | 2689 | if templ_7745c5c3_Err != nil { | ||
| 2703 | return templ_7745c5c3_Err | 2690 | return templ_7745c5c3_Err | ||
| 2704 | } | 2691 | } | ||
| 2705 | if p.Box.CanDeleteBranch { | 2692 | if p.Box.CanDeleteBranch { | ||
| 2706 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 255, "<label class=\"d-check\"><input type=\"checkbox\" name=\"delete_branch\" value=\"1\"> delete ") | 2693 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 254, "<label class=\"d-check\"><input type=\"checkbox\" name=\"delete_branch\" value=\"1\"> delete ") |
| 2707 | if templ_7745c5c3_Err != nil { | 2694 | if templ_7745c5c3_Err != nil { | ||
| 2708 | return templ_7745c5c3_Err | 2695 | return templ_7745c5c3_Err | ||
| 2709 | } | 2696 | } | ||
| 2710 | - | var templ_7745c5c3_Var127 string | 2697 | + | var templ_7745c5c3_Var126 string |
| 2711 | - | templ_7745c5c3_Var127, templ_7745c5c3_Err = templ.JoinStringErrs(p.Source) | 2698 | + | templ_7745c5c3_Var126, templ_7745c5c3_Err = templ.JoinStringErrs(p.Source) |
| 2712 | if templ_7745c5c3_Err != nil { | 2699 | if templ_7745c5c3_Err != nil { | ||
| 2713 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 538, Col: 102} | 2700 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 535, Col: 102} |
| 2714 | } | 2701 | } | ||
| 2715 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var127)) | 2702 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var126)) |
| 2716 | if templ_7745c5c3_Err != nil { | 2703 | if templ_7745c5c3_Err != nil { | ||
| 2717 | return templ_7745c5c3_Err | 2704 | return templ_7745c5c3_Err | ||
| 2718 | } | 2705 | } | ||
| 2719 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 256, " after the merge <kbd aria-hidden=\"true\">D</kbd></label>") | 2706 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 255, " after the merge <kbd aria-hidden=\"true\">D</kbd></label>") |
| 2720 | if templ_7745c5c3_Err != nil { | 2707 | if templ_7745c5c3_Err != nil { | ||
| 2721 | return templ_7745c5c3_Err | 2708 | return templ_7745c5c3_Err | ||
| 2722 | } | 2709 | } | ||
| 2723 | } | 2710 | } | ||
| 2724 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 257, "<div class=\"d-btns\"><button type=\"submit\" class=\"btn primary\" data-default") | 2711 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 256, "<div class=\"d-btns\"><button type=\"submit\" class=\"btn primary\" data-default") |
| 2725 | if templ_7745c5c3_Err != nil { | 2712 | if templ_7745c5c3_Err != nil { | ||
| 2726 | return templ_7745c5c3_Err | 2713 | return templ_7745c5c3_Err | ||
| 2727 | } | 2714 | } | ||
| 2728 | if !p.Box.CanMerge() { | 2715 | if !p.Box.CanMerge() { | ||
| 2729 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 258, " disabled") | 2716 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 257, " disabled") |
| 2730 | if templ_7745c5c3_Err != nil { | 2717 | if templ_7745c5c3_Err != nil { | ||
| 2731 | return templ_7745c5c3_Err | 2718 | return templ_7745c5c3_Err | ||
| 2732 | } | 2719 | } | ||
| 2733 | } | 2720 | } | ||
| 2734 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 259, " title=\"") | 2721 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 258, " title=\"") |
| 2735 | if templ_7745c5c3_Err != nil { | 2722 | if templ_7745c5c3_Err != nil { | ||
| 2736 | return templ_7745c5c3_Err | 2723 | return templ_7745c5c3_Err | ||
| 2737 | } | 2724 | } | ||
| 2738 | - | var templ_7745c5c3_Var128 string | 2725 | + | var templ_7745c5c3_Var127 string |
| 2739 | - | templ_7745c5c3_Var128, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Box.MergeTitle()) | 2726 | + | templ_7745c5c3_Var127, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Box.MergeTitle()) |
| 2740 | if templ_7745c5c3_Err != nil { | 2727 | if templ_7745c5c3_Err != nil { | ||
| 2741 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 546, Col: 33} | 2728 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 543, Col: 33} |
| 2742 | } | 2729 | } | ||
| 2743 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var128) | 2730 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var127) |
| 2744 | if templ_7745c5c3_Err != nil { | 2731 | if templ_7745c5c3_Err != nil { | ||
| 2745 | return templ_7745c5c3_Err | 2732 | return templ_7745c5c3_Err | ||
| 2746 | } | 2733 | } | ||
| 2747 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 260, "\" :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, 259, "\" :disabled=\"!this.form.querySelector('input[name=mode]:checked:not(:disabled)')\" :title=\"(this.form.querySelector('input[name=mode]:checked') || {}).title || ''\">Merge into ") |
| 2748 | if templ_7745c5c3_Err != nil { | 2735 | if templ_7745c5c3_Err != nil { | ||
| 2749 | return templ_7745c5c3_Err | 2736 | return templ_7745c5c3_Err | ||
| 2750 | } | 2737 | } | ||
| 2751 | - | var templ_7745c5c3_Var129 string | 2738 | + | var templ_7745c5c3_Var128 string |
| 2752 | - | templ_7745c5c3_Var129, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | 2739 | + | templ_7745c5c3_Var128, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) |
| 2753 | if templ_7745c5c3_Err != nil { | 2740 | if templ_7745c5c3_Err != nil { | ||
| 2754 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 549, Col: 28} | 2741 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 546, Col: 28} |
| 2755 | } | 2742 | } | ||
| 2756 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var129)) | 2743 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var128)) |
| 2757 | if templ_7745c5c3_Err != nil { | 2744 | if templ_7745c5c3_Err != nil { | ||
| 2758 | return templ_7745c5c3_Err | 2745 | return templ_7745c5c3_Err | ||
| 2759 | } | 2746 | } | ||
| 2760 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 261, "</button></div></form>") | 2747 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 260, "</button></div></form>") |
| 2761 | if templ_7745c5c3_Err != nil { | 2748 | if templ_7745c5c3_Err != nil { | ||
| 2762 | return templ_7745c5c3_Err | 2749 | return templ_7745c5c3_Err | ||
| 2763 | } | 2750 | } | ||
| 2764 | } | 2751 | } | ||
| 2765 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 262, "</div></details>") | 2752 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 261, "</div></details>") |
| 2766 | if templ_7745c5c3_Err != nil { | 2753 | if templ_7745c5c3_Err != nil { | ||
| 2767 | return templ_7745c5c3_Err | 2754 | return templ_7745c5c3_Err | ||
| 2768 | } | 2755 | } | ||
| @@ -2788,182 +2775,182 @@ func MRMergeability(v MergeabilityView) templ.Component { | |||||
| 2788 | }() | 2775 | }() | ||
| 2789 | } | 2776 | } | ||
| 2790 | ctx = templ.InitializeContext(ctx) | 2777 | ctx = templ.InitializeContext(ctx) | ||
| 2791 | - | templ_7745c5c3_Var130 := templ.GetChildren(ctx) | 2778 | + | templ_7745c5c3_Var129 := templ.GetChildren(ctx) |
| 2792 | - | if templ_7745c5c3_Var130 == nil { | 2779 | + | if templ_7745c5c3_Var129 == nil { |
| 2793 | - | templ_7745c5c3_Var130 = templ.NopComponent | 2780 | + | templ_7745c5c3_Var129 = templ.NopComponent |
| 2794 | } | 2781 | } | ||
| 2795 | ctx = templ.ClearChildren(ctx) | 2782 | ctx = templ.ClearChildren(ctx) | ||
| 2796 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 263, "<span data-mergeability data-state=\"") | 2783 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 262, "<span data-mergeability data-state=\"") |
| 2784 | + | if templ_7745c5c3_Err != nil { | |||
| 2785 | + | return templ_7745c5c3_Err | |||
| 2786 | + | } | |||
| 2787 | + | var templ_7745c5c3_Var130 string | |||
| 2788 | + | templ_7745c5c3_Var130, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.State) | |||
| 2789 | + | if templ_7745c5c3_Err != nil { | |||
| 2790 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 559, Col: 22} | |||
| 2791 | + | } | |||
| 2792 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var130) | |||
| 2793 | + | if templ_7745c5c3_Err != nil { | |||
| 2794 | + | return templ_7745c5c3_Err | |||
| 2795 | + | } | |||
| 2796 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 263, "\" data-ff-ok=\"") | |||
| 2797 | if templ_7745c5c3_Err != nil { | 2797 | if templ_7745c5c3_Err != nil { | ||
| 2798 | return templ_7745c5c3_Err | 2798 | return templ_7745c5c3_Err | ||
| 2799 | } | 2799 | } | ||
| 2800 | var templ_7745c5c3_Var131 string | 2800 | var templ_7745c5c3_Var131 string | ||
| 2801 | - | templ_7745c5c3_Var131, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.State) | 2801 | + | templ_7745c5c3_Var131, templ_7745c5c3_Err = templ.ResolveAttributeValue(strconv.FormatBool(v.FFOk)) |
| 2802 | if templ_7745c5c3_Err != nil { | 2802 | if templ_7745c5c3_Err != nil { | ||
| 2803 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 562, Col: 22} | 2803 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 560, Col: 41} |
| 2804 | } | 2804 | } | ||
| 2805 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var131) | 2805 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var131) | ||
| 2806 | if templ_7745c5c3_Err != nil { | 2806 | if templ_7745c5c3_Err != nil { | ||
| 2807 | return templ_7745c5c3_Err | 2807 | return templ_7745c5c3_Err | ||
| 2808 | } | 2808 | } | ||
| 2809 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 264, "\" data-ff-ok=\"") | 2809 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 264, "\" data-merge-ok=\"") |
| 2810 | if templ_7745c5c3_Err != nil { | 2810 | if templ_7745c5c3_Err != nil { | ||
| 2811 | return templ_7745c5c3_Err | 2811 | return templ_7745c5c3_Err | ||
| 2812 | } | 2812 | } | ||
| 2813 | var templ_7745c5c3_Var132 string | 2813 | var templ_7745c5c3_Var132 string | ||
| 2814 | - | templ_7745c5c3_Var132, templ_7745c5c3_Err = templ.ResolveAttributeValue(strconv.FormatBool(v.FFOk)) | 2814 | + | templ_7745c5c3_Var132, templ_7745c5c3_Err = templ.ResolveAttributeValue(strconv.FormatBool(v.MergeOk)) |
| 2815 | if templ_7745c5c3_Err != nil { | 2815 | if templ_7745c5c3_Err != nil { | ||
| 2816 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 563, Col: 41} | 2816 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 561, Col: 47} |
| 2817 | } | 2817 | } | ||
| 2818 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var132) | 2818 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var132) | ||
| 2819 | if templ_7745c5c3_Err != nil { | 2819 | if templ_7745c5c3_Err != nil { | ||
| 2820 | return templ_7745c5c3_Err | 2820 | return templ_7745c5c3_Err | ||
| 2821 | } | 2821 | } | ||
| 2822 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 265, "\" data-merge-ok=\"") | 2822 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 265, "\" data-ff-reason=\"") |
| 2823 | if templ_7745c5c3_Err != nil { | 2823 | if templ_7745c5c3_Err != nil { | ||
| 2824 | return templ_7745c5c3_Err | 2824 | return templ_7745c5c3_Err | ||
| 2825 | } | 2825 | } | ||
| 2826 | var templ_7745c5c3_Var133 string | 2826 | var templ_7745c5c3_Var133 string | ||
| 2827 | - | templ_7745c5c3_Var133, templ_7745c5c3_Err = templ.ResolveAttributeValue(strconv.FormatBool(v.MergeOk)) | 2827 | + | templ_7745c5c3_Var133, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.FFReason) |
| 2828 | if templ_7745c5c3_Err != nil { | 2828 | if templ_7745c5c3_Err != nil { | ||
| 2829 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 564, Col: 47} | 2829 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 562, Col: 29} |
| 2830 | } | 2830 | } | ||
| 2831 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var133) | 2831 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var133) | ||
| 2832 | if templ_7745c5c3_Err != nil { | 2832 | if templ_7745c5c3_Err != nil { | ||
| 2833 | return templ_7745c5c3_Err | 2833 | return templ_7745c5c3_Err | ||
| 2834 | } | 2834 | } | ||
| 2835 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 266, "\" data-ff-reason=\"") | 2835 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 266, "\" data-merge-reason=\"") |
| 2836 | if templ_7745c5c3_Err != nil { | 2836 | if templ_7745c5c3_Err != nil { | ||
| 2837 | return templ_7745c5c3_Err | 2837 | return templ_7745c5c3_Err | ||
| 2838 | } | 2838 | } | ||
| 2839 | var templ_7745c5c3_Var134 string | 2839 | var templ_7745c5c3_Var134 string | ||
| 2840 | - | templ_7745c5c3_Var134, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.FFReason) | 2840 | + | templ_7745c5c3_Var134, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.MergeReason) |
| 2841 | if templ_7745c5c3_Err != nil { | 2841 | if templ_7745c5c3_Err != nil { | ||
| 2842 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 565, Col: 29} | 2842 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 563, Col: 35} |
| 2843 | } | 2843 | } | ||
| 2844 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var134) | 2844 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var134) | ||
| 2845 | if templ_7745c5c3_Err != nil { | 2845 | if templ_7745c5c3_Err != nil { | ||
| 2846 | return templ_7745c5c3_Err | 2846 | return templ_7745c5c3_Err | ||
| 2847 | } | 2847 | } | ||
| 2848 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 267, "\" data-merge-reason=\"") | 2848 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 267, "\"><span class=\"badge\" data-state=\"") |
| 2849 | if templ_7745c5c3_Err != nil { | 2849 | if templ_7745c5c3_Err != nil { | ||
| 2850 | return templ_7745c5c3_Err | 2850 | return templ_7745c5c3_Err | ||
| 2851 | } | 2851 | } | ||
| 2852 | var templ_7745c5c3_Var135 string | 2852 | var templ_7745c5c3_Var135 string | ||
| 2853 | - | templ_7745c5c3_Var135, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.MergeReason) | 2853 | + | templ_7745c5c3_Var135, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.State) |
| 2854 | if templ_7745c5c3_Err != nil { | 2854 | if templ_7745c5c3_Err != nil { | ||
| 2855 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 566, Col: 35} | 2855 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 565, Col: 42} |
| 2856 | } | 2856 | } | ||
| 2857 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var135) | 2857 | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var135) | ||
| 2858 | if templ_7745c5c3_Err != nil { | 2858 | if templ_7745c5c3_Err != nil { | ||
| 2859 | return templ_7745c5c3_Err | 2859 | return templ_7745c5c3_Err | ||
| 2860 | } | 2860 | } | ||
| 2861 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 268, "\"><span class=\"badge\" data-state=\"") | 2861 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 268, "\">") |
| 2862 | if templ_7745c5c3_Err != nil { | 2862 | if templ_7745c5c3_Err != nil { | ||
| 2863 | return templ_7745c5c3_Err | 2863 | return templ_7745c5c3_Err | ||
| 2864 | } | 2864 | } | ||
| 2865 | var templ_7745c5c3_Var136 string | 2865 | var templ_7745c5c3_Var136 string | ||
| 2866 | - | templ_7745c5c3_Var136, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.State) | 2866 | + | templ_7745c5c3_Var136, templ_7745c5c3_Err = templ.JoinStringErrs(v.Label) |
| 2867 | - | if templ_7745c5c3_Err != nil { | |||
| 2868 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 568, Col: 42} | |||
| 2869 | - | } | |||
| 2870 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var136) | |||
| 2871 | - | if templ_7745c5c3_Err != nil { | |||
| 2872 | - | return templ_7745c5c3_Err | |||
| 2873 | - | } | |||
| 2874 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 269, "\">") | |||
| 2875 | if templ_7745c5c3_Err != nil { | 2867 | if templ_7745c5c3_Err != nil { | ||
| 2876 | - | return templ_7745c5c3_Err | 2868 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 565, Col: 54} |
| 2877 | } | 2869 | } | ||
| 2878 | - | var templ_7745c5c3_Var137 string | 2870 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var136)) |
| 2879 | - | templ_7745c5c3_Var137, templ_7745c5c3_Err = templ.JoinStringErrs(v.Label) | |||
| 2880 | - | if templ_7745c5c3_Err != nil { | |||
| 2881 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 568, Col: 54} | |||
| 2882 | - | } | |||
| 2883 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var137)) | |||
| 2884 | if templ_7745c5c3_Err != nil { | 2871 | if templ_7745c5c3_Err != nil { | ||
| 2885 | return templ_7745c5c3_Err | 2872 | return templ_7745c5c3_Err | ||
| 2886 | } | 2873 | } | ||
| 2887 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 270, "</span> ") | 2874 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 269, "</span> ") |
| 2888 | if templ_7745c5c3_Err != nil { | 2875 | if templ_7745c5c3_Err != nil { | ||
| 2889 | return templ_7745c5c3_Err | 2876 | return templ_7745c5c3_Err | ||
| 2890 | } | 2877 | } | ||
| 2891 | if v.Detail != "" { | 2878 | if v.Detail != "" { | ||
| 2892 | - | var templ_7745c5c3_Var138 string | 2879 | + | var templ_7745c5c3_Var137 string |
| 2893 | - | templ_7745c5c3_Var138, templ_7745c5c3_Err = templ.JoinStringErrs(" ") | 2880 | + | templ_7745c5c3_Var137, templ_7745c5c3_Err = templ.JoinStringErrs(" ") |
| 2894 | if templ_7745c5c3_Err != nil { | 2881 | if templ_7745c5c3_Err != nil { | ||
| 2895 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 570, Col: 8} | 2882 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 567, Col: 8} |
| 2896 | } | 2883 | } | ||
| 2897 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var138)) | 2884 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var137)) |
| 2898 | if templ_7745c5c3_Err != nil { | 2885 | if templ_7745c5c3_Err != nil { | ||
| 2899 | return templ_7745c5c3_Err | 2886 | return templ_7745c5c3_Err | ||
| 2900 | } | 2887 | } | ||
| 2901 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 271, "<span class=\"dim\">") | 2888 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 270, "<span class=\"dim\">") |
| 2902 | if templ_7745c5c3_Err != nil { | 2889 | if templ_7745c5c3_Err != nil { | ||
| 2903 | return templ_7745c5c3_Err | 2890 | return templ_7745c5c3_Err | ||
| 2904 | } | 2891 | } | ||
| 2905 | - | var templ_7745c5c3_Var139 string | 2892 | + | var templ_7745c5c3_Var138 string |
| 2906 | - | templ_7745c5c3_Var139, templ_7745c5c3_Err = templ.JoinStringErrs(v.Detail) | 2893 | + | templ_7745c5c3_Var138, templ_7745c5c3_Err = templ.JoinStringErrs(v.Detail) |
| 2907 | if templ_7745c5c3_Err != nil { | 2894 | if templ_7745c5c3_Err != nil { | ||
| 2908 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 570, Col: 38} | 2895 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 567, Col: 38} |
| 2909 | } | 2896 | } | ||
| 2910 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var139)) | 2897 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var138)) |
| 2911 | if templ_7745c5c3_Err != nil { | 2898 | if templ_7745c5c3_Err != nil { | ||
| 2912 | return templ_7745c5c3_Err | 2899 | return templ_7745c5c3_Err | ||
| 2913 | } | 2900 | } | ||
| 2914 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 272, "</span>") | 2901 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 271, "</span>") |
| 2915 | if templ_7745c5c3_Err != nil { | 2902 | if templ_7745c5c3_Err != nil { | ||
| 2916 | return templ_7745c5c3_Err | 2903 | return templ_7745c5c3_Err | ||
| 2917 | } | 2904 | } | ||
| 2918 | } | 2905 | } | ||
| 2919 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 273, "</span> ") | 2906 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 272, "</span> ") |
| 2920 | if templ_7745c5c3_Err != nil { | 2907 | if templ_7745c5c3_Err != nil { | ||
| 2921 | return templ_7745c5c3_Err | 2908 | return templ_7745c5c3_Err | ||
| 2922 | } | 2909 | } | ||
| 2923 | if len(v.Paths) > 0 { | 2910 | if len(v.Paths) > 0 { | ||
| 2924 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 274, "<ul class=\"mg-paths\" aria-label=\"conflicting files\">") | 2911 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 273, "<ul class=\"mg-paths\" aria-label=\"conflicting files\">") |
| 2925 | if templ_7745c5c3_Err != nil { | 2912 | if templ_7745c5c3_Err != nil { | ||
| 2926 | return templ_7745c5c3_Err | 2913 | return templ_7745c5c3_Err | ||
| 2927 | } | 2914 | } | ||
| 2928 | for _, path := range v.Paths { | 2915 | for _, path := range v.Paths { | ||
| 2929 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 275, "<li><code>") | 2916 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 274, "<li><code>") |
| 2930 | if templ_7745c5c3_Err != nil { | 2917 | if templ_7745c5c3_Err != nil { | ||
| 2931 | return templ_7745c5c3_Err | 2918 | return templ_7745c5c3_Err | ||
| 2932 | } | 2919 | } | ||
| 2933 | - | var templ_7745c5c3_Var140 string | 2920 | + | var templ_7745c5c3_Var139 string |
| 2934 | - | templ_7745c5c3_Var140, templ_7745c5c3_Err = templ.JoinStringErrs(path) | 2921 | + | templ_7745c5c3_Var139, templ_7745c5c3_Err = templ.JoinStringErrs(path) |
| 2935 | if templ_7745c5c3_Err != nil { | 2922 | if templ_7745c5c3_Err != nil { | ||
| 2936 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 576, Col: 20} | 2923 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 573, Col: 20} |
| 2937 | } | 2924 | } | ||
| 2938 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var140)) | 2925 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var139)) |
| 2939 | if templ_7745c5c3_Err != nil { | 2926 | if templ_7745c5c3_Err != nil { | ||
| 2940 | return templ_7745c5c3_Err | 2927 | return templ_7745c5c3_Err | ||
| 2941 | } | 2928 | } | ||
| 2942 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 276, "</code></li>") | 2929 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 275, "</code></li>") |
| 2943 | if templ_7745c5c3_Err != nil { | 2930 | if templ_7745c5c3_Err != nil { | ||
| 2944 | return templ_7745c5c3_Err | 2931 | return templ_7745c5c3_Err | ||
| 2945 | } | 2932 | } | ||
| 2946 | } | 2933 | } | ||
| 2947 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 277, "</ul>") | 2934 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 276, "</ul>") |
| 2948 | if templ_7745c5c3_Err != nil { | 2935 | if templ_7745c5c3_Err != nil { | ||
| 2949 | return templ_7745c5c3_Err | 2936 | return templ_7745c5c3_Err | ||
| 2950 | } | 2937 | } | ||
| 2951 | } | 2938 | } | ||
| 2952 | if v.PathsNote != "" { | 2939 | if v.PathsNote != "" { | ||
| 2953 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 278, "<p class=\"dim\">") | 2940 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 277, "<p class=\"dim\">") |
| 2954 | if templ_7745c5c3_Err != nil { | 2941 | if templ_7745c5c3_Err != nil { | ||
| 2955 | return templ_7745c5c3_Err | 2942 | return templ_7745c5c3_Err | ||
| 2956 | } | 2943 | } | ||
| 2957 | - | var templ_7745c5c3_Var141 string | 2944 | + | var templ_7745c5c3_Var140 string |
| 2958 | - | templ_7745c5c3_Var141, templ_7745c5c3_Err = templ.JoinStringErrs(v.PathsNote) | 2945 | + | templ_7745c5c3_Var140, templ_7745c5c3_Err = templ.JoinStringErrs(v.PathsNote) |
| 2959 | if templ_7745c5c3_Err != nil { | 2946 | if templ_7745c5c3_Err != nil { | ||
| 2960 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 581, Col: 30} | 2947 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 578, Col: 30} |
| 2961 | } | 2948 | } | ||
| 2962 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var141)) | 2949 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var140)) |
| 2963 | if templ_7745c5c3_Err != nil { | 2950 | if templ_7745c5c3_Err != nil { | ||
| 2964 | return templ_7745c5c3_Err | 2951 | return templ_7745c5c3_Err | ||
| 2965 | } | 2952 | } | ||
| 2966 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 279, "</p>") | 2953 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 278, "</p>") |
| 2967 | if templ_7745c5c3_Err != nil { | 2954 | if templ_7745c5c3_Err != nil { | ||
| 2968 | return templ_7745c5c3_Err | 2955 | return templ_7745c5c3_Err | ||
| 2969 | } | 2956 | } | ||
| @@ -2990,12 +2977,12 @@ func mrMergeabilitySlot(v MergeabilityView) templ.Component { | |||||
| 2990 | }() | 2977 | }() | ||
| 2991 | } | 2978 | } | ||
| 2992 | ctx = templ.InitializeContext(ctx) | 2979 | ctx = templ.InitializeContext(ctx) | ||
| 2993 | - | templ_7745c5c3_Var142 := templ.GetChildren(ctx) | 2980 | + | templ_7745c5c3_Var141 := templ.GetChildren(ctx) |
| 2994 | - | if templ_7745c5c3_Var142 == nil { | 2981 | + | if templ_7745c5c3_Var141 == nil { |
| 2995 | - | templ_7745c5c3_Var142 = templ.NopComponent | 2982 | + | templ_7745c5c3_Var141 = templ.NopComponent |
| 2996 | } | 2983 | } | ||
| 2997 | ctx = templ.ClearChildren(ctx) | 2984 | ctx = templ.ClearChildren(ctx) | ||
| 2998 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 280, "<div id=\"mr-mergeability\" class=\"live-slot\" role=\"status\" data-slot>") | 2985 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 279, "<div id=\"mr-mergeability\" class=\"live-slot\" role=\"status\" data-slot>") |
| 2999 | if templ_7745c5c3_Err != nil { | 2986 | if templ_7745c5c3_Err != nil { | ||
| 3000 | return templ_7745c5c3_Err | 2987 | return templ_7745c5c3_Err | ||
| 3001 | } | 2988 | } | ||
| @@ -3003,7 +2990,7 @@ func mrMergeabilitySlot(v MergeabilityView) templ.Component { | |||||
| 3003 | if templ_7745c5c3_Err != nil { | 2990 | if templ_7745c5c3_Err != nil { | ||
| 3004 | return templ_7745c5c3_Err | 2991 | return templ_7745c5c3_Err | ||
| 3005 | } | 2992 | } | ||
| 3006 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 281, "</div>") | 2993 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 280, "</div>") |
| 3007 | if templ_7745c5c3_Err != nil { | 2994 | if templ_7745c5c3_Err != nil { | ||
| 3008 | return templ_7745c5c3_Err | 2995 | return templ_7745c5c3_Err | ||
| 3009 | } | 2996 | } | ||
| @@ -3028,9 +3015,9 @@ func MRMergeabilityFragment(v MergeabilityView) templ.Component { | |||||
| 3028 | }() | 3015 | }() | ||
| 3029 | } | 3016 | } | ||
| 3030 | ctx = templ.InitializeContext(ctx) | 3017 | ctx = templ.InitializeContext(ctx) | ||
| 3031 | - | templ_7745c5c3_Var143 := templ.GetChildren(ctx) | 3018 | + | templ_7745c5c3_Var142 := templ.GetChildren(ctx) |
| 3032 | - | if templ_7745c5c3_Var143 == nil { | 3019 | + | if templ_7745c5c3_Var142 == nil { |
| 3033 | - | templ_7745c5c3_Var143 = templ.NopComponent | 3020 | + | templ_7745c5c3_Var142 = templ.NopComponent |
| 3034 | } | 3021 | } | ||
| 3035 | ctx = templ.ClearChildren(ctx) | 3022 | ctx = templ.ClearChildren(ctx) | ||
| 3036 | templ_7745c5c3_Err = mrMergeabilitySlot(v).Render(ctx, templ_7745c5c3_Buffer) | 3023 | templ_7745c5c3_Err = mrMergeabilitySlot(v).Render(ctx, templ_7745c5c3_Buffer) | ||
| @@ -3059,128 +3046,128 @@ func moreMenu(p MRPage) templ.Component { | |||||
| 3059 | }() | 3046 | }() | ||
| 3060 | } | 3047 | } | ||
| 3061 | ctx = templ.InitializeContext(ctx) | 3048 | ctx = templ.InitializeContext(ctx) | ||
| 3062 | - | templ_7745c5c3_Var144 := templ.GetChildren(ctx) | 3049 | + | templ_7745c5c3_Var143 := templ.GetChildren(ctx) |
| 3063 | - | if templ_7745c5c3_Var144 == nil { | 3050 | + | if templ_7745c5c3_Var143 == nil { |
| 3064 | - | templ_7745c5c3_Var144 = templ.NopComponent | 3051 | + | templ_7745c5c3_Var143 = templ.NopComponent |
| 3065 | } | 3052 | } | ||
| 3066 | ctx = templ.ClearChildren(ctx) | 3053 | ctx = templ.ClearChildren(ctx) | ||
| 3067 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 282, "<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>") | 3054 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 281, "<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>") |
| 3068 | if templ_7745c5c3_Err != nil { | 3055 | if templ_7745c5c3_Err != nil { | ||
| 3069 | return templ_7745c5c3_Err | 3056 | return templ_7745c5c3_Err | ||
| 3070 | } | 3057 | } | ||
| 3071 | - | var templ_7745c5c3_Var145 string | 3058 | + | var templ_7745c5c3_Var144 string |
| 3072 | - | templ_7745c5c3_Var145, templ_7745c5c3_Err = templ.JoinStringErrs(strings.Join(p.Modes, ", ")) | 3059 | + | templ_7745c5c3_Var144, templ_7745c5c3_Err = templ.JoinStringErrs(strings.Join(p.Modes, ", ")) |
| 3073 | if templ_7745c5c3_Err != nil { | 3060 | if templ_7745c5c3_Err != nil { | ||
| 3074 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 608, Col: 38} | 3061 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 605, Col: 38} |
| 3075 | } | 3062 | } | ||
| 3076 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var145)) | 3063 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var144)) |
| 3077 | if templ_7745c5c3_Err != nil { | 3064 | if templ_7745c5c3_Err != nil { | ||
| 3078 | return templ_7745c5c3_Err | 3065 | return templ_7745c5c3_Err | ||
| 3079 | } | 3066 | } | ||
| 3080 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 283, "</dd><dt>checks</dt><dd>") | 3067 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 282, "</dd><dt>checks</dt><dd>") |
| 3081 | if templ_7745c5c3_Err != nil { | 3068 | if templ_7745c5c3_Err != nil { | ||
| 3082 | return templ_7745c5c3_Err | 3069 | return templ_7745c5c3_Err | ||
| 3083 | } | 3070 | } | ||
| 3084 | if p.ChecksBlock { | 3071 | if p.ChecksBlock { | ||
| 3085 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 284, "failing ones block the merge") | 3072 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 283, "failing ones block the merge") |
| 3086 | if templ_7745c5c3_Err != nil { | 3073 | if templ_7745c5c3_Err != nil { | ||
| 3087 | return templ_7745c5c3_Err | 3074 | return templ_7745c5c3_Err | ||
| 3088 | } | 3075 | } | ||
| 3089 | } else { | 3076 | } else { | ||
| 3090 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 285, "do not block the merge") | 3077 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 284, "do not block the merge") |
| 3091 | if templ_7745c5c3_Err != nil { | 3078 | if templ_7745c5c3_Err != nil { | ||
| 3092 | return templ_7745c5c3_Err | 3079 | return templ_7745c5c3_Err | ||
| 3093 | } | 3080 | } | ||
| 3094 | } | 3081 | } | ||
| 3095 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 286, "</dd></dl></section>") | 3082 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 285, "</dd></dl></section>") |
| 3096 | if templ_7745c5c3_Err != nil { | 3083 | if templ_7745c5c3_Err != nil { | ||
| 3097 | return templ_7745c5c3_Err | 3084 | return templ_7745c5c3_Err | ||
| 3098 | } | 3085 | } | ||
| 3099 | if p.Box != nil { | 3086 | if p.Box != nil { | ||
| 3100 | if p.Box.Signed { | 3087 | if p.Box.Signed { | ||
| 3101 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 287, "<p class=\"d-note\" id=\"mr-signing\">squash and merge commits are signed with ermite's own key (generated on first start). ") | 3088 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 286, "<p class=\"d-note\" id=\"mr-signing\">squash and merge commits are signed with ermite's own key (generated on first start). ") |
| 3102 | if templ_7745c5c3_Err != nil { | 3089 | if templ_7745c5c3_Err != nil { | ||
| 3103 | return templ_7745c5c3_Err | 3090 | return templ_7745c5c3_Err | ||
| 3104 | } | 3091 | } | ||
| 3105 | if p.Box.Fingerprint != "" { | 3092 | if p.Box.Fingerprint != "" { | ||
| 3106 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 288, "fingerprint <code>") | 3093 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 287, "fingerprint <code>") |
| 3107 | if templ_7745c5c3_Err != nil { | 3094 | if templ_7745c5c3_Err != nil { | ||
| 3108 | return templ_7745c5c3_Err | 3095 | return templ_7745c5c3_Err | ||
| 3109 | } | 3096 | } | ||
| 3110 | - | var templ_7745c5c3_Var146 string | 3097 | + | var templ_7745c5c3_Var145 string |
| 3111 | - | templ_7745c5c3_Var146, templ_7745c5c3_Err = templ.JoinStringErrs(p.Box.Fingerprint) | 3098 | + | templ_7745c5c3_Var145, templ_7745c5c3_Err = templ.JoinStringErrs(p.Box.Fingerprint) |
| 3112 | if templ_7745c5c3_Err != nil { | 3099 | if templ_7745c5c3_Err != nil { | ||
| 3113 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 624, Col: 44} | 3100 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 621, Col: 44} |
| 3114 | } | 3101 | } | ||
| 3115 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var146)) | 3102 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var145)) |
| 3116 | if templ_7745c5c3_Err != nil { | 3103 | if templ_7745c5c3_Err != nil { | ||
| 3117 | return templ_7745c5c3_Err | 3104 | return templ_7745c5c3_Err | ||
| 3118 | } | 3105 | } | ||
| 3119 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 289, "</code> ") | 3106 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 288, "</code> ") |
| 3120 | if templ_7745c5c3_Err != nil { | 3107 | if templ_7745c5c3_Err != nil { | ||
| 3121 | return templ_7745c5c3_Err | 3108 | return templ_7745c5c3_Err | ||
| 3122 | } | 3109 | } | ||
| 3123 | } | 3110 | } | ||
| 3124 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 290, "<code>ermite signing-key show</code> prints it.</p>") | 3111 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 289, "<code>ermite signing-key show</code> prints it.</p>") |
| 3125 | if templ_7745c5c3_Err != nil { | 3112 | if templ_7745c5c3_Err != nil { | ||
| 3126 | return templ_7745c5c3_Err | 3113 | return templ_7745c5c3_Err | ||
| 3127 | } | 3114 | } | ||
| 3128 | } | 3115 | } | ||
| 3129 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 291, " ") | 3116 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 290, " ") |
| 3130 | if templ_7745c5c3_Err != nil { | 3117 | if templ_7745c5c3_Err != nil { | ||
| 3131 | return templ_7745c5c3_Err | 3118 | return templ_7745c5c3_Err | ||
| 3132 | } | 3119 | } | ||
| 3133 | if p.Box.CanMarkRead { | 3120 | if p.Box.CanMarkRead { | ||
| 3134 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 292, "<form method=\"post\" action=\"") | 3121 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 291, "<form method=\"post\" action=\"") |
| 3135 | if templ_7745c5c3_Err != nil { | 3122 | if templ_7745c5c3_Err != nil { | ||
| 3136 | return templ_7745c5c3_Err | 3123 | return templ_7745c5c3_Err | ||
| 3137 | } | 3124 | } | ||
| 3138 | - | var templ_7745c5c3_Var147 templ.SafeURL | 3125 | + | var templ_7745c5c3_Var146 templ.SafeURL |
| 3139 | - | templ_7745c5c3_Var147, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.ReadAction)) | 3126 | + | templ_7745c5c3_Var146, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.ReadAction)) |
| 3140 | if templ_7745c5c3_Err != nil { | 3127 | if templ_7745c5c3_Err != nil { | ||
| 3141 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 630, Col: 65} | 3128 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 627, Col: 65} |
| 3142 | } | 3129 | } | ||
| 3143 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var147)) | 3130 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var146)) |
| 3144 | if templ_7745c5c3_Err != nil { | 3131 | if templ_7745c5c3_Err != nil { | ||
| 3145 | return templ_7745c5c3_Err | 3132 | return templ_7745c5c3_Err | ||
| 3146 | } | 3133 | } | ||
| 3147 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 293, "\"><input type=\"hidden\" name=\"head_id\" value=\"") | 3134 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 292, "\"><input type=\"hidden\" name=\"head_id\" value=\"") |
| 3148 | if templ_7745c5c3_Err != nil { | 3135 | if templ_7745c5c3_Err != nil { | ||
| 3149 | return templ_7745c5c3_Err | 3136 | return templ_7745c5c3_Err | ||
| 3150 | } | 3137 | } | ||
| 3151 | - | var templ_7745c5c3_Var148 string | 3138 | + | var templ_7745c5c3_Var147 string |
| 3152 | - | templ_7745c5c3_Var148, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Box.Head) | 3139 | + | templ_7745c5c3_Var147, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Box.Head) |
| 3153 | if templ_7745c5c3_Err != nil { | 3140 | if templ_7745c5c3_Err != nil { | ||
| 3154 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 631, Col: 60} | 3141 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 628, Col: 60} |
| 3155 | } | 3142 | } | ||
| 3156 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var148) | 3143 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var147) |
| 3157 | if templ_7745c5c3_Err != nil { | 3144 | if templ_7745c5c3_Err != nil { | ||
| 3158 | return templ_7745c5c3_Err | 3145 | return templ_7745c5c3_Err | ||
| 3159 | } | 3146 | } | ||
| 3160 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 294, "\"> <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>") | 3147 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 293, "\"> <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>") |
| 3161 | if templ_7745c5c3_Err != nil { | 3148 | if templ_7745c5c3_Err != nil { | ||
| 3162 | return templ_7745c5c3_Err | 3149 | return templ_7745c5c3_Err | ||
| 3163 | } | 3150 | } | ||
| 3164 | } | 3151 | } | ||
| 3165 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 295, " <form method=\"post\" action=\"") | 3152 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 294, " <form method=\"post\" action=\"") |
| 3166 | if templ_7745c5c3_Err != nil { | 3153 | if templ_7745c5c3_Err != nil { | ||
| 3167 | return templ_7745c5c3_Err | 3154 | return templ_7745c5c3_Err | ||
| 3168 | } | 3155 | } | ||
| 3169 | - | var templ_7745c5c3_Var149 templ.SafeURL | 3156 | + | var templ_7745c5c3_Var148 templ.SafeURL |
| 3170 | - | templ_7745c5c3_Var149, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.CloseAction)) | 3157 | + | templ_7745c5c3_Var148, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Box.CloseAction)) |
| 3171 | if templ_7745c5c3_Err != nil { | 3158 | if templ_7745c5c3_Err != nil { | ||
| 3172 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 635, Col: 65} | 3159 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 632, Col: 65} |
| 3173 | } | 3160 | } | ||
| 3174 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var149)) | 3161 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var148)) |
| 3175 | if templ_7745c5c3_Err != nil { | 3162 | if templ_7745c5c3_Err != nil { | ||
| 3176 | return templ_7745c5c3_Err | 3163 | return templ_7745c5c3_Err | ||
| 3177 | } | 3164 | } | ||
| 3178 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 296, "\"><button type=\"submit\" title=\"close without merging; the branch is kept\" class=\"btn danger\">Close</button></form>") | 3165 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 295, "\"><button type=\"submit\" title=\"close without merging; the branch is kept\" class=\"btn danger\">Close</button></form>") |
| 3179 | if templ_7745c5c3_Err != nil { | 3166 | if templ_7745c5c3_Err != nil { | ||
| 3180 | return templ_7745c5c3_Err | 3167 | return templ_7745c5c3_Err | ||
| 3181 | } | 3168 | } | ||
| 3182 | if !p.Box.HeadGone && p.Box.ReadyAction == "" { | 3169 | if !p.Box.HeadGone && p.Box.ReadyAction == "" { | ||
| 3183 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 297, "<details class=\"d-or\"><summary class=\"mute\">or from a terminal</summary>") | 3170 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 296, "<details class=\"d-or\"><summary class=\"mute\">or from a terminal</summary>") |
| 3184 | if templ_7745c5c3_Err != nil { | 3171 | if templ_7745c5c3_Err != nil { | ||
| 3185 | return templ_7745c5c3_Err | 3172 | return templ_7745c5c3_Err | ||
| 3186 | } | 3173 | } | ||
| @@ -3188,13 +3175,13 @@ func moreMenu(p MRPage) templ.Component { | |||||
| 3188 | if templ_7745c5c3_Err != nil { | 3175 | if templ_7745c5c3_Err != nil { | ||
| 3189 | return templ_7745c5c3_Err | 3176 | return templ_7745c5c3_Err | ||
| 3190 | } | 3177 | } | ||
| 3191 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 298, "</details>") | 3178 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 297, "</details>") |
| 3192 | if templ_7745c5c3_Err != nil { | 3179 | if templ_7745c5c3_Err != nil { | ||
| 3193 | return templ_7745c5c3_Err | 3180 | return templ_7745c5c3_Err | ||
| 3194 | } | 3181 | } | ||
| 3195 | } | 3182 | } | ||
| 3196 | } | 3183 | } | ||
| 3197 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 299, "</div></details>") | 3184 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 298, "</div></details>") |
| 3198 | if templ_7745c5c3_Err != nil { | 3185 | if templ_7745c5c3_Err != nil { | ||
| 3199 | return templ_7745c5c3_Err | 3186 | return templ_7745c5c3_Err | ||
| 3200 | } | 3187 | } | ||
| @@ -3218,12 +3205,12 @@ func Compare(l Layout, p ComparePage) templ.Component { | |||||
| 3218 | }() | 3205 | }() | ||
| 3219 | } | 3206 | } | ||
| 3220 | ctx = templ.InitializeContext(ctx) | 3207 | ctx = templ.InitializeContext(ctx) | ||
| 3221 | - | templ_7745c5c3_Var150 := templ.GetChildren(ctx) | 3208 | + | templ_7745c5c3_Var149 := templ.GetChildren(ctx) |
| 3222 | - | if templ_7745c5c3_Var150 == nil { | 3209 | + | if templ_7745c5c3_Var149 == nil { |
| 3223 | - | templ_7745c5c3_Var150 = templ.NopComponent | 3210 | + | templ_7745c5c3_Var149 = templ.NopComponent |
| 3224 | } | 3211 | } | ||
| 3225 | ctx = templ.ClearChildren(ctx) | 3212 | ctx = templ.ClearChildren(ctx) | ||
| 3226 | - | templ_7745c5c3_Var151 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { | 3213 | + | templ_7745c5c3_Var150 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { |
| 3227 | templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context | 3214 | templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context | ||
| 3228 | templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) | 3215 | templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) | ||
| 3229 | if !templ_7745c5c3_IsBuffer { | 3216 | if !templ_7745c5c3_IsBuffer { | ||
| @@ -3235,263 +3222,263 @@ func Compare(l Layout, p ComparePage) templ.Component { | |||||
| 3235 | }() | 3222 | }() | ||
| 3236 | } | 3223 | } | ||
| 3237 | ctx = templ.InitializeContext(ctx) | 3224 | ctx = templ.InitializeContext(ctx) | ||
| 3238 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 300, "<header class=\"show mr-h\"><h1>") | 3225 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 299, "<header class=\"show mr-h\"><h1>") |
| 3239 | if templ_7745c5c3_Err != nil { | 3226 | if templ_7745c5c3_Err != nil { | ||
| 3240 | return templ_7745c5c3_Err | 3227 | return templ_7745c5c3_Err | ||
| 3241 | } | 3228 | } | ||
| 3242 | - | var templ_7745c5c3_Var152 string | 3229 | + | var templ_7745c5c3_Var151 string |
| 3243 | - | templ_7745c5c3_Var152, templ_7745c5c3_Err = templ.JoinStringErrs(p.Source) | 3230 | + | templ_7745c5c3_Var151, templ_7745c5c3_Err = templ.JoinStringErrs(p.Source) |
| 3244 | if templ_7745c5c3_Err != nil { | 3231 | if templ_7745c5c3_Err != nil { | ||
| 3245 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 652, Col: 17} | 3232 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 649, Col: 17} |
| 3246 | } | 3233 | } | ||
| 3247 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var152)) | 3234 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var151)) |
| 3248 | if templ_7745c5c3_Err != nil { | 3235 | if templ_7745c5c3_Err != nil { | ||
| 3249 | return templ_7745c5c3_Err | 3236 | return templ_7745c5c3_Err | ||
| 3250 | } | 3237 | } | ||
| 3251 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 301, " → ") | 3238 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 300, " → ") |
| 3252 | if templ_7745c5c3_Err != nil { | 3239 | if templ_7745c5c3_Err != nil { | ||
| 3253 | return templ_7745c5c3_Err | 3240 | return templ_7745c5c3_Err | ||
| 3254 | } | 3241 | } | ||
| 3255 | - | var templ_7745c5c3_Var153 string | 3242 | + | var templ_7745c5c3_Var152 string |
| 3256 | - | templ_7745c5c3_Var153, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | 3243 | + | templ_7745c5c3_Var152, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) |
| 3257 | if templ_7745c5c3_Err != nil { | 3244 | if templ_7745c5c3_Err != nil { | ||
| 3258 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 652, Col: 34} | 3245 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 649, Col: 34} |
| 3259 | } | 3246 | } | ||
| 3260 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var153)) | 3247 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var152)) |
| 3261 | if templ_7745c5c3_Err != nil { | 3248 | if templ_7745c5c3_Err != nil { | ||
| 3262 | return templ_7745c5c3_Err | 3249 | return templ_7745c5c3_Err | ||
| 3263 | } | 3250 | } | ||
| 3264 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 302, "</h1><dl class=\"kv show-kv\"><dt>branch</dt><dd><a href=\"") | 3251 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 301, "</h1><dl class=\"kv show-kv\"><dt>branch</dt><dd><a href=\"") |
| 3265 | if templ_7745c5c3_Err != nil { | 3252 | if templ_7745c5c3_Err != nil { | ||
| 3266 | return templ_7745c5c3_Err | 3253 | return templ_7745c5c3_Err | ||
| 3267 | } | 3254 | } | ||
| 3268 | - | var templ_7745c5c3_Var154 templ.SafeURL | 3255 | + | var templ_7745c5c3_Var153 templ.SafeURL |
| 3269 | - | templ_7745c5c3_Var154, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.SourceHref)) | 3256 | + | templ_7745c5c3_Var153, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.SourceHref)) |
| 3270 | if templ_7745c5c3_Err != nil { | 3257 | if templ_7745c5c3_Err != nil { | ||
| 3271 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 655, Col: 45} | 3258 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 652, Col: 45} |
| 3272 | } | 3259 | } | ||
| 3273 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var154)) | 3260 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var153)) |
| 3274 | if templ_7745c5c3_Err != nil { | 3261 | if templ_7745c5c3_Err != nil { | ||
| 3275 | return templ_7745c5c3_Err | 3262 | return templ_7745c5c3_Err | ||
| 3276 | } | 3263 | } | ||
| 3277 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 303, "\">") | 3264 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 302, "\">") |
| 3278 | if templ_7745c5c3_Err != nil { | 3265 | if templ_7745c5c3_Err != nil { | ||
| 3279 | return templ_7745c5c3_Err | 3266 | return templ_7745c5c3_Err | ||
| 3280 | } | 3267 | } | ||
| 3281 | - | var templ_7745c5c3_Var155 string | 3268 | + | var templ_7745c5c3_Var154 string |
| 3282 | - | templ_7745c5c3_Var155, templ_7745c5c3_Err = templ.JoinStringErrs(p.Source) | 3269 | + | templ_7745c5c3_Var154, templ_7745c5c3_Err = templ.JoinStringErrs(p.Source) |
| 3283 | if templ_7745c5c3_Err != nil { | 3270 | if templ_7745c5c3_Err != nil { | ||
| 3284 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 655, Col: 58} | 3271 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 652, Col: 58} |
| 3285 | } | 3272 | } | ||
| 3286 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var155)) | 3273 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var154)) |
| 3287 | if templ_7745c5c3_Err != nil { | 3274 | if templ_7745c5c3_Err != nil { | ||
| 3288 | return templ_7745c5c3_Err | 3275 | return templ_7745c5c3_Err | ||
| 3289 | } | 3276 | } | ||
| 3290 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 304, "</a></dd><dt>target</dt><dd><a href=\"") | 3277 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 303, "</a></dd><dt>target</dt><dd><a href=\"") |
| 3291 | if templ_7745c5c3_Err != nil { | 3278 | if templ_7745c5c3_Err != nil { | ||
| 3292 | return templ_7745c5c3_Err | 3279 | return templ_7745c5c3_Err | ||
| 3293 | } | 3280 | } | ||
| 3294 | - | var templ_7745c5c3_Var156 templ.SafeURL | 3281 | + | var templ_7745c5c3_Var155 templ.SafeURL |
| 3295 | - | templ_7745c5c3_Var156, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.TargetHref)) | 3282 | + | templ_7745c5c3_Var155, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.TargetHref)) |
| 3296 | if templ_7745c5c3_Err != nil { | 3283 | if templ_7745c5c3_Err != nil { | ||
| 3297 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 657, Col: 45} | 3284 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 654, Col: 45} |
| 3298 | } | 3285 | } | ||
| 3299 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var156)) | 3286 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var155)) |
| 3300 | if templ_7745c5c3_Err != nil { | 3287 | if templ_7745c5c3_Err != nil { | ||
| 3301 | return templ_7745c5c3_Err | 3288 | return templ_7745c5c3_Err | ||
| 3302 | } | 3289 | } | ||
| 3303 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 305, "\">") | 3290 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 304, "\">") |
| 3304 | if templ_7745c5c3_Err != nil { | 3291 | if templ_7745c5c3_Err != nil { | ||
| 3305 | return templ_7745c5c3_Err | 3292 | return templ_7745c5c3_Err | ||
| 3306 | } | 3293 | } | ||
| 3307 | - | var templ_7745c5c3_Var157 string | 3294 | + | var templ_7745c5c3_Var156 string |
| 3308 | - | templ_7745c5c3_Var157, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | 3295 | + | templ_7745c5c3_Var156, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) |
| 3309 | if templ_7745c5c3_Err != nil { | 3296 | if templ_7745c5c3_Err != nil { | ||
| 3310 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 657, Col: 58} | 3297 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 654, Col: 58} |
| 3311 | } | 3298 | } | ||
| 3312 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var157)) | 3299 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var156)) |
| 3313 | if templ_7745c5c3_Err != nil { | 3300 | if templ_7745c5c3_Err != nil { | ||
| 3314 | return templ_7745c5c3_Err | 3301 | return templ_7745c5c3_Err | ||
| 3315 | } | 3302 | } | ||
| 3316 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 306, "</a></dd><dt>ahead</dt><dd>") | 3303 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 305, "</a></dd><dt>ahead</dt><dd>") |
| 3317 | if templ_7745c5c3_Err != nil { | 3304 | if templ_7745c5c3_Err != nil { | ||
| 3318 | return templ_7745c5c3_Err | 3305 | return templ_7745c5c3_Err | ||
| 3319 | } | 3306 | } | ||
| 3320 | - | var templ_7745c5c3_Var158 string | 3307 | + | var templ_7745c5c3_Var157 string |
| 3321 | - | templ_7745c5c3_Var158, templ_7745c5c3_Err = templ.JoinStringErrs(p.AheadText) | 3308 | + | templ_7745c5c3_Var157, templ_7745c5c3_Err = templ.JoinStringErrs(p.AheadText) |
| 3322 | if templ_7745c5c3_Err != nil { | 3309 | if templ_7745c5c3_Err != nil { | ||
| 3323 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 659, Col: 21} | 3310 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 656, Col: 21} |
| 3324 | } | 3311 | } | ||
| 3325 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var158)) | 3312 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var157)) |
| 3326 | if templ_7745c5c3_Err != nil { | 3313 | if templ_7745c5c3_Err != nil { | ||
| 3327 | return templ_7745c5c3_Err | 3314 | return templ_7745c5c3_Err | ||
| 3328 | } | 3315 | } | ||
| 3329 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 307, "</dd></dl></header>") | 3316 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 306, "</dd></dl></header>") |
| 3330 | if templ_7745c5c3_Err != nil { | 3317 | if templ_7745c5c3_Err != nil { | ||
| 3331 | return templ_7745c5c3_Err | 3318 | return templ_7745c5c3_Err | ||
| 3332 | } | 3319 | } | ||
| 3333 | if p.Note != "" { | 3320 | if p.Note != "" { | ||
| 3334 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 308, "<p class=\"notice\">") | 3321 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 307, "<p class=\"notice\">") |
| 3335 | if templ_7745c5c3_Err != nil { | 3322 | if templ_7745c5c3_Err != nil { | ||
| 3336 | return templ_7745c5c3_Err | 3323 | return templ_7745c5c3_Err | ||
| 3337 | } | 3324 | } | ||
| 3338 | - | var templ_7745c5c3_Var159 string | 3325 | + | var templ_7745c5c3_Var158 string |
| 3339 | - | templ_7745c5c3_Var159, templ_7745c5c3_Err = templ.JoinStringErrs(p.Note) | 3326 | + | templ_7745c5c3_Var158, templ_7745c5c3_Err = templ.JoinStringErrs(p.Note) |
| 3340 | if templ_7745c5c3_Err != nil { | 3327 | if templ_7745c5c3_Err != nil { | ||
| 3341 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 663, Col: 29} | 3328 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 660, Col: 29} |
| 3342 | } | 3329 | } | ||
| 3343 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var159)) | 3330 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var158)) |
| 3344 | if templ_7745c5c3_Err != nil { | 3331 | if templ_7745c5c3_Err != nil { | ||
| 3345 | return templ_7745c5c3_Err | 3332 | return templ_7745c5c3_Err | ||
| 3346 | } | 3333 | } | ||
| 3347 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 309, "</p>") | 3334 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 308, "</p>") |
| 3348 | if templ_7745c5c3_Err != nil { | 3335 | if templ_7745c5c3_Err != nil { | ||
| 3349 | return templ_7745c5c3_Err | 3336 | return templ_7745c5c3_Err | ||
| 3350 | } | 3337 | } | ||
| 3351 | } | 3338 | } | ||
| 3352 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 310, " ") | 3339 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 309, " ") |
| 3353 | if templ_7745c5c3_Err != nil { | 3340 | if templ_7745c5c3_Err != nil { | ||
| 3354 | return templ_7745c5c3_Err | 3341 | return templ_7745c5c3_Err | ||
| 3355 | } | 3342 | } | ||
| 3356 | if p.Existing != nil { | 3343 | if p.Existing != nil { | ||
| 3357 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 311, "<p class=\"notice\">an open merge request already covers these branches: <a href=\"") | 3344 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 310, "<p class=\"notice\">an open merge request already covers these branches: <a href=\"") |
| 3358 | if templ_7745c5c3_Err != nil { | 3345 | if templ_7745c5c3_Err != nil { | ||
| 3359 | return templ_7745c5c3_Err | 3346 | return templ_7745c5c3_Err | ||
| 3360 | } | 3347 | } | ||
| 3361 | - | var templ_7745c5c3_Var160 templ.SafeURL | 3348 | + | var templ_7745c5c3_Var159 templ.SafeURL |
| 3362 | - | templ_7745c5c3_Var160, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Existing.Href)) | 3349 | + | templ_7745c5c3_Var159, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Existing.Href)) |
| 3363 | if templ_7745c5c3_Err != nil { | 3350 | if templ_7745c5c3_Err != nil { | ||
| 3364 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 666, Col: 114} | 3351 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 663, Col: 114} |
| 3365 | } | 3352 | } | ||
| 3366 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var160)) | 3353 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var159)) |
| 3367 | if templ_7745c5c3_Err != nil { | 3354 | if templ_7745c5c3_Err != nil { | ||
| 3368 | return templ_7745c5c3_Err | 3355 | return templ_7745c5c3_Err | ||
| 3369 | } | 3356 | } | ||
| 3370 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 312, "\">") | 3357 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 311, "\">") |
| 3371 | if templ_7745c5c3_Err != nil { | 3358 | if templ_7745c5c3_Err != nil { | ||
| 3372 | return templ_7745c5c3_Err | 3359 | return templ_7745c5c3_Err | ||
| 3373 | } | 3360 | } | ||
| 3374 | - | var templ_7745c5c3_Var161 string | 3361 | + | var templ_7745c5c3_Var160 string |
| 3375 | - | templ_7745c5c3_Var161, templ_7745c5c3_Err = templ.JoinStringErrs(p.Existing.Label) | 3362 | + | templ_7745c5c3_Var160, templ_7745c5c3_Err = templ.JoinStringErrs(p.Existing.Label) |
| 3376 | if templ_7745c5c3_Err != nil { | 3363 | if templ_7745c5c3_Err != nil { | ||
| 3377 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 666, Col: 135} | 3364 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 663, Col: 135} |
| 3378 | } | 3365 | } | ||
| 3379 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var161)) | 3366 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var160)) |
| 3380 | if templ_7745c5c3_Err != nil { | 3367 | if templ_7745c5c3_Err != nil { | ||
| 3381 | return templ_7745c5c3_Err | 3368 | return templ_7745c5c3_Err | ||
| 3382 | } | 3369 | } | ||
| 3383 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 313, "</a></p>") | 3370 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 312, "</a></p>") |
| 3384 | if templ_7745c5c3_Err != nil { | 3371 | if templ_7745c5c3_Err != nil { | ||
| 3385 | return templ_7745c5c3_Err | 3372 | return templ_7745c5c3_Err | ||
| 3386 | } | 3373 | } | ||
| 3387 | } | 3374 | } | ||
| 3388 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 314, " ") | 3375 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 313, " ") |
| 3389 | if templ_7745c5c3_Err != nil { | 3376 | if templ_7745c5c3_Err != nil { | ||
| 3390 | return templ_7745c5c3_Err | 3377 | return templ_7745c5c3_Err | ||
| 3391 | } | 3378 | } | ||
| 3392 | if p.Create != nil { | 3379 | if p.Create != nil { | ||
| 3393 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 315, "<form class=\"cform create\" method=\"post\" action=\"") | 3380 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 314, "<form class=\"cform create\" method=\"post\" action=\"") |
| 3394 | if templ_7745c5c3_Err != nil { | 3381 | if templ_7745c5c3_Err != nil { | ||
| 3395 | return templ_7745c5c3_Err | 3382 | return templ_7745c5c3_Err | ||
| 3396 | } | 3383 | } | ||
| 3397 | - | var templ_7745c5c3_Var162 templ.SafeURL | 3384 | + | var templ_7745c5c3_Var161 templ.SafeURL |
| 3398 | - | templ_7745c5c3_Var162, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Create.Action)) | 3385 | + | templ_7745c5c3_Var161, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(p.Create.Action)) |
| 3399 | if templ_7745c5c3_Err != nil { | 3386 | if templ_7745c5c3_Err != nil { | ||
| 3400 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 669, Col: 83} | 3387 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 666, Col: 83} |
| 3401 | } | 3388 | } | ||
| 3402 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var162)) | 3389 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var161)) |
| 3403 | if templ_7745c5c3_Err != nil { | 3390 | if templ_7745c5c3_Err != nil { | ||
| 3404 | return templ_7745c5c3_Err | 3391 | return templ_7745c5c3_Err | ||
| 3405 | } | 3392 | } | ||
| 3406 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 316, "\"><input type=\"hidden\" name=\"source\" value=\"") | 3393 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 315, "\"><input type=\"hidden\" name=\"source\" value=\"") |
| 3407 | if templ_7745c5c3_Err != nil { | 3394 | if templ_7745c5c3_Err != nil { | ||
| 3408 | return templ_7745c5c3_Err | 3395 | return templ_7745c5c3_Err | ||
| 3409 | } | 3396 | } | ||
| 3410 | - | var templ_7745c5c3_Var163 string | 3397 | + | var templ_7745c5c3_Var162 string |
| 3411 | - | templ_7745c5c3_Var163, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Create.Source) | 3398 | + | templ_7745c5c3_Var162, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Create.Source) |
| 3412 | if templ_7745c5c3_Err != nil { | 3399 | if templ_7745c5c3_Err != nil { | ||
| 3413 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 670, Col: 62} | 3400 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 667, Col: 62} |
| 3414 | } | 3401 | } | ||
| 3415 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var163) | 3402 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var162) |
| 3416 | if templ_7745c5c3_Err != nil { | 3403 | if templ_7745c5c3_Err != nil { | ||
| 3417 | return templ_7745c5c3_Err | 3404 | return templ_7745c5c3_Err | ||
| 3418 | } | 3405 | } | ||
| 3419 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 317, "\"> <input type=\"hidden\" name=\"target\" value=\"") | 3406 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 316, "\"> <input type=\"hidden\" name=\"target\" value=\"") |
| 3420 | if templ_7745c5c3_Err != nil { | 3407 | if templ_7745c5c3_Err != nil { | ||
| 3421 | return templ_7745c5c3_Err | 3408 | return templ_7745c5c3_Err | ||
| 3422 | } | 3409 | } | ||
| 3423 | - | var templ_7745c5c3_Var164 string | 3410 | + | var templ_7745c5c3_Var163 string |
| 3424 | - | templ_7745c5c3_Var164, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Create.Target) | 3411 | + | templ_7745c5c3_Var163, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Create.Target) |
| 3425 | if templ_7745c5c3_Err != nil { | 3412 | if templ_7745c5c3_Err != nil { | ||
| 3426 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 671, Col: 62} | 3413 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 668, Col: 62} |
| 3427 | } | 3414 | } | ||
| 3428 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var164) | 3415 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var163) |
| 3429 | if templ_7745c5c3_Err != nil { | 3416 | if templ_7745c5c3_Err != nil { | ||
| 3430 | return templ_7745c5c3_Err | 3417 | return templ_7745c5c3_Err | ||
| 3431 | } | 3418 | } | ||
| 3432 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 318, "\"> <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, 317, "\"> <label for=\"mr-title\">title</label> <input id=\"mr-title\" name=\"title\" type=\"text\" maxlength=\"120\" required value=\"") |
| 3433 | if templ_7745c5c3_Err != nil { | 3420 | if templ_7745c5c3_Err != nil { | ||
| 3434 | return templ_7745c5c3_Err | 3421 | return templ_7745c5c3_Err | ||
| 3435 | } | 3422 | } | ||
| 3436 | - | var templ_7745c5c3_Var165 string | 3423 | + | var templ_7745c5c3_Var164 string |
| 3437 | - | templ_7745c5c3_Var165, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Create.Title) | 3424 | + | templ_7745c5c3_Var164, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.Create.Title) |
| 3438 | if templ_7745c5c3_Err != nil { | 3425 | if templ_7745c5c3_Err != nil { | ||
| 3439 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 673, Col: 97} | 3426 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 670, Col: 97} |
| 3440 | } | 3427 | } | ||
| 3441 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var165) | 3428 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var164) |
| 3442 | if templ_7745c5c3_Err != nil { | 3429 | if templ_7745c5c3_Err != nil { | ||
| 3443 | return templ_7745c5c3_Err | 3430 | return templ_7745c5c3_Err | ||
| 3444 | } | 3431 | } | ||
| 3445 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 319, "\" 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, 318, "\" 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>") |
| 3446 | if templ_7745c5c3_Err != nil { | 3433 | if templ_7745c5c3_Err != nil { | ||
| 3447 | return templ_7745c5c3_Err | 3434 | return templ_7745c5c3_Err | ||
| 3448 | } | 3435 | } | ||
| 3449 | } | 3436 | } | ||
| 3450 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 320, " ") | 3437 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 319, " ") |
| 3451 | if templ_7745c5c3_Err != nil { | 3438 | if templ_7745c5c3_Err != nil { | ||
| 3452 | return templ_7745c5c3_Err | 3439 | return templ_7745c5c3_Err | ||
| 3453 | } | 3440 | } | ||
| 3454 | if p.HasDiff { | 3441 | if p.HasDiff { | ||
| 3455 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 321, "<div class=\"diff-tools\" role=\"group\" aria-label=\"Diff view\"><span class=\"dim\">") | 3442 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 320, "<div class=\"diff-tools\" role=\"group\" aria-label=\"Diff view\"><span class=\"dim\">") |
| 3456 | if templ_7745c5c3_Err != nil { | 3443 | if templ_7745c5c3_Err != nil { | ||
| 3457 | return templ_7745c5c3_Err | 3444 | return templ_7745c5c3_Err | ||
| 3458 | } | 3445 | } | ||
| 3459 | - | var templ_7745c5c3_Var166 string | 3446 | + | var templ_7745c5c3_Var165 string |
| 3460 | - | templ_7745c5c3_Var166, templ_7745c5c3_Err = templ.JoinStringErrs(plural(p.NFiles, "file", "files")) | 3447 | + | templ_7745c5c3_Var165, templ_7745c5c3_Err = templ.JoinStringErrs(plural(p.NFiles, "file", "files")) |
| 3461 | if templ_7745c5c3_Err != nil { | 3448 | if templ_7745c5c3_Err != nil { | ||
| 3462 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 683, Col: 57} | 3449 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 680, Col: 57} |
| 3463 | } | 3450 | } | ||
| 3464 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var166)) | 3451 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var165)) |
| 3465 | if templ_7745c5c3_Err != nil { | 3452 | if templ_7745c5c3_Err != nil { | ||
| 3466 | return templ_7745c5c3_Err | 3453 | return templ_7745c5c3_Err | ||
| 3467 | } | 3454 | } | ||
| 3468 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 322, " · <span class=\"plus\">+") | 3455 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 321, " · <span class=\"plus\">+") |
| 3469 | if templ_7745c5c3_Err != nil { | 3456 | if templ_7745c5c3_Err != nil { | ||
| 3470 | return templ_7745c5c3_Err | 3457 | return templ_7745c5c3_Err | ||
| 3471 | } | 3458 | } | ||
| 3472 | - | var templ_7745c5c3_Var167 string | 3459 | + | var templ_7745c5c3_Var166 string |
| 3473 | - | templ_7745c5c3_Var167, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Adds)) | 3460 | + | templ_7745c5c3_Var166, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Adds)) |
| 3474 | if templ_7745c5c3_Err != nil { | 3461 | if templ_7745c5c3_Err != nil { | ||
| 3475 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 683, Col: 97} | 3462 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 680, Col: 97} |
| 3476 | } | 3463 | } | ||
| 3477 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var167)) | 3464 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var166)) |
| 3478 | if templ_7745c5c3_Err != nil { | 3465 | if templ_7745c5c3_Err != nil { | ||
| 3479 | return templ_7745c5c3_Err | 3466 | return templ_7745c5c3_Err | ||
| 3480 | } | 3467 | } | ||
| 3481 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 323, "</span> <span class=\"minus\">-") | 3468 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 322, "</span> <span class=\"minus\">-") |
| 3482 | if templ_7745c5c3_Err != nil { | 3469 | if templ_7745c5c3_Err != nil { | ||
| 3483 | return templ_7745c5c3_Err | 3470 | return templ_7745c5c3_Err | ||
| 3484 | } | 3471 | } | ||
| 3485 | - | var templ_7745c5c3_Var168 string | 3472 | + | var templ_7745c5c3_Var167 string |
| 3486 | - | templ_7745c5c3_Var168, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Dels)) | 3473 | + | templ_7745c5c3_Var167, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(p.Dels)) |
| 3487 | if templ_7745c5c3_Err != nil { | 3474 | if templ_7745c5c3_Err != nil { | ||
| 3488 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 683, Col: 142} | 3475 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 680, Col: 142} |
| 3489 | } | 3476 | } | ||
| 3490 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var168)) | 3477 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var167)) |
| 3491 | if templ_7745c5c3_Err != nil { | 3478 | if templ_7745c5c3_Err != nil { | ||
| 3492 | return templ_7745c5c3_Err | 3479 | return templ_7745c5c3_Err | ||
| 3493 | } | 3480 | } | ||
| 3494 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 324, "</span></span> <span class=\"grow\"></span>") | 3481 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 323, "</span></span> <span class=\"grow\"></span>") |
| 3495 | if templ_7745c5c3_Err != nil { | 3482 | if templ_7745c5c3_Err != nil { | ||
| 3496 | return templ_7745c5c3_Err | 3483 | return templ_7745c5c3_Err | ||
| 3497 | } | 3484 | } | ||
| @@ -3499,64 +3486,64 @@ func Compare(l Layout, p ComparePage) templ.Component { | |||||
| 3499 | if templ_7745c5c3_Err != nil { | 3486 | if templ_7745c5c3_Err != nil { | ||
| 3500 | return templ_7745c5c3_Err | 3487 | return templ_7745c5c3_Err | ||
| 3501 | } | 3488 | } | ||
| 3502 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 325, "</div>") | 3489 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 324, "</div>") |
| 3503 | if templ_7745c5c3_Err != nil { | 3490 | if templ_7745c5c3_Err != nil { | ||
| 3504 | return templ_7745c5c3_Err | 3491 | return templ_7745c5c3_Err | ||
| 3505 | } | 3492 | } | ||
| 3506 | if p.Invisible { | 3493 | if p.Invisible { | ||
| 3507 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 326, "<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, 325, "<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>") |
| 3508 | if templ_7745c5c3_Err != nil { | 3495 | if templ_7745c5c3_Err != nil { | ||
| 3509 | return templ_7745c5c3_Err | 3496 | return templ_7745c5c3_Err | ||
| 3510 | } | 3497 | } | ||
| 3511 | } | 3498 | } | ||
| 3512 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 327, " <div id=\"diffs\"") | 3499 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 326, " <div id=\"diffs\"") |
| 3513 | if templ_7745c5c3_Err != nil { | 3500 | if templ_7745c5c3_Err != nil { | ||
| 3514 | return templ_7745c5c3_Err | 3501 | return templ_7745c5c3_Err | ||
| 3515 | } | 3502 | } | ||
| 3516 | if p.Both { | 3503 | if p.Both { | ||
| 3517 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 328, " data-diff=\"") | 3504 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 327, " data-diff=\"") |
| 3518 | if templ_7745c5c3_Err != nil { | 3505 | if templ_7745c5c3_Err != nil { | ||
| 3519 | return templ_7745c5c3_Err | 3506 | return templ_7745c5c3_Err | ||
| 3520 | } | 3507 | } | ||
| 3521 | - | var templ_7745c5c3_Var169 string | 3508 | + | var templ_7745c5c3_Var168 string |
| 3522 | - | templ_7745c5c3_Var169, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.View) | 3509 | + | templ_7745c5c3_Var168, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.View) |
| 3523 | if templ_7745c5c3_Err != nil { | 3510 | if templ_7745c5c3_Err != nil { | ||
| 3524 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 696, Col: 23} | 3511 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 693, Col: 23} |
| 3525 | } | 3512 | } | ||
| 3526 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var169) | 3513 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var168) |
| 3527 | if templ_7745c5c3_Err != nil { | 3514 | if templ_7745c5c3_Err != nil { | ||
| 3528 | return templ_7745c5c3_Err | 3515 | return templ_7745c5c3_Err | ||
| 3529 | } | 3516 | } | ||
| 3530 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 329, "\"") | 3517 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 328, "\"") |
| 3531 | if templ_7745c5c3_Err != nil { | 3518 | if templ_7745c5c3_Err != nil { | ||
| 3532 | return templ_7745c5c3_Err | 3519 | return templ_7745c5c3_Err | ||
| 3533 | } | 3520 | } | ||
| 3534 | } else { | 3521 | } else { | ||
| 3535 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 330, " data-view=\"") | 3522 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 329, " data-view=\"") |
| 3536 | if templ_7745c5c3_Err != nil { | 3523 | if templ_7745c5c3_Err != nil { | ||
| 3537 | return templ_7745c5c3_Err | 3524 | return templ_7745c5c3_Err | ||
| 3538 | } | 3525 | } | ||
| 3539 | - | var templ_7745c5c3_Var170 string | 3526 | + | var templ_7745c5c3_Var169 string |
| 3540 | - | templ_7745c5c3_Var170, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.View) | 3527 | + | templ_7745c5c3_Var169, templ_7745c5c3_Err = templ.ResolveAttributeValue(p.View) |
| 3541 | if templ_7745c5c3_Err != nil { | 3528 | if templ_7745c5c3_Err != nil { | ||
| 3542 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 698, Col: 23} | 3529 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 695, Col: 23} |
| 3543 | } | 3530 | } | ||
| 3544 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var170) | 3531 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var169) |
| 3545 | if templ_7745c5c3_Err != nil { | 3532 | if templ_7745c5c3_Err != nil { | ||
| 3546 | return templ_7745c5c3_Err | 3533 | return templ_7745c5c3_Err | ||
| 3547 | } | 3534 | } | ||
| 3548 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 331, "\"") | 3535 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 330, "\"") |
| 3549 | if templ_7745c5c3_Err != nil { | 3536 | if templ_7745c5c3_Err != nil { | ||
| 3550 | return templ_7745c5c3_Err | 3537 | return templ_7745c5c3_Err | ||
| 3551 | } | 3538 | } | ||
| 3552 | } | 3539 | } | ||
| 3553 | if p.Both && !p.Pinned { | 3540 | if p.Both && !p.Pinned { | ||
| 3554 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 332, " hx-live=\"this.dataset.diff = sessionStorage.getItem('diff') || this.dataset.diff\"") | 3541 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 331, " hx-live=\"this.dataset.diff = sessionStorage.getItem('diff') || this.dataset.diff\"") |
| 3555 | if templ_7745c5c3_Err != nil { | 3542 | if templ_7745c5c3_Err != nil { | ||
| 3556 | return templ_7745c5c3_Err | 3543 | return templ_7745c5c3_Err | ||
| 3557 | } | 3544 | } | ||
| 3558 | } | 3545 | } | ||
| 3559 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 333, ">") | 3546 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 332, ">") |
| 3560 | if templ_7745c5c3_Err != nil { | 3547 | if templ_7745c5c3_Err != nil { | ||
| 3561 | return templ_7745c5c3_Err | 3548 | return templ_7745c5c3_Err | ||
| 3562 | } | 3549 | } | ||
| @@ -3566,14 +3553,14 @@ func Compare(l Layout, p ComparePage) templ.Component { | |||||
| 3566 | return templ_7745c5c3_Err | 3553 | return templ_7745c5c3_Err | ||
| 3567 | } | 3554 | } | ||
| 3568 | } | 3555 | } | ||
| 3569 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 334, "</div>") | 3556 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 333, "</div>") |
| 3570 | if templ_7745c5c3_Err != nil { | 3557 | if templ_7745c5c3_Err != nil { | ||
| 3571 | return templ_7745c5c3_Err | 3558 | return templ_7745c5c3_Err | ||
| 3572 | } | 3559 | } | ||
| 3573 | } | 3560 | } | ||
| 3574 | return nil | 3561 | return nil | ||
| 3575 | }) | 3562 | }) | ||
| 3576 | - | templ_7745c5c3_Err = Shell(l, compareRail(p)).Render(templ.WithChildren(ctx, templ_7745c5c3_Var151), templ_7745c5c3_Buffer) | 3563 | + | templ_7745c5c3_Err = Shell(l, compareRail(p)).Render(templ.WithChildren(ctx, templ_7745c5c3_Var150), templ_7745c5c3_Buffer) |
| 3577 | if templ_7745c5c3_Err != nil { | 3564 | if templ_7745c5c3_Err != nil { | ||
| 3578 | return templ_7745c5c3_Err | 3565 | return templ_7745c5c3_Err | ||
| 3579 | } | 3566 | } | ||
| @@ -3597,173 +3584,173 @@ func compareRail(p ComparePage) templ.Component { | |||||
| 3597 | }() | 3584 | }() | ||
| 3598 | } | 3585 | } | ||
| 3599 | ctx = templ.InitializeContext(ctx) | 3586 | ctx = templ.InitializeContext(ctx) | ||
| 3600 | - | templ_7745c5c3_Var171 := templ.GetChildren(ctx) | 3587 | + | templ_7745c5c3_Var170 := templ.GetChildren(ctx) |
| 3601 | - | if templ_7745c5c3_Var171 == nil { | 3588 | + | if templ_7745c5c3_Var170 == nil { |
| 3602 | - | templ_7745c5c3_Var171 = templ.NopComponent | 3589 | + | templ_7745c5c3_Var170 = templ.NopComponent |
| 3603 | } | 3590 | } | ||
| 3604 | ctx = templ.ClearChildren(ctx) | 3591 | ctx = templ.ClearChildren(ctx) | ||
| 3605 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 335, "<section aria-labelledby=\"r-ahead\"><h2 id=\"r-ahead\">Commits <span class=\"count\">") | 3592 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 334, "<section aria-labelledby=\"r-ahead\"><h2 id=\"r-ahead\">Commits <span class=\"count\">") |
| 3606 | if templ_7745c5c3_Err != nil { | 3593 | if templ_7745c5c3_Err != nil { | ||
| 3607 | return templ_7745c5c3_Err | 3594 | return templ_7745c5c3_Err | ||
| 3608 | } | 3595 | } | ||
| 3609 | - | var templ_7745c5c3_Var172 string | 3596 | + | var templ_7745c5c3_Var171 string |
| 3610 | - | templ_7745c5c3_Var172, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(len(p.Ahead))) | 3597 | + | templ_7745c5c3_Var171, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(len(p.Ahead))) |
| 3611 | if templ_7745c5c3_Err != nil { | 3598 | if templ_7745c5c3_Err != nil { | ||
| 3612 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 714, Col: 67} | 3599 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 711, Col: 67} |
| 3613 | } | 3600 | } | ||
| 3614 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var172)) | 3601 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var171)) |
| 3615 | if templ_7745c5c3_Err != nil { | 3602 | if templ_7745c5c3_Err != nil { | ||
| 3616 | return templ_7745c5c3_Err | 3603 | return templ_7745c5c3_Err | ||
| 3617 | } | 3604 | } | ||
| 3618 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 336, "</span></h2><ul class=\"pcommits\">") | 3605 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 335, "</span></h2><ul class=\"pcommits\">") |
| 3619 | if templ_7745c5c3_Err != nil { | 3606 | if templ_7745c5c3_Err != nil { | ||
| 3620 | return templ_7745c5c3_Err | 3607 | return templ_7745c5c3_Err | ||
| 3621 | } | 3608 | } | ||
| 3622 | for _, c := range p.Ahead { | 3609 | for _, c := range p.Ahead { | ||
| 3623 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 337, "<li><a href=\"") | 3610 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 336, "<li><a href=\"") |
| 3624 | if templ_7745c5c3_Err != nil { | 3611 | if templ_7745c5c3_Err != nil { | ||
| 3625 | return templ_7745c5c3_Err | 3612 | return templ_7745c5c3_Err | ||
| 3626 | } | 3613 | } | ||
| 3627 | - | var templ_7745c5c3_Var173 templ.SafeURL | 3614 | + | var templ_7745c5c3_Var172 templ.SafeURL |
| 3628 | - | templ_7745c5c3_Var173, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(c.CHref)) | 3615 | + | templ_7745c5c3_Var172, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(c.CHref)) |
| 3629 | if templ_7745c5c3_Err != nil { | 3616 | if templ_7745c5c3_Err != nil { | ||
| 3630 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 718, Col: 37} | 3617 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 715, Col: 37} |
| 3631 | } | 3618 | } | ||
| 3632 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var173)) | 3619 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var172)) |
| 3633 | if templ_7745c5c3_Err != nil { | 3620 | if templ_7745c5c3_Err != nil { | ||
| 3634 | return templ_7745c5c3_Err | 3621 | return templ_7745c5c3_Err | ||
| 3635 | } | 3622 | } | ||
| 3636 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 338, "\">") | 3623 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 337, "\">") |
| 3637 | if templ_7745c5c3_Err != nil { | 3624 | if templ_7745c5c3_Err != nil { | ||
| 3638 | return templ_7745c5c3_Err | 3625 | return templ_7745c5c3_Err | ||
| 3639 | } | 3626 | } | ||
| 3640 | - | var templ_7745c5c3_Var174 string | 3627 | + | var templ_7745c5c3_Var173 string |
| 3641 | - | templ_7745c5c3_Var174, templ_7745c5c3_Err = templ.JoinStringErrs(c.Short) | 3628 | + | templ_7745c5c3_Var173, templ_7745c5c3_Err = templ.JoinStringErrs(c.Short) |
| 3642 | if templ_7745c5c3_Err != nil { | 3629 | if templ_7745c5c3_Err != nil { | ||
| 3643 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 718, Col: 49} | 3630 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 715, Col: 49} |
| 3644 | } | 3631 | } | ||
| 3645 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var174)) | 3632 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var173)) |
| 3646 | if templ_7745c5c3_Err != nil { | 3633 | if templ_7745c5c3_Err != nil { | ||
| 3647 | return templ_7745c5c3_Err | 3634 | return templ_7745c5c3_Err | ||
| 3648 | } | 3635 | } | ||
| 3649 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 339, "</a> <span class=\"s\">") | 3636 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 338, "</a> <span class=\"s\">") |
| 3650 | if templ_7745c5c3_Err != nil { | 3637 | if templ_7745c5c3_Err != nil { | ||
| 3651 | return templ_7745c5c3_Err | 3638 | return templ_7745c5c3_Err | ||
| 3652 | } | 3639 | } | ||
| 3653 | - | var templ_7745c5c3_Var175 string | 3640 | + | var templ_7745c5c3_Var174 string |
| 3654 | - | templ_7745c5c3_Var175, templ_7745c5c3_Err = templ.JoinStringErrs(c.Subject) | 3641 | + | templ_7745c5c3_Var174, templ_7745c5c3_Err = templ.JoinStringErrs(c.Subject) |
| 3655 | if templ_7745c5c3_Err != nil { | 3642 | if templ_7745c5c3_Err != nil { | ||
| 3656 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 719, Col: 32} | 3643 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 716, Col: 32} |
| 3657 | } | 3644 | } | ||
| 3658 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var175)) | 3645 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var174)) |
| 3659 | if templ_7745c5c3_Err != nil { | 3646 | if templ_7745c5c3_Err != nil { | ||
| 3660 | return templ_7745c5c3_Err | 3647 | return templ_7745c5c3_Err | ||
| 3661 | } | 3648 | } | ||
| 3662 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 340, "</span> <span class=\"mute\">") | 3649 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 339, "</span> <span class=\"mute\">") |
| 3663 | if templ_7745c5c3_Err != nil { | 3650 | if templ_7745c5c3_Err != nil { | ||
| 3664 | return templ_7745c5c3_Err | 3651 | return templ_7745c5c3_Err | ||
| 3665 | } | 3652 | } | ||
| 3666 | - | var templ_7745c5c3_Var176 string | 3653 | + | var templ_7745c5c3_Var175 string |
| 3667 | - | templ_7745c5c3_Var176, templ_7745c5c3_Err = templ.JoinStringErrs(c.Author) | 3654 | + | templ_7745c5c3_Var175, templ_7745c5c3_Err = templ.JoinStringErrs(c.Author) |
| 3668 | if templ_7745c5c3_Err != nil { | 3655 | if templ_7745c5c3_Err != nil { | ||
| 3669 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 721, Col: 16} | 3656 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 718, Col: 16} |
| 3670 | } | 3657 | } | ||
| 3671 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var176)) | 3658 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var175)) |
| 3672 | if templ_7745c5c3_Err != nil { | 3659 | if templ_7745c5c3_Err != nil { | ||
| 3673 | return templ_7745c5c3_Err | 3660 | return templ_7745c5c3_Err | ||
| 3674 | } | 3661 | } | ||
| 3675 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 341, " ") | 3662 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 340, " ") |
| 3676 | if templ_7745c5c3_Err != nil { | 3663 | if templ_7745c5c3_Err != nil { | ||
| 3677 | return templ_7745c5c3_Err | 3664 | return templ_7745c5c3_Err | ||
| 3678 | } | 3665 | } | ||
| 3679 | if c.WhenAt != "" { | 3666 | if c.WhenAt != "" { | ||
| 3680 | - | var templ_7745c5c3_Var177 string | 3667 | + | var templ_7745c5c3_Var176 string |
| 3681 | - | templ_7745c5c3_Var177, templ_7745c5c3_Err = templ.JoinStringErrs(" · ") | 3668 | + | templ_7745c5c3_Var176, templ_7745c5c3_Err = templ.JoinStringErrs(" · ") |
| 3682 | if templ_7745c5c3_Err != nil { | 3669 | if templ_7745c5c3_Err != nil { | ||
| 3683 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 723, Col: 15} | 3670 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 720, Col: 15} |
| 3684 | } | 3671 | } | ||
| 3685 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var177)) | 3672 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var176)) |
| 3686 | if templ_7745c5c3_Err != nil { | 3673 | if templ_7745c5c3_Err != nil { | ||
| 3687 | return templ_7745c5c3_Err | 3674 | return templ_7745c5c3_Err | ||
| 3688 | } | 3675 | } | ||
| 3689 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 342, "<time datetime=\"") | 3676 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 341, "<time datetime=\"") |
| 3690 | if templ_7745c5c3_Err != nil { | 3677 | if templ_7745c5c3_Err != nil { | ||
| 3691 | return templ_7745c5c3_Err | 3678 | return templ_7745c5c3_Err | ||
| 3692 | } | 3679 | } | ||
| 3693 | - | var templ_7745c5c3_Var178 string | 3680 | + | var templ_7745c5c3_Var177 string |
| 3694 | - | templ_7745c5c3_Var178, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.WhenAt) | 3681 | + | templ_7745c5c3_Var177, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.WhenAt) |
| 3695 | if templ_7745c5c3_Err != nil { | 3682 | if templ_7745c5c3_Err != nil { | ||
| 3696 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 723, Col: 42} | 3683 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 720, Col: 42} |
| 3697 | } | 3684 | } | ||
| 3698 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var178) | 3685 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var177) |
| 3699 | if templ_7745c5c3_Err != nil { | 3686 | if templ_7745c5c3_Err != nil { | ||
| 3700 | return templ_7745c5c3_Err | 3687 | return templ_7745c5c3_Err | ||
| 3701 | } | 3688 | } | ||
| 3702 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 343, "\">") | 3689 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 342, "\">") |
| 3703 | if templ_7745c5c3_Err != nil { | 3690 | if templ_7745c5c3_Err != nil { | ||
| 3704 | return templ_7745c5c3_Err | 3691 | return templ_7745c5c3_Err | ||
| 3705 | } | 3692 | } | ||
| 3706 | - | var templ_7745c5c3_Var179 string | 3693 | + | var templ_7745c5c3_Var178 string |
| 3707 | - | templ_7745c5c3_Var179, templ_7745c5c3_Err = templ.JoinStringErrs(c.When) | 3694 | + | templ_7745c5c3_Var178, templ_7745c5c3_Err = templ.JoinStringErrs(c.When) |
| 3708 | if templ_7745c5c3_Err != nil { | 3695 | if templ_7745c5c3_Err != nil { | ||
| 3709 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 723, Col: 53} | 3696 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 720, Col: 53} |
| 3710 | } | 3697 | } | ||
| 3711 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var179)) | 3698 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var178)) |
| 3712 | if templ_7745c5c3_Err != nil { | 3699 | if templ_7745c5c3_Err != nil { | ||
| 3713 | return templ_7745c5c3_Err | 3700 | return templ_7745c5c3_Err | ||
| 3714 | } | 3701 | } | ||
| 3715 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 344, "</time>") | 3702 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 343, "</time>") |
| 3716 | if templ_7745c5c3_Err != nil { | 3703 | if templ_7745c5c3_Err != nil { | ||
| 3717 | return templ_7745c5c3_Err | 3704 | return templ_7745c5c3_Err | ||
| 3718 | } | 3705 | } | ||
| 3719 | } | 3706 | } | ||
| 3720 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 345, "</span></li>") | 3707 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 344, "</span></li>") |
| 3721 | if templ_7745c5c3_Err != nil { | 3708 | if templ_7745c5c3_Err != nil { | ||
| 3722 | return templ_7745c5c3_Err | 3709 | return templ_7745c5c3_Err | ||
| 3723 | } | 3710 | } | ||
| 3724 | } | 3711 | } | ||
| 3725 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 346, "</ul>") | 3712 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 345, "</ul>") |
| 3726 | if templ_7745c5c3_Err != nil { | 3713 | if templ_7745c5c3_Err != nil { | ||
| 3727 | return templ_7745c5c3_Err | 3714 | return templ_7745c5c3_Err | ||
| 3728 | } | 3715 | } | ||
| 3729 | if len(p.Ahead) == 0 { | 3716 | if len(p.Ahead) == 0 { | ||
| 3730 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 347, "<p class=\"dim\">no commit ahead of ") | 3717 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 346, "<p class=\"dim\">no commit ahead of ") |
| 3731 | if templ_7745c5c3_Err != nil { | 3718 | if templ_7745c5c3_Err != nil { | ||
| 3732 | return templ_7745c5c3_Err | 3719 | return templ_7745c5c3_Err | ||
| 3733 | } | 3720 | } | ||
| 3734 | - | var templ_7745c5c3_Var180 string | 3721 | + | var templ_7745c5c3_Var179 string |
| 3735 | - | templ_7745c5c3_Var180, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) | 3722 | + | templ_7745c5c3_Var179, templ_7745c5c3_Err = templ.JoinStringErrs(p.Target) |
| 3736 | if templ_7745c5c3_Err != nil { | 3723 | if templ_7745c5c3_Err != nil { | ||
| 3737 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 730, Col: 47} | 3724 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 727, Col: 47} |
| 3738 | } | 3725 | } | ||
| 3739 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var180)) | 3726 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var179)) |
| 3740 | if templ_7745c5c3_Err != nil { | 3727 | if templ_7745c5c3_Err != nil { | ||
| 3741 | return templ_7745c5c3_Err | 3728 | return templ_7745c5c3_Err | ||
| 3742 | } | 3729 | } | ||
| 3743 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 348, ".</p>") | 3730 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 347, ".</p>") |
| 3744 | if templ_7745c5c3_Err != nil { | 3731 | if templ_7745c5c3_Err != nil { | ||
| 3745 | return templ_7745c5c3_Err | 3732 | return templ_7745c5c3_Err | ||
| 3746 | } | 3733 | } | ||
| 3747 | } | 3734 | } | ||
| 3748 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 349, "</section>") | 3735 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 348, "</section>") |
| 3749 | if templ_7745c5c3_Err != nil { | 3736 | if templ_7745c5c3_Err != nil { | ||
| 3750 | return templ_7745c5c3_Err | 3737 | return templ_7745c5c3_Err | ||
| 3751 | } | 3738 | } | ||
| 3752 | if p.HasDiff { | 3739 | if p.HasDiff { | ||
| 3753 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 350, "<section aria-labelledby=\"r-files\"><h2 id=\"r-files\">Files <span class=\"count\">") | 3740 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 349, "<section aria-labelledby=\"r-files\"><h2 id=\"r-files\">Files <span class=\"count\">") |
| 3754 | if templ_7745c5c3_Err != nil { | 3741 | if templ_7745c5c3_Err != nil { | ||
| 3755 | return templ_7745c5c3_Err | 3742 | return templ_7745c5c3_Err | ||
| 3756 | } | 3743 | } | ||
| 3757 | - | var templ_7745c5c3_Var181 string | 3744 | + | var templ_7745c5c3_Var180 string |
| 3758 | - | templ_7745c5c3_Var181, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(len(p.Files))) | 3745 | + | templ_7745c5c3_Var180, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(len(p.Files))) |
| 3759 | if templ_7745c5c3_Err != nil { | 3746 | if templ_7745c5c3_Err != nil { | ||
| 3760 | - | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 735, Col: 66} | 3747 | + | return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/adapters/web/mr.templ`, Line: 732, Col: 66} |
| 3761 | } | 3748 | } | ||
| 3762 | - | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var181)) | 3749 | + | _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var180)) |
| 3763 | if templ_7745c5c3_Err != nil { | 3750 | if templ_7745c5c3_Err != nil { | ||
| 3764 | return templ_7745c5c3_Err | 3751 | return templ_7745c5c3_Err | ||
| 3765 | } | 3752 | } | ||
| 3766 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 351, "</span></h2>") | 3753 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 350, "</span></h2>") |
| 3767 | if templ_7745c5c3_Err != nil { | 3754 | if templ_7745c5c3_Err != nil { | ||
| 3768 | return templ_7745c5c3_Err | 3755 | return templ_7745c5c3_Err | ||
| 3769 | } | 3756 | } | ||
| @@ -3771,12 +3758,12 @@ func compareRail(p ComparePage) templ.Component { | |||||
| 3771 | if templ_7745c5c3_Err != nil { | 3758 | if templ_7745c5c3_Err != nil { | ||
| 3772 | return templ_7745c5c3_Err | 3759 | return templ_7745c5c3_Err | ||
| 3773 | } | 3760 | } | ||
| 3774 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 352, "</section>") | 3761 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 351, "</section>") |
| 3775 | if templ_7745c5c3_Err != nil { | 3762 | if templ_7745c5c3_Err != nil { | ||
| 3776 | return templ_7745c5c3_Err | 3763 | return templ_7745c5c3_Err | ||
| 3777 | } | 3764 | } | ||
| 3778 | } | 3765 | } | ||
| 3779 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 353, "<section aria-labelledby=\"r-cli\"><h2 id=\"r-cli\">From a terminal</h2>") | 3766 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 352, "<section aria-labelledby=\"r-cli\"><h2 id=\"r-cli\">From a terminal</h2>") |
| 3780 | if templ_7745c5c3_Err != nil { | 3767 | if templ_7745c5c3_Err != nil { | ||
| 3781 | return templ_7745c5c3_Err | 3768 | return templ_7745c5c3_Err | ||
| 3782 | } | 3769 | } | ||
| @@ -3784,7 +3771,7 @@ func compareRail(p ComparePage) templ.Component { | |||||
| 3784 | if templ_7745c5c3_Err != nil { | 3771 | if templ_7745c5c3_Err != nil { | ||
| 3785 | return templ_7745c5c3_Err | 3772 | return templ_7745c5c3_Err | ||
| 3786 | } | 3773 | } | ||
| 3787 | - | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 354, "</section>") | 3774 | + | templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 353, "</section>") |
| 3788 | if templ_7745c5c3_Err != nil { | 3775 | if templ_7745c5c3_Err != nil { | ||
| 3789 | return templ_7745c5c3_Err | 3776 | return templ_7745c5c3_Err | ||
| 3790 | } | 3777 | } | ||
M internal/adapters/web/mr_test.go +5 -1
| @@ -134,7 +134,11 @@ func TestMRPanelsAndMenus(t *testing.T) { | |||
| 134 | 134 | p := MRPage{CommitCount: "500+", CommitsNote: "more commits", Modes: []string{"squash", "merge"}, ChecksBlock: true, | |
| 135 | 135 | ChecksSum: ChecksSummary{Total: 2, Label: "1/2", Title: "1/2 failed"}, Box: &MergeBox{Signed: true, Fingerprint: "fingerprint", HeadGone: true}} | |
| 136 | 136 | footer := renderToString(t, mrFooter(p)) | |
| 137 | - | assert.Contains(t, footer, `<footer class="mr-footer"><details id="mr-panels">`) | |
| 137 | + | assert.Contains(t, footer, `<footer class="mr-footer"><nav data-mr-tabs`) | |
| 138 | + | assert.NotContains(t, footer, `<details`) | |
| 139 | + | assert.NotContains(t, footer, `<summary`) | |
| 140 | + | assert.Contains(t, footer, `id="mr-commits" data-mr-panel hidden`) | |
| 141 | + | assert.Contains(t, footer, `id="mr-checks-panel" data-mr-panel hidden`) | |
| 138 | 142 | assert.Contains(t, footer, `data-mr-tabs`) | |
| 139 | 143 | assert.Contains(t, footer, `id="mr-commits"`) | |
| 140 | 144 | assert.Contains(t, footer, `id="mr-checks"`) | |
| @@ -134,7 +134,11 @@ func TestMRPanelsAndMenus(t *testing.T) { | |||||
| 134 | p := MRPage{CommitCount: "500+", CommitsNote: "more commits", Modes: []string{"squash", "merge"}, ChecksBlock: true, | 134 | p := MRPage{CommitCount: "500+", CommitsNote: "more commits", Modes: []string{"squash", "merge"}, ChecksBlock: true, | ||
| 135 | ChecksSum: ChecksSummary{Total: 2, Label: "1/2", Title: "1/2 failed"}, Box: &MergeBox{Signed: true, Fingerprint: "fingerprint", HeadGone: true}} | 135 | ChecksSum: ChecksSummary{Total: 2, Label: "1/2", Title: "1/2 failed"}, Box: &MergeBox{Signed: true, Fingerprint: "fingerprint", HeadGone: true}} | ||
| 136 | footer := renderToString(t, mrFooter(p)) | 136 | footer := renderToString(t, mrFooter(p)) | ||
| 137 | - | assert.Contains(t, footer, `<footer class="mr-footer"><details id="mr-panels">`) | 137 | + | assert.Contains(t, footer, `<footer class="mr-footer"><nav data-mr-tabs`) |
| 138 | + | assert.NotContains(t, footer, `<details`) | |||
| 139 | + | assert.NotContains(t, footer, `<summary`) | |||
| 140 | + | assert.Contains(t, footer, `id="mr-commits" data-mr-panel hidden`) | |||
| 141 | + | assert.Contains(t, footer, `id="mr-checks-panel" data-mr-panel hidden`) | |||
| 138 | assert.Contains(t, footer, `data-mr-tabs`) | 142 | assert.Contains(t, footer, `data-mr-tabs`) | ||
| 139 | assert.Contains(t, footer, `id="mr-commits"`) | 143 | assert.Contains(t, footer, `id="mr-commits"`) | ||
| 140 | assert.Contains(t, footer, `id="mr-checks"`) | 144 | assert.Contains(t, footer, `id="mr-checks"`) | ||
M internal/adapters/web/static/css/60-mr.css +8 -3
| @@ -10,17 +10,22 @@ | |||
| 10 | 10 | ||
| 11 | 11 | .mr-footer { | |
| 12 | 12 | border-top: 1px solid var(--border); padding: var(--s3) var(--s5); | |
| 13 | + | /* a touch darker than the card body; the card's overflow clips the corners */ | |
| 14 | + | background: var(--bg-canvas); | |
| 13 | 15 | font-size: var(--fs-s); | |
| 14 | - | & summary { cursor: pointer; color: var(--ink-dim); } | |
| 15 | 16 | & 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); } | |
| 17 | + | & [data-mr-tabs] a { padding: var(--s1) var(--s2); border-radius: var(--r-s); color: var(--ink-dim); cursor: pointer; } | |
| 18 | + | & [data-mr-tabs] a:hover { background: var(--bg-raised); color: var(--ink-hi); } | |
| 19 | + | & [data-mr-tabs] a[aria-expanded="true"] { background: var(--bg-strong); color: var(--ink-hi); } | |
| 18 | 20 | & [data-mr-panel] { overflow-x: auto; } | |
| 19 | 21 | & [hidden] { display: none; } | |
| 22 | + | /* Without scripts the panels are shown by the URL fragment alone. */ | |
| 23 | + | html:not(.js) & [data-mr-panel][hidden]:is(:target, :has(:target)) { display: block; } | |
| 20 | 24 | & section h2 { font-size: var(--fs-s); color: var(--ink-dim); } | |
| 21 | 25 | & table { width: 100%; border-collapse: collapse; } | |
| 22 | 26 | & th, & td { text-align: left; padding: var(--s2); border-bottom: 1px solid var(--border); } | |
| 23 | 27 | & th { color: var(--ink-dim); font-weight: 500; } | |
| 28 | + | & tbody tr:last-child > :is(td, th) { border-bottom: 0; } | |
| 24 | 29 | } | |
| 25 | 30 | .merge-settings { font-size: var(--fs-s); color: var(--ink-dim); } | |
| 26 | 31 | .merge-settings h2 { font-size: var(--fs-s); } | |
| @@ -10,17 +10,22 @@ | |||||
| 10 | 10 | ||||
| 11 | .mr-footer { | 11 | .mr-footer { | ||
| 12 | border-top: 1px solid var(--border); padding: var(--s3) var(--s5); | 12 | border-top: 1px solid var(--border); padding: var(--s3) var(--s5); | ||
| 13 | + | /* a touch darker than the card body; the card's overflow clips the corners */ | |||
| 14 | + | background: var(--bg-canvas); | |||
| 13 | font-size: var(--fs-s); | 15 | 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 | & nav { display: flex; gap: var(--s3); padding-block: var(--s3); } | ||
| 16 | - | & [role="tab"] { padding: var(--s1) var(--s2); border-radius: var(--r-s); } | 17 | + | & [data-mr-tabs] a { padding: var(--s1) var(--s2); border-radius: var(--r-s); color: var(--ink-dim); cursor: pointer; } |
| 17 | - | & [aria-selected="true"] { background: var(--bg-raised); color: var(--ink-hi); } | 18 | + | & [data-mr-tabs] a:hover { background: var(--bg-raised); color: var(--ink-hi); } |
| 19 | + | & [data-mr-tabs] a[aria-expanded="true"] { background: var(--bg-strong); color: var(--ink-hi); } | |||
| 18 | & [data-mr-panel] { overflow-x: auto; } | 20 | & [data-mr-panel] { overflow-x: auto; } | ||
| 19 | & [hidden] { display: none; } | 21 | & [hidden] { display: none; } | ||
| 22 | + | /* Without scripts the panels are shown by the URL fragment alone. */ | |||
| 23 | + | html:not(.js) & [data-mr-panel][hidden]:is(:target, :has(:target)) { display: block; } | |||
| 20 | & section h2 { font-size: var(--fs-s); color: var(--ink-dim); } | 24 | & section h2 { font-size: var(--fs-s); color: var(--ink-dim); } | ||
| 21 | & table { width: 100%; border-collapse: collapse; } | 25 | & table { width: 100%; border-collapse: collapse; } | ||
| 22 | & th, & td { text-align: left; padding: var(--s2); border-bottom: 1px solid var(--border); } | 26 | & th, & td { text-align: left; padding: var(--s2); border-bottom: 1px solid var(--border); } | ||
| 23 | & th { color: var(--ink-dim); font-weight: 500; } | 27 | & th { color: var(--ink-dim); font-weight: 500; } | ||
| 28 | + | & tbody tr:last-child > :is(td, th) { border-bottom: 0; } | |||
| 24 | } | 29 | } | ||
| 25 | .merge-settings { font-size: var(--fs-s); color: var(--ink-dim); } | 30 | .merge-settings { font-size: var(--fs-s); color: var(--ink-dim); } | ||
| 26 | .merge-settings h2 { font-size: var(--fs-s); } | 31 | .merge-settings h2 { font-size: var(--fs-s); } | ||
M internal/adapters/web/static/css/85-mobile.css +0 -2
| @@ -49,7 +49,5 @@ | |||
| 49 | 49 | body:has(#diffs[data-mr]) :is(.cform .btn, .menu .btn, .mr-touch-range .btn, .c-act button) { min-height: 40px; height: auto; padding-block: var(--s2); } | |
| 50 | 50 | #diffs[data-mr] .cform { scroll-margin-block: calc(var(--hdr-h) + 12px); } | |
| 51 | 51 | .mr-footer [data-mr-tabs] a { display: inline-flex; align-items: center; min-height: 40px; } | |
| 52 | - | /* No display change: the summary stays a list-item and keeps its marker. */ | |
| 53 | - | .mr-footer summary { min-height: 40px; line-height: 40px; } | |
| 54 | 52 | } | |
| 55 | 53 | } | |
| @@ -49,7 +49,5 @@ | |||||
| 49 | body:has(#diffs[data-mr]) :is(.cform .btn, .menu .btn, .mr-touch-range .btn, .c-act button) { min-height: 40px; height: auto; padding-block: var(--s2); } | 49 | body:has(#diffs[data-mr]) :is(.cform .btn, .menu .btn, .mr-touch-range .btn, .c-act button) { min-height: 40px; height: auto; padding-block: var(--s2); } | ||
| 50 | #diffs[data-mr] .cform { scroll-margin-block: calc(var(--hdr-h) + 12px); } | 50 | #diffs[data-mr] .cform { scroll-margin-block: calc(var(--hdr-h) + 12px); } | ||
| 51 | .mr-footer [data-mr-tabs] a { display: inline-flex; align-items: center; min-height: 40px; } | 51 | .mr-footer [data-mr-tabs] a { display: inline-flex; align-items: center; min-height: 40px; } | ||
| 52 | - | /* No display change: the summary stays a list-item and keeps its marker. */ | |||
| 53 | - | .mr-footer summary { min-height: 40px; line-height: 40px; } | |||
| 54 | } | 52 | } | ||
| 55 | } | 53 | } | ||
M internal/adapters/web/static/js/mr.js +26 -27
| @@ -315,42 +315,48 @@ window.ermiteMR = (() => { | |||
| 315 | 315 | ||
| 316 | 316 | // Enhance the ordinary anchor navigation only when scripts are available. | |
| 317 | 317 | let disposePanels = () => {}; | |
| 318 | - | function panels() { | |
| 318 | + | // The tabs are disclosure buttons (aria-expanded + aria-controls), not a | |
| 319 | + | // tablist: a tablist always has a selected tab, and here every panel can be | |
| 320 | + | // folded. State: the index of the open panel, or -1 for none. | |
| 321 | + | function panels(initial = -1) { | |
| 319 | 322 | disposePanels(); | |
| 320 | - | const footer = $('#mr-panels'), nav = $('[data-mr-tabs]'); | |
| 323 | + | const footer = $('.mr-footer'), nav = $('[data-mr-tabs]'); | |
| 321 | 324 | if (!footer || !nav) return; | |
| 322 | 325 | const tabs = $$('a', nav), panels = $$('[data-mr-panel]', footer); | |
| 323 | - | nav.setAttribute('role', 'tablist'); | |
| 324 | - | function select(index, focus = false, fromUser = false) { | |
| 326 | + | const ids = new Set(['#mr-commits', '#mr-checks', '#mr-checks-panel']); | |
| 327 | + | let current = -1; | |
| 328 | + | // show applies the state; fromUser also keeps the URL fragment in step. | |
| 329 | + | function show(index, fromUser = false) { | |
| 330 | + | current = index; | |
| 325 | 331 | tabs.forEach((tab, i) => { | |
| 326 | - | tab.setAttribute('role', 'tab'); | |
| 327 | 332 | tab.setAttribute('aria-controls', panels[i].id); | |
| 328 | - | tab.setAttribute('aria-selected', String(i === index)); | |
| 329 | - | tab.tabIndex = i === index ? 0 : -1; | |
| 330 | - | panels[i].setAttribute('role', 'tabpanel'); | |
| 331 | - | panels[i].tabIndex = 0; | |
| 333 | + | tab.setAttribute('aria-expanded', String(i === index)); | |
| 332 | 334 | panels[i].hidden = i !== index; | |
| 333 | 335 | }); | |
| 334 | - | if (focus) tabs[index].focus(); | |
| 335 | - | if (fromUser && location.hash !== '#' + panels[index].id) history.replaceState(null, '', '#' + panels[index].id); | |
| 336 | + | if (!fromUser) return; | |
| 337 | + | if (index >= 0) { | |
| 338 | + | if (location.hash !== '#' + panels[index].id) history.replaceState(null, '', '#' + panels[index].id); | |
| 339 | + | } else if (ids.has(location.hash)) { | |
| 340 | + | history.replaceState(null, '', location.pathname + location.search); | |
| 341 | + | } | |
| 336 | 342 | } | |
| 343 | + | const toggle = (i) => show(i === current ? -1 : i, true); | |
| 337 | 344 | tabs.forEach((tab, i) => { | |
| 338 | - | tab.addEventListener('click', (e) => { e.preventDefault(); select(i, false, true); }); | |
| 345 | + | tab.addEventListener('click', (e) => { e.preventDefault(); toggle(i); }); | |
| 339 | 346 | tab.addEventListener('keydown', (e) => { | |
| 340 | 347 | const next = core.tabIndex(e.key, i, tabs.length); | |
| 341 | 348 | if (next === null) return; | |
| 342 | - | e.preventDefault(); select(next, true, true); | |
| 349 | + | e.preventDefault(); tabs[next].focus(); | |
| 343 | 350 | }); | |
| 344 | 351 | }); | |
| 345 | 352 | function hash() { | |
| 346 | 353 | const h = location.hash; | |
| 347 | 354 | const index = h === '#mr-checks' || h === '#mr-checks-panel' ? 1 : h === '#mr-commits' ? 0 : -1; | |
| 348 | - | if (index < 0) return; | |
| 349 | - | footer.open = true; select(index); | |
| 355 | + | if (index >= 0) show(index); | |
| 350 | 356 | } | |
| 351 | - | // A repeated click on the same hash must also reopen a folded footer. | |
| 357 | + | // The checks badge always opens Checks; it never folds it. | |
| 352 | 358 | const checksClick = (e) => { | |
| 353 | - | if (e.target.closest?.('#mr-ck')) { footer.open = true; select(1); } | |
| 359 | + | if (e.target.closest?.('#mr-ck')) show(1); | |
| 354 | 360 | }; | |
| 355 | 361 | document.addEventListener('click', checksClick); | |
| 356 | 362 | let observer; | |
| @@ -369,7 +375,7 @@ window.ermiteMR = (() => { | |||
| 369 | 375 | observer.observe(summary.parentElement, { childList: true }); | |
| 370 | 376 | sync(); | |
| 371 | 377 | } | |
| 372 | - | select(0); hash(); | |
| 378 | + | show(initial); hash(); | |
| 373 | 379 | addEventListener('hashchange', hash); | |
| 374 | 380 | disposePanels = () => { | |
| 375 | 381 | document.removeEventListener?.('click', checksClick); | |
| @@ -583,8 +589,7 @@ window.ermiteMR = (() => { | |||
| 583 | 589 | const files = new Map($$('#diffs details.dfile').map((f) => [f.dataset.file, f.open])); | |
| 584 | 590 | const folded = $('.r-files')?.hasAttribute('data-folded'); | |
| 585 | 591 | const railY = $('.rail')?.scrollTop, filesY = $('.r-files .files')?.scrollTop; | |
| 586 | - | const footerOpen = $('#mr-panels')?.open; | |
| 587 | - | const tab = $('[data-mr-tabs] [aria-selected="true"]')?.id; | |
| 592 | + | const openPanel = $$('[data-mr-tabs] a').findIndex((t) => t.getAttribute('aria-expanded') === 'true'); | |
| 588 | 593 | const active = document.activeElement; | |
| 589 | 594 | const focus = active && { file: active.closest?.('.files a')?.getAttribute('title'), region: regions.find((sel) => $(sel)?.contains(active)), menu: active.closest?.('details.menu')?.id, id: active.id, tag: active.tagName, name: active.getAttribute('name'), href: active.getAttribute('href') }; | |
| 590 | 595 | for (const f of $$('#diffs details.dfile', page)) if (files.has(f.dataset.file)) f.open = files.get(f.dataset.file); | |
| @@ -600,13 +605,7 @@ window.ermiteMR = (() => { | |||
| 600 | 605 | const oldSHA = $('.hdr .ref .sha'), newSHA = $('.hdr .ref .sha', page); | |
| 601 | 606 | if (oldSHA && newSHA) oldSHA.textContent = newSHA.textContent; | |
| 602 | 607 | page = null; | |
| 603 | - | panels(); | |
| 604 | - | if (tab) { | |
| 605 | - | const oldURL = location.href; | |
| 606 | - | document.getElementById(tab)?.click(); | |
| 607 | - | if (location.href !== oldURL) history.replaceState(history.state, '', oldURL); | |
| 608 | - | } | |
| 609 | - | if ($('#mr-panels')) $('#mr-panels').open = footerOpen; | |
| 608 | + | panels(openPanel); | |
| 610 | 609 | foldFiles(!!folded); | |
| 611 | 610 | if ($('.rail')) $('.rail').scrollTop = railY; | |
| 612 | 611 | if ($('.r-files .files')) $('.r-files .files').scrollTop = filesY; | |
| @@ -315,42 +315,48 @@ window.ermiteMR = (() => { | |||||
| 315 | 315 | ||||
| 316 | // Enhance the ordinary anchor navigation only when scripts are available. | 316 | // Enhance the ordinary anchor navigation only when scripts are available. | ||
| 317 | let disposePanels = () => {}; | 317 | let disposePanels = () => {}; | ||
| 318 | - | function panels() { | 318 | + | // The tabs are disclosure buttons (aria-expanded + aria-controls), not a |
| 319 | + | // tablist: a tablist always has a selected tab, and here every panel can be | |||
| 320 | + | // folded. State: the index of the open panel, or -1 for none. | |||
| 321 | + | function panels(initial = -1) { | |||
| 319 | disposePanels(); | 322 | disposePanels(); | ||
| 320 | - | const footer = $('#mr-panels'), nav = $('[data-mr-tabs]'); | 323 | + | const footer = $('.mr-footer'), nav = $('[data-mr-tabs]'); |
| 321 | if (!footer || !nav) return; | 324 | if (!footer || !nav) return; | ||
| 322 | const tabs = $$('a', nav), panels = $$('[data-mr-panel]', footer); | 325 | const tabs = $$('a', nav), panels = $$('[data-mr-panel]', footer); | ||
| 323 | - | nav.setAttribute('role', 'tablist'); | 326 | + | const ids = new Set(['#mr-commits', '#mr-checks', '#mr-checks-panel']); |
| 324 | - | function select(index, focus = false, fromUser = false) { | 327 | + | let current = -1; |
| 328 | + | // show applies the state; fromUser also keeps the URL fragment in step. | |||
| 329 | + | function show(index, fromUser = false) { | |||
| 330 | + | current = index; | |||
| 325 | tabs.forEach((tab, i) => { | 331 | tabs.forEach((tab, i) => { | ||
| 326 | - | tab.setAttribute('role', 'tab'); | |||
| 327 | tab.setAttribute('aria-controls', panels[i].id); | 332 | tab.setAttribute('aria-controls', panels[i].id); | ||
| 328 | - | tab.setAttribute('aria-selected', String(i === index)); | 333 | + | tab.setAttribute('aria-expanded', String(i === index)); |
| 329 | - | tab.tabIndex = i === index ? 0 : -1; | |||
| 330 | - | panels[i].setAttribute('role', 'tabpanel'); | |||
| 331 | - | panels[i].tabIndex = 0; | |||
| 332 | panels[i].hidden = i !== index; | 334 | panels[i].hidden = i !== index; | ||
| 333 | }); | 335 | }); | ||
| 334 | - | if (focus) tabs[index].focus(); | 336 | + | if (!fromUser) return; |
| 335 | - | if (fromUser && location.hash !== '#' + panels[index].id) history.replaceState(null, '', '#' + panels[index].id); | 337 | + | if (index >= 0) { |
| 338 | + | if (location.hash !== '#' + panels[index].id) history.replaceState(null, '', '#' + panels[index].id); | |||
| 339 | + | } else if (ids.has(location.hash)) { | |||
| 340 | + | history.replaceState(null, '', location.pathname + location.search); | |||
| 341 | + | } | |||
| 336 | } | 342 | } | ||
| 343 | + | const toggle = (i) => show(i === current ? -1 : i, true); | |||
| 337 | tabs.forEach((tab, i) => { | 344 | tabs.forEach((tab, i) => { | ||
| 338 | - | tab.addEventListener('click', (e) => { e.preventDefault(); select(i, false, true); }); | 345 | + | tab.addEventListener('click', (e) => { e.preventDefault(); toggle(i); }); |
| 339 | tab.addEventListener('keydown', (e) => { | 346 | tab.addEventListener('keydown', (e) => { | ||
| 340 | const next = core.tabIndex(e.key, i, tabs.length); | 347 | const next = core.tabIndex(e.key, i, tabs.length); | ||
| 341 | if (next === null) return; | 348 | if (next === null) return; | ||
| 342 | - | e.preventDefault(); select(next, true, true); | 349 | + | e.preventDefault(); tabs[next].focus(); |
| 343 | }); | 350 | }); | ||
| 344 | }); | 351 | }); | ||
| 345 | function hash() { | 352 | function hash() { | ||
| 346 | const h = location.hash; | 353 | const h = location.hash; | ||
| 347 | const index = h === '#mr-checks' || h === '#mr-checks-panel' ? 1 : h === '#mr-commits' ? 0 : -1; | 354 | const index = h === '#mr-checks' || h === '#mr-checks-panel' ? 1 : h === '#mr-commits' ? 0 : -1; | ||
| 348 | - | if (index < 0) return; | 355 | + | if (index >= 0) show(index); |
| 349 | - | footer.open = true; select(index); | |||
| 350 | } | 356 | } | ||
| 351 | - | // A repeated click on the same hash must also reopen a folded footer. | 357 | + | // The checks badge always opens Checks; it never folds it. |
| 352 | const checksClick = (e) => { | 358 | const checksClick = (e) => { | ||
| 353 | - | if (e.target.closest?.('#mr-ck')) { footer.open = true; select(1); } | 359 | + | if (e.target.closest?.('#mr-ck')) show(1); |
| 354 | }; | 360 | }; | ||
| 355 | document.addEventListener('click', checksClick); | 361 | document.addEventListener('click', checksClick); | ||
| 356 | let observer; | 362 | let observer; | ||
| @@ -369,7 +375,7 @@ window.ermiteMR = (() => { | |||||
| 369 | observer.observe(summary.parentElement, { childList: true }); | 375 | observer.observe(summary.parentElement, { childList: true }); | ||
| 370 | sync(); | 376 | sync(); | ||
| 371 | } | 377 | } | ||
| 372 | - | select(0); hash(); | 378 | + | show(initial); hash(); |
| 373 | addEventListener('hashchange', hash); | 379 | addEventListener('hashchange', hash); | ||
| 374 | disposePanels = () => { | 380 | disposePanels = () => { | ||
| 375 | document.removeEventListener?.('click', checksClick); | 381 | document.removeEventListener?.('click', checksClick); | ||
| @@ -583,8 +589,7 @@ window.ermiteMR = (() => { | |||||
| 583 | const files = new Map($$('#diffs details.dfile').map((f) => [f.dataset.file, f.open])); | 589 | const files = new Map($$('#diffs details.dfile').map((f) => [f.dataset.file, f.open])); | ||
| 584 | const folded = $('.r-files')?.hasAttribute('data-folded'); | 590 | const folded = $('.r-files')?.hasAttribute('data-folded'); | ||
| 585 | const railY = $('.rail')?.scrollTop, filesY = $('.r-files .files')?.scrollTop; | 591 | const railY = $('.rail')?.scrollTop, filesY = $('.r-files .files')?.scrollTop; | ||
| 586 | - | const footerOpen = $('#mr-panels')?.open; | 592 | + | const openPanel = $$('[data-mr-tabs] a').findIndex((t) => t.getAttribute('aria-expanded') === 'true'); |
| 587 | - | const tab = $('[data-mr-tabs] [aria-selected="true"]')?.id; | |||
| 588 | const active = document.activeElement; | 593 | const active = document.activeElement; | ||
| 589 | const focus = active && { file: active.closest?.('.files a')?.getAttribute('title'), region: regions.find((sel) => $(sel)?.contains(active)), menu: active.closest?.('details.menu')?.id, id: active.id, tag: active.tagName, name: active.getAttribute('name'), href: active.getAttribute('href') }; | 594 | const focus = active && { file: active.closest?.('.files a')?.getAttribute('title'), region: regions.find((sel) => $(sel)?.contains(active)), menu: active.closest?.('details.menu')?.id, id: active.id, tag: active.tagName, name: active.getAttribute('name'), href: active.getAttribute('href') }; | ||
| 590 | for (const f of $$('#diffs details.dfile', page)) if (files.has(f.dataset.file)) f.open = files.get(f.dataset.file); | 595 | for (const f of $$('#diffs details.dfile', page)) if (files.has(f.dataset.file)) f.open = files.get(f.dataset.file); | ||
| @@ -600,13 +605,7 @@ window.ermiteMR = (() => { | |||||
| 600 | const oldSHA = $('.hdr .ref .sha'), newSHA = $('.hdr .ref .sha', page); | 605 | const oldSHA = $('.hdr .ref .sha'), newSHA = $('.hdr .ref .sha', page); | ||
| 601 | if (oldSHA && newSHA) oldSHA.textContent = newSHA.textContent; | 606 | if (oldSHA && newSHA) oldSHA.textContent = newSHA.textContent; | ||
| 602 | page = null; | 607 | page = null; | ||
| 603 | - | panels(); | 608 | + | panels(openPanel); |
| 604 | - | if (tab) { | |||
| 605 | - | const oldURL = location.href; | |||
| 606 | - | document.getElementById(tab)?.click(); | |||
| 607 | - | if (location.href !== oldURL) history.replaceState(history.state, '', oldURL); | |||
| 608 | - | } | |||
| 609 | - | if ($('#mr-panels')) $('#mr-panels').open = footerOpen; | |||
| 610 | foldFiles(!!folded); | 609 | foldFiles(!!folded); | ||
| 611 | if ($('.rail')) $('.rail').scrollTop = railY; | 610 | if ($('.rail')) $('.rail').scrollTop = railY; | ||
| 612 | if ($('.r-files .files')) $('.r-files .files').scrollTop = filesY; | 611 | if ($('.r-files .files')) $('.r-files .files').scrollTop = filesY; | ||