Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/hydra
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b15288bea4cd
Choose a base ref
...
head repository: NixOS/hydra
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b7c42a38a3de
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 15, 2018

  1. jobset view: jump back to the proper tab when displaying all failed j… 

    …obsets

When I press "n builds omitted" I get back to the first tab of a jobset.
This is extremely counter-intuitive, instead this notice should link to
the currently opened tab.
    @Ma27
    Ma27 committed Jul 15, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    37d35ac View commit details

Commits on Sep 6, 2018

  1. Merge pull request #575 from Ma27/fix-tab-jobset-view 

    jobset view: jump back to the proper tab when displaying all failed jobsets
    @edolstra
    edolstra authored Sep 6, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b7c42a3 View commit details
Showing with 9 additions and 9 deletions.
  1. +9 −9 src/root/jobset-eval.tt
18 changes: 9 additions & 9 deletions src/root/jobset-eval.tt
View file
Original file line number Diff line number Diff line change
@@ -96,27 +96,27 @@ c.uri_for(c.controller('JobsetEval').action_for('view'),
[% INCLUDE renderBuildListBody builds=builds.slice(0, (size > max ? max : size) - 1)
hideProjectName=1 hideJobsetName=1 busy=0 %]
[% IF size > max; params = c.req.params; params.full = 1 %]
<tr><td class="centered" colspan="6"><a href="[% c.uri_for(c.controller('JobsetEval').action_for('view'), [eval.id], params) %]"><em>([% size - max %] more builds omitted)</em></a></td></tr>
<tr><td class="centered" colspan="6"><a href="[% c.uri_for(c.controller('JobsetEval').action_for('view'), [eval.id], params) %][% tabname %]"><em>([% size - max %] more builds omitted)</em></a></td></tr>
[% END %]
[% INCLUDE renderBuildListFooter %]
[% END %]

<div class="tab-content">

<div id="tabs-aborted" class="tab-pane">
[% INCLUDE renderSome builds=aborted %]
[% INCLUDE renderSome builds=aborted tabname="#tabs-aborted" %]
</div>

<div id="tabs-now-fail" class="tab-pane">
[% INCLUDE renderSome builds=nowFail %]
[% INCLUDE renderSome builds=nowFail tabname="#tabs-now-fail" %]
</div>

<div id="tabs-now-succeed" class="tab-pane">
[% INCLUDE renderSome builds=nowSucceed %]
[% INCLUDE renderSome builds=nowSucceed tabname="#tabs-now-succeed" %]
</div>

<div id="tabs-new" class="tab-pane">
[% INCLUDE renderSome builds=new %]
[% INCLUDE renderSome builds=new tabname="#tabs-new" %]
</div>

<div id="tabs-removed" class="tab-pane">
@@ -133,22 +133,22 @@ c.uri_for(c.controller('JobsetEval').action_for('view'),
</tr>
[% END %]
[% IF size > max; params = c.req.params; params.full = 1 %]
<tr><td class="centered" colspan="2"><a href="[% c.uri_for(c.controller('JobsetEval').action_for('view'), [eval.id], params) %]"><em>([% size - max %] more jobs omitted)</em></a></td></tr>
<tr><td class="centered" colspan="2"><a href="[% c.uri_for(c.controller('JobsetEval').action_for('view'), [eval.id], params) %]#tabs-removed"><em>([% size - max %] more jobs omitted)</em></a></td></tr>
[% END %]
</tbody>
</table>
</div>

<div id="tabs-still-fail" class="tab-pane">
[% INCLUDE renderSome builds=stillFail %]
[% INCLUDE renderSome builds=stillFail tabname="#tabs-still-fail" %]
</div>

<div id="tabs-still-succeed" class="tab-pane">
[% INCLUDE renderSome builds=stillSucceed %]
[% INCLUDE renderSome builds=stillSucceed tabname="#tabs-still-succeed" %]
</div>

<div id="tabs-unfinished" class="tab-pane">
[% INCLUDE renderSome builds=unfinished %]
[% INCLUDE renderSome builds=unfinished tabname="#tabs-unfinished" %]
</div>

<div id="tabs-inputs" class="tab-pane">