Improve contributed project and commit calendar selection.

Fixes #2024.

See merge request !1554