Dev age implementation - [merged]

[Togtja]

In GitLab by @Leonnc on Mar 31, 2020, 13:03

_Merges dev_ageimplementation -> master

Adds a sensible implementation of death by old age and a preliminary implementation of the effect of age on fertility.

[Togtja]

In GitLab by @tomashb on Mar 31, 2020, 13:18

Move to own view

[Togtja]

In GitLab by @tomashb on Mar 31, 2020, 13:18

Remove as pregnancy branch will deal with this

[Togtja]

In GitLab by @Leonnc on Mar 31, 2020, 13:24

changed this line in version 2 of the diff

[Togtja]

In GitLab by @Leonnc on Mar 31, 2020, 13:24

changed this line in version 2 of the diff

[Togtja]

In GitLab by @Leonnc on Mar 31, 2020, 13:24

added 56 commits

• 9aeda8fd...a4bf19c8 - 53 commits from branch master
• b5da2945 - #103 Fix merge conflicts
• 6a55dba8 - #103 Moved Age into it's own view for now
• 74a8a4f1 - #103 Revert changes to reproduction system in expectation of upcoming changes to pregnancies

Compare with previous version

[Togtja]

In GitLab by @tomashb on Mar 31, 2020, 13:25

approved this merge request

[Togtja]

In GitLab by @tomashb on Mar 31, 2020, 13:25

enabled an automatic merge when the pipeline for 74a8a4f1d3d6e24bc3afdd5c44bd4804e412f98a succeeds

[Togtja]

In GitLab by @Leonnc on Mar 31, 2020, 14:49

aborted the automatic merge because source branch was updated

[Togtja]

In GitLab by @Leonnc on Mar 31, 2020, 14:49

added 1 commit

• ef1896b6 - #103 Fix issue with using view instead of age_view

Compare with previous version

[Togtja]

In GitLab by @tomashb on Apr 1, 2020, 09:06

approved this merge request

[Togtja]

In GitLab by @tomashb on Apr 1, 2020, 09:06

merged

[Togtja]

In GitLab by @tomashb on Apr 1, 2020, 09:06

mentioned in commit 5183e832e6d1c6aafe81d867c7e66fa82261df15