Check un-squashed commits

sanemat · Nov 12, 2014 · 6b5ee78 · 6b5ee78
1 parent c738bd3
commit 6b5ee78
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js
@@ -20,7 +20,11 @@
       } else {
         var isWipTitle = /(\[wip\]|\[do\s*not\s*merge\])/i.test(issueTitle);
         var isWipTaksList = $container.find('.timeline-comment:first input[type="checkbox"]:not(:checked)').length > 0;
-        disabled = (isWipTitle || isWipTaksList);
+        var isSquashCommits = false;
+        $container.find('#commits_bucket .commit .commit-title').each(function(i, elem){
+          isSquashCommits = isSquashCommits || $(elem).text().match(/^\s*(squash|fixup)!\s/);
+        });
+        disabled = (isWipTitle || isWipTaksList || isSquashCommits);
         buttonHtml = '<span class="octicon octicon-git-merge"></span> ' + (disabled ? 'WIP! You can\'t merge!' : 'Merge pull request');
       }