Skip to content

Commit

Permalink
Build of develop from Sat Feb 3 17:11:15 UTC 2024
Browse files Browse the repository at this point in the history
  • Loading branch information
opencastproject committed Feb 3, 2024
1 parent 28031b3 commit 4f912ce
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 22 deletions.
2 changes: 1 addition & 1 deletion develop/admin/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -796,5 +796,5 @@ <h2 id="release-documentation">Release Documentation</h2>
</html>
<!--
MkDocs version : 1.5.3
Build Date UTC : 2024-01-31 14:05:39.388619+00:00
Build Date UTC : 2024-02-03 17:11:01.847798+00:00
-->
Binary file modified develop/admin/sitemap.xml.gz
Binary file not shown.
23 changes: 5 additions & 18 deletions develop/commit
Original file line number Diff line number Diff line change
@@ -1,20 +1,7 @@
commit d9bb7c0a2695d2eccb30ff88196d4456170b8830
Author: Julian Kniephoff <[email protected]>
Date: Wed Jan 31 15:05:08 2024 +0100
commit 85cc6ab12cdbdb4761645ff8b11adeeb608e685d
Author: Greg Logan <[email protected]>
Date: Sat Feb 3 11:10:37 2024 -0600

Hint at how to properly close issues with pull requests (#5257)
Update governance.md

Mentioning issues in your PR with some magic keywords can automatically
close these issues when the PR is merged. We even hint at this in our
PR-template already.

However, GitHubs implementation of this does not work super well with
our release/branching model. Specifically, it only works if the PR is
merged into the default branch, which is `develop` in our case.

It **can** be made to work in our situation if the magic phrases are
mentioned in commit messages alternatively or in addition to the PR
description, because we regularly forward merge the release branches.

This patch adds a corresponding note about this to the documentation,
and links it in the PR template.
Fixing Lars' employer
2 changes: 1 addition & 1 deletion develop/developer/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -422,5 +422,5 @@ <h1 id="opencast-development-guides">Opencast Development Guides</h1>
</html>
<!--
MkDocs version : 1.5.3
Build Date UTC : 2024-01-31 14:05:40.908252+00:00
Build Date UTC : 2024-02-03 17:11:03.325928+00:00
-->
2 changes: 1 addition & 1 deletion develop/developer/participate/governance/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ <h2 id="current-board">Current board</h2>
<li>Stephen Marquard, University of Cape Town</li>
<li>Carlos Turró Ribalta, Universitat Politécnica de Valencia</li>
<li>Rüdiger Rolf, Osnabrück University</li>
<li>Lars Kiesow, ELAN e.V.</li>
<li>Lars Kiesow, Osnabrück University</li>
<li>Matthew Coupe, University of Manchester</li>
</ul>

Expand Down
2 changes: 1 addition & 1 deletion develop/developer/search/search_index.json

Large diffs are not rendered by default.

Binary file modified develop/developer/sitemap.xml.gz
Binary file not shown.

0 comments on commit 4f912ce

Please sign in to comment.