Skip to content

Commit

Permalink
Merge add-after-merge-plugin-hook (#129) into master
Browse files Browse the repository at this point in the history
Plugins: create after_merge invocation stage

After merging, we want to remove certain labels... this makes that possible
  • Loading branch information
xiongchiamiov committed Aug 27, 2014
2 parents 4e17a22 + 8b4adb3 commit 34d5861
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions bin/feature
Expand Up @@ -215,6 +215,8 @@ when 'merge'
"git branch -d \"#{feature}\""
])

Plugins.invoke :after_merge, :feature, feature

puts
puts "Successfully merged feature-branch: #{feature} into #{dev_branch}"
puts "If you are satisfied with the result, do this:\n" + <<CMDS
Expand Down
2 changes: 2 additions & 0 deletions bin/hotfix
Expand Up @@ -204,6 +204,8 @@ when 'merge'
"git checkout #{stable_branch}"
])

Plugins.invoke :after_merge, :hotfix, hotfix

puts "Successfully merged hotfix branch: #{hotfix} into #{stable_branch} and #{dev_branch}"
puts "If you are satisfied with the result, do this:\n" + <<CMDS
git push
Expand Down

0 comments on commit 34d5861

Please sign in to comment.