Skip to content

Commit

Permalink
(maint) Don't fail the commits check on merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Morgan Rhodes committed Sep 2, 2016
1 parent c4c6bad commit 6748f1c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ task(:commits) do
\n\tThis test for the commit summary is case-insensitive.\n\n\n
HEREDOC

if /^\((maint|doc|docs|packaging)\)|revert|bumping/i.match(commit_summary).nil?
if /^\((maint|doc|docs|packaging)\)|revert|bumping|merge/i.match(commit_summary).nil?
ticket = commit_summary.match(/^\(([[:alpha:]]+-[[:digit:]]+)\).*/)
if ticket.nil?
raise error_message
Expand Down

0 comments on commit 6748f1c

Please sign in to comment.