From 3da6c4134510f77556382c982713ae35b787ac5a Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Wed, 20 Nov 2013 13:10:43 -0500 Subject: [PATCH] Use the new !avatar syntax in our git integration. (imported from commit e00bc63f6fb1944ed206b3ede5431ac2b1ae1ac2) --- bots/zulip_git_config.py | 4 ++-- integrations/git/post-receive | 2 +- integrations/git/zulip_git_config.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bots/zulip_git_config.py b/bots/zulip_git_config.py index 6727ea2..a93c67c 100644 --- a/bots/zulip_git_config.py +++ b/bots/zulip_git_config.py @@ -34,9 +34,9 @@ def commit_notice_destination(repo, branch, commit): # common customization is to include a link to the commit in your # graphical repository viewer, e.g. # -# return '!gravatar(%s) [%s](https://example.com/commits/%s)\n' % (author, subject, commit_id) +# return '!avatar(%s) [%s](https://example.com/commits/%s)\n' % (author, subject, commit_id) def format_commit_message(author, subject, commit_id): - return '!gravatar(%s) [%s](https://git.zulip.net/eng/zulip/commit/%s)\n' % (author, subject, commit_id) + return '!avatar(%s) [%s](https://git.zulip.net/eng/zulip/commit/%s)\n' % (author, subject, commit_id) ZULIP_API_PATH = "/home/zulip/zulip/api" ZULIP_SITE = "https://staging.zulip.com" diff --git a/integrations/git/post-receive b/integrations/git/post-receive index e58b116..0cb5ffe 100755 --- a/integrations/git/post-receive +++ b/integrations/git/post-receive @@ -77,7 +77,7 @@ def git_commit_range(oldrev, newrev): if hasattr(config, "format_commit_message"): commits += config.format_commit_message(author_email, subject, commit_id) else: - commits += '!gravatar(%s) %s\n' % (author_email, subject) + commits += '!avatar(%s) %s\n' % (author_email, subject) return commits def send_bot_message(oldrev, newrev, refname): diff --git a/integrations/git/zulip_git_config.py b/integrations/git/zulip_git_config.py index e2f8d88..2f00ba9 100644 --- a/integrations/git/zulip_git_config.py +++ b/integrations/git/zulip_git_config.py @@ -53,9 +53,9 @@ def commit_notice_destination(repo, branch, commit): # common customization is to include a link to the commit in your # graphical repository viewer, e.g. # -# return '!gravatar(%s) [%s](https://example.com/commits/%s)\n' % (author, subject, commit_id) +# return '!avatar(%s) [%s](https://example.com/commits/%s)\n' % (author, subject, commit_id) def format_commit_message(author, subject, commit_id): - return '!gravatar(%s) %s\n' % (author, subject) + return '!avatar(%s) %s\n' % (author, subject) ## If properly installed, the Zulip API should be in your import ## path, but if not, set a custom path below