lib/tutter/action/sppuppet.rb in tutter-sppuppet-1.2.9 vs lib/tutter/action/sppuppet.rb in tutter-sppuppet-1.2.10

@@ -13,10 +13,11 @@
   def initialize(settings, client, project, data, event)
     @settings = settings
     @settings['plus_ones_required'] ||= 1
     @settings['owner_plus_ones_required'] ||= 0
     @settings['owners'] ||= []
+    @delete_branch = @settings['chop_on_merge'] ||= false
     @client = client
     @project = project
     @data = data
     @event = event
   end
@@ -55,10 +56,15 @@
         if @settings['owner_plus_ones_required'] > 0
           owners_required_text = " and at least #{@settings['owner_plus_ones_required']} of the owners "
         else
           owners_required_text = ""
         end
-        comment = @settings['instructions'] || "To merge at least #{@settings['plus_ones_required']} person other than the submitter #{owners_required_text}needs to write a comment containing only _+1_ or :+1:. Then write _!merge_ or :shipit: to trigger merging."
+        instructions_text = "To merge at least #{@settings['plus_ones_required']} person other than " +
+        "the submitter #{owners_required_text}needs to write a comment containing only _+1_ or :+1:.\n" +
+        "Then write _!merge_ or :shipit: to trigger merging.\n" +
+        "Also write :scissors: and tutter will clean up by deleting your branch after merge."
+
+        comment = @settings['instructions'] ||  instructions_text
         return post_comment(issue, comment)
       else
         return 200, 'Not posting instructions'
       end
     else