Merge branch 'master' into release

ampproject · Nov 19, 2015 · 42787e9 · 42787e9
2 parents 3ee1f5b + 2099650
commit 42787e9
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/build-system/tasks/changelog.js b/build-system/tasks/changelog.js
@@ -205,9 +205,15 @@ function onGitTagSuccess(gitMetadata, tag) {
 
 function onGitLogSuccess(gitMetadata, logs) {
   var commits = logs.split('\n');
-  return commits.map(function(commit) {
-    return commit.split(' ')[3].slice(1);
-  });
+  return commits
+    .filter(function(commit) {
+      // filter non Pull request merges
+      return commit.indexOf('Merge pull') == 0;
+    })
+    .map(function(commit) {
+      // We only need the PR id
+      return commit.split(' ')[3].slice(1);
+    });
 }
 
 function errHandler(err) {