summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--changelog-dev.hbs17
-rw-r--r--changelog-master.hbs11
2 files changed, 22 insertions, 6 deletions
diff --git a/changelog-dev.hbs b/changelog-dev.hbs
index d41d60284..15469d6cd 100644
--- a/changelog-dev.hbs
+++ b/changelog-dev.hbs
@@ -1,8 +1,15 @@
From newest to oldest:
{{#each releases}}
- {{#if @first}}
- {{#each commits}}
- - {{subject}}{{#if href}} [{{shorthash}}]({{href}}){{/if}}
- {{/each}}
- {{/if}}
+ {{#each merges}}
+ -
+ {{message}}{{#if href}} [#{{id}}]({{href}}){{/if}}
+ {{/each}}
+ {{#each fixes}}
+ -
+ {{commit.subject}}{{#if href}} [#{{id}}]({{href}}){{/if}}
+ {{/each}}
+ {{#each commits}}
+ -
+ {{subject}}{{#if href}} [{{shorthash}}]({{href}}){{/if}}
+ {{/each}}
{{/each}} \ No newline at end of file
diff --git a/changelog-master.hbs b/changelog-master.hbs
index aa1ae4e1d..15469d6cd 100644
--- a/changelog-master.hbs
+++ b/changelog-master.hbs
@@ -1,6 +1,15 @@
From newest to oldest:
{{#each releases}}
+ {{#each merges}}
+ -
+ {{message}}{{#if href}} [#{{id}}]({{href}}){{/if}}
+ {{/each}}
+ {{#each fixes}}
+ -
+ {{commit.subject}}{{#if href}} [#{{id}}]({{href}}){{/if}}
+ {{/each}}
{{#each commits}}
- - {{subject}}{{#if href}} [{{shorthash}}]({{href}}){{/if}}
+ -
+ {{subject}}{{#if href}} [{{shorthash}}]({{href}}){{/if}}
{{/each}}
{{/each}} \ No newline at end of file