diff --git a/ansibullbot/triagers/ansible.py b/ansibullbot/triagers/ansible.py index 1686a739d..c1aefe270 100644 --- a/ansibullbot/triagers/ansible.py +++ b/ansibullbot/triagers/ansible.py @@ -806,18 +806,6 @@ def create_actions(self, iw, actions): if u'needs_triage' not in actions.unlabel: actions.unlabel.append(u'needs_triage') - # Thank submitter - if iw.created_at > datetime.datetime(2018, 10, 11): # before, PR could already have been thanked - previous_comment = iw.history.last_date_for_boilerplate(u'thank_submitter') - if not previous_comment: - tvars = { - u'submitter': iw.submitter, - u'is_pullrequest': iw.is_pullrequest(), - } - comment = self.render_boilerplate(tvars, boilerplate=u'thank_submitter') - if comment not in actions.comments: - actions.comments.insert(0, comment) # thank should be first comment - # owner PRs if iw.is_pullrequest(): if self.meta[u'owner_pr']: diff --git a/templates/issue_missing_data.j2 b/templates/issue_missing_data.j2 index b7be5ee2d..afc77c449 100644 --- a/templates/issue_missing_data.j2 +++ b/templates/issue_missing_data.j2 @@ -1,4 +1,4 @@ -@{{ submitter }}: in order for the community to handle your {{ itype }} effectively, we need a bit more information. +@{{ submitter }}: Greetings! Thanks for taking the time to open this {{ itype }}. In order for the community to handle your {{ itype }} effectively, we need a bit more information. Here are the items we could not find in your description: {% for item in missing_sections %} diff --git a/templates/thank_submitter.j2 b/templates/thank_submitter.j2 deleted file mode 100644 index d8aae9c56..000000000 --- a/templates/thank_submitter.j2 +++ /dev/null @@ -1,4 +0,0 @@ -Hi @{{ submitter }}, thank you for submitting this {% if is_pullrequest %}pull-request{% else %}issue{% endif %}! - -[click here for bot help](https://github.com/ansible/ansibullbot/blob/master/ISSUE_HELP.md) -