From 81fe519b24ac4e9c4e9dae85212e725df97d1bc2 Mon Sep 17 00:00:00 2001 From: Zev Benjamin Date: Wed, 28 Nov 2012 14:34:10 -0500 Subject: [PATCH] github hooks: Display different actions for pull requests sanely (imported from commit c6d43ccff2d72f61a1cc4d8d320db56edd074832) --- zephyr/views.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zephyr/views.py b/zephyr/views.py index bf937bfbbe..a45fe128c1 100644 --- a/zephyr/views.py +++ b/zephyr/views.py @@ -926,9 +926,10 @@ def api_github_landing(request, user_profile, event=POST, subject = "%s: pull request %d" % (repository['name'], pull_req['number']) - content = ("New [pull request](%s) from %s:\n\n %s\n\n> %s" - % (pull_req['html_url'], - pull_req['user']['login'], + content = ("Pull request from %s [%s](%s):\n\n %s\n\n> %s" + % (pull_req['user']['login'], + payload['action'], + pull_req['html_url'], pull_req['title'], pull_req['body'])) elif event == 'push':