{"action":"created","comment":{"url":"https://api.github.com/repos/brack3t/Djrill/pulls/comments/34531565","id":34531565,"diff_hunk":"@@ -241,11 +249,16 @@ def _add_mandrill_options(self, message, msg_dict):\n             msg_dict['subaccount'] = self.subaccount\n \n         for attr in mandrill_attrs:\n+            if attr in self.global_settings:\n+                msg_dict[attr] = self.global_settings[attr]\n             if hasattr(message, attr):\n                 msg_dict[attr] = getattr(message, attr)\n \n         # Allow simple python dicts in place of Mandrill\n         # [{name:name, value:value},...] arrays...\n+        if 'global_merge_vars' in self.global_settings:\n+            msg_dict['global_merge_vars'] = self._expand_merge_vars(\n+                self.global_settings['global_merge_vars'])\n         if hasattr(message, 'global_merge_vars'):","path":"djrill/mail/backends/djrill.py","position":36,"original_position":36,"commit_id":"6a8d890eef611a7fa3b1de1a23e03e55a8cc7f54","original_commit_id":"6a8d890eef611a7fa3b1de1a23e03e55a8cc7f54","user":{"login":"Wrhector","id":1678584,"avatar_url":"https://avatars.githubusercontent.com/u/1678584?v=3","gravatar_id":"","url":"https://api.github.com/users/Wrhector","html_url":"https://github.com/Wrhector","followers_url":"https://api.github.com/users/Wrhector/followers","following_url":"https://api.github.com/users/Wrhector/following{/other_user}","gists_url":"https://api.github.com/users/Wrhector/gists{/gist_id}","starred_url":"https://api.github.com/users/Wrhector/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Wrhector/subscriptions","organizations_url":"https://api.github.com/users/Wrhector/orgs","repos_url":"https://api.github.com/users/Wrhector/repos","events_url":"https://api.github.com/users/Wrhector/events{/privacy}","received_events_url":"https://api.github.com/users/Wrhector/received_events","type":"User","site_admin":false},"body":"OK I'll add that in","created_at":"2015-07-14T01:59:08Z","updated_at":"2015-07-14T01:59:08Z","html_url":"https://github.com/brack3t/Djrill/pull/99#discussion_r34531565","pull_request_url":"https://api.github.com/repos/brack3t/Djrill/pulls/99","_links":{"self":{"href":"https://api.github.com/repos/brack3t/Djrill/pulls/comments/34531565"},"html":{"href":"https://github.com/brack3t/Djrill/pull/99#discussion_r34531565"},"pull_request":{"href":"https://api.github.com/repos/brack3t/Djrill/pulls/99"}}},"pull_request":{"url":"https://api.github.com/repos/brack3t/Djrill/pulls/99","id":39754624,"html_url":"https://github.com/brack3t/Djrill/pull/99","diff_url":"https://github.com/brack3t/Djrill/pull/99.diff","patch_url":"https://github.com/brack3t/Djrill/pull/99.patch","issue_url":"https://api.github.com/repos/brack3t/Djrill/issues/99","number":99,"state":"open","locked":false,"title":"Allow Mandrill specific options to be set globally in the settings file.","user":{"login":"Wrhector","id":1678584,"avatar_url":"https://avatars.githubusercontent.com/u/1678584?v=3","gravatar_id":"","url":"https://api.github.com/users/Wrhector","html_url":"https://github.com/Wrhector","followers_url":"https://api.github.com/users/Wrhector/followers","following_url":"https://api.github.com/users/Wrhector/following{/other_user}","gists_url":"https://api.github.com/users/Wrhector/gists{/gist_id}","starred_url":"https://api.github.com/users/Wrhector/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Wrhector/subscriptions","organizations_url":"https://api.github.com/users/Wrhector/orgs","repos_url":"https://api.github.com/users/Wrhector/repos","events_url":"https://api.github.com/users/Wrhector/events{/privacy}","received_events_url":"https://api.github.com/users/Wrhector/received_events","type":"User","site_admin":false},"body":"This is useful to set options such as tracking_domain etc per instance when using subaccounts with Mandrill.","created_at":"2015-07-12T00:24:38Z","updated_at":"2015-07-14T01:59:08Z","closed_at":null,"merged_at":null,"merge_commit_sha":"6eb902a776af43dfdd2b18e245c521057de46edd","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/brack3t/Djrill/pulls/99/commits","review_comments_url":"https://api.github.com/repos/brack3t/Djrill/pulls/99/comments","review_comment_url":"https://api.github.com/repos/brack3t/Djrill/pulls/comments{/number}","comments_url":"https://api.github.com/repos/brack3t/Djrill/issues/99/comments","statuses_url":"https://api.github.com/repos/brack3t/Djrill/statuses/6a8d890eef611a7fa3b1de1a23e03e55a8cc7f54","head":{"label":"Wrhector:v2.0-dev3","ref":"v2.0-dev3","sha":"6a8d890eef611a7fa3b1de1a23e03e55a8cc7f54","user":{"login":"Wrhector","id":1678584,"avatar_url":"https://avatars.githubusercontent.com/u/1678584?v=3","gravatar_id":"","url":"https://api.github.com/users/Wrhector","html_url":"https://github.com/Wrhector","followers_url":"https://api.github.com/users/Wrhector/followers","following_url":"https://api.github.com/users/Wrhector/following{/other_user}","gists_url":"https://api.github.com/users/Wrhector/gists{/gist_id}","starred_url":"https://api.github.com/users/Wrhector/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Wrhector/subscriptions","organizations_url":"https://api.github.com/users/Wrhector/orgs","repos_url":"https://api.github.com/users/Wrhector/repos","events_url":"https://api.github.com/users/Wrhector/events{/privacy}","received_events_url":"https://api.github.com/users/Wrhector/received_events","type":"User","site_admin":false},"repo":{"id":38938944,"name":"Djrill","full_name":"Wrhector/Djrill","owner":{"login":"Wrhector","id":1678584,"avatar_url":"https://avatars.githubusercontent.com/u/1678584?v=3","gravatar_id":"","url":"https://api.github.com/users/Wrhector","html_url":"https://github.com/Wrhector","followers_url":"https://api.github.com/users/Wrhector/followers","following_url":"https://api.github.com/users/Wrhector/following{/other_user}","gists_url":"https://api.github.com/users/Wrhector/gists{/gist_id}","starred_url":"https://api.github.com/users/Wrhector/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Wrhector/subscriptions","organizations_url":"https://api.github.com/users/Wrhector/orgs","repos_url":"https://api.github.com/users/Wrhector/repos","events_url":"https://api.github.com/users/Wrhector/events{/privacy}","received_events_url":"https://api.github.com/users/Wrhector/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/Wrhector/Djrill","description":"Djrill is an email backend and new message class for Django users that want to take advantage of the Mandrill transactional email service from MailChimp.","fork":true,"url":"https://api.github.com/repos/Wrhector/Djrill","forks_url":"https://api.github.com/repos/Wrhector/Djrill/forks","keys_url":"https://api.github.com/repos/Wrhector/Djrill/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Wrhector/Djrill/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Wrhector/Djrill/teams","hooks_url":"https://api.github.com/repos/Wrhector/Djrill/hooks","issue_events_url":"https://api.github.com/repos/Wrhector/Djrill/issues/events{/number}","events_url":"https://api.github.com/repos/Wrhector/Djrill/events","assignees_url":"https://api.github.com/repos/Wrhector/Djrill/assignees{/user}","branches_url":"https://api.github.com/repos/Wrhector/Djrill/branches{/branch}","tags_url":"https://api.github.com/repos/Wrhector/Djrill/tags","blobs_url":"https://api.github.com/repos/Wrhector/Djrill/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Wrhector/Djrill/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Wrhector/Djrill/git/refs{/sha}","trees_url":"https://api.github.com/repos/Wrhector/Djrill/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Wrhector/Djrill/statuses/{sha}","languages_url":"https://api.github.com/repos/Wrhector/Djrill/languages","stargazers_url":"https://api.github.com/repos/Wrhector/Djrill/stargazers","contributors_url":"https://api.github.com/repos/Wrhector/Djrill/contributors","subscribers_url":"https://api.github.com/repos/Wrhector/Djrill/subscribers","subscription_url":"https://api.github.com/repos/Wrhector/Djrill/subscription","commits_url":"https://api.github.com/repos/Wrhector/Djrill/commits{/sha}","git_commits_url":"https://api.github.com/repos/Wrhector/Djrill/git/commits{/sha}","comments_url":"https://api.github.com/repos/Wrhector/Djrill/comments{/number}","issue_comment_url":"https://api.github.com/repos/Wrhector/Djrill/issues/comments{/number}","contents_url":"https://api.github.com/repos/Wrhector/Djrill/contents/{+path}","compare_url":"https://api.github.com/repos/Wrhector/Djrill/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Wrhector/Djrill/merges","archive_url":"https://api.github.com/repos/Wrhector/Djrill/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Wrhector/Djrill/downloads","issues_url":"https://api.github.com/repos/Wrhector/Djrill/issues{/number}","pulls_url":"https://api.github.com/repos/Wrhector/Djrill/pulls{/number}","milestones_url":"https://api.github.com/repos/Wrhector/Djrill/milestones{/number}","notifications_url":"https://api.github.com/repos/Wrhector/Djrill/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Wrhector/Djrill/labels{/name}","releases_url":"https://api.github.com/repos/Wrhector/Djrill/releases{/id}","created_at":"2015-07-11T20:09:10Z","updated_at":"2015-07-11T20:09:10Z","pushed_at":"2015-07-12T00:52:09Z","git_url":"git://github.com/Wrhector/Djrill.git","ssh_url":"git@github.com:Wrhector/Djrill.git","clone_url":"https://github.com/Wrhector/Djrill.git","svn_url":"https://github.com/Wrhector/Djrill","homepage":"","size":458,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"brack3t:v2.0-dev","ref":"v2.0-dev","sha":"da260de1a0502f39311c60032ad32a2af00f6c6e","user":{"login":"brack3t","id":1328728,"avatar_url":"https://avatars.githubusercontent.com/u/1328728?v=3","gravatar_id":"","url":"https://api.github.com/users/brack3t","html_url":"https://github.com/brack3t","followers_url":"https://api.github.com/users/brack3t/followers","following_url":"https://api.github.com/users/brack3t/following{/other_user}","gists_url":"https://api.github.com/users/brack3t/gists{/gist_id}","starred_url":"https://api.github.com/users/brack3t/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/brack3t/subscriptions","organizations_url":"https://api.github.com/users/brack3t/orgs","repos_url":"https://api.github.com/users/brack3t/repos","events_url":"https://api.github.com/users/brack3t/events{/privacy}","received_events_url":"https://api.github.com/users/brack3t/received_events","type":"Organization","site_admin":false},"repo":{"id":3193719,"name":"Djrill","full_name":"brack3t/Djrill","owner":{"login":"brack3t","id":1328728,"avatar_url":"https://avatars.githubusercontent.com/u/1328728?v=3","gravatar_id":"","url":"https://api.github.com/users/brack3t","html_url":"https://github.com/brack3t","followers_url":"https://api.github.com/users/brack3t/followers","following_url":"https://api.github.com/users/brack3t/following{/other_user}","gists_url":"https://api.github.com/users/brack3t/gists{/gist_id}","starred_url":"https://api.github.com/users/brack3t/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/brack3t/subscriptions","organizations_url":"https://api.github.com/users/brack3t/orgs","repos_url":"https://api.github.com/users/brack3t/repos","events_url":"https://api.github.com/users/brack3t/events{/privacy}","received_events_url":"https://api.github.com/users/brack3t/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/brack3t/Djrill","description":"Djrill is an email backend and new message class for Django users that want to take advantage of the Mandrill transactional email service from MailChimp.","fork":false,"url":"https://api.github.com/repos/brack3t/Djrill","forks_url":"https://api.github.com/repos/brack3t/Djrill/forks","keys_url":"https://api.github.com/repos/brack3t/Djrill/keys{/key_id}","collaborators_url":"https://api.github.com/repos/brack3t/Djrill/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/brack3t/Djrill/teams","hooks_url":"https://api.github.com/repos/brack3t/Djrill/hooks","issue_events_url":"https://api.github.com/repos/brack3t/Djrill/issues/events{/number}","events_url":"https://api.github.com/repos/brack3t/Djrill/events","assignees_url":"https://api.github.com/repos/brack3t/Djrill/assignees{/user}","branches_url":"https://api.github.com/repos/brack3t/Djrill/branches{/branch}","tags_url":"https://api.github.com/repos/brack3t/Djrill/tags","blobs_url":"https://api.github.com/repos/brack3t/Djrill/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/brack3t/Djrill/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/brack3t/Djrill/git/refs{/sha}","trees_url":"https://api.github.com/repos/brack3t/Djrill/git/trees{/sha}","statuses_url":"https://api.github.com/repos/brack3t/Djrill/statuses/{sha}","languages_url":"https://api.github.com/repos/brack3t/Djrill/languages","stargazers_url":"https://api.github.com/repos/brack3t/Djrill/stargazers","contributors_url":"https://api.github.com/repos/brack3t/Djrill/contributors","subscribers_url":"https://api.github.com/repos/brack3t/Djrill/subscribers","subscription_url":"https://api.github.com/repos/brack3t/Djrill/subscription","commits_url":"https://api.github.com/repos/brack3t/Djrill/commits{/sha}","git_commits_url":"https://api.github.com/repos/brack3t/Djrill/git/commits{/sha}","comments_url":"https://api.github.com/repos/brack3t/Djrill/comments{/number}","issue_comment_url":"https://api.github.com/repos/brack3t/Djrill/issues/comments{/number}","contents_url":"https://api.github.com/repos/brack3t/Djrill/contents/{+path}","compare_url":"https://api.github.com/repos/brack3t/Djrill/compare/{base}...{head}","merges_url":"https://api.github.com/repos/brack3t/Djrill/merges","archive_url":"https://api.github.com/repos/brack3t/Djrill/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/brack3t/Djrill/downloads","issues_url":"https://api.github.com/repos/brack3t/Djrill/issues{/number}","pulls_url":"https://api.github.com/repos/brack3t/Djrill/pulls{/number}","milestones_url":"https://api.github.com/repos/brack3t/Djrill/milestones{/number}","notifications_url":"https://api.github.com/repos/brack3t/Djrill/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/brack3t/Djrill/labels{/name}","releases_url":"https://api.github.com/repos/brack3t/Djrill/releases{/id}","created_at":"2012-01-16T20:08:12Z","updated_at":"2015-07-13T18:47:08Z","pushed_at":"2015-07-13T23:21:40Z","git_url":"git://github.com/brack3t/Djrill.git","ssh_url":"git@github.com:brack3t/Djrill.git","clone_url":"https://github.com/brack3t/Djrill.git","svn_url":"https://github.com/brack3t/Djrill","homepage":"","size":1056,"stargazers_count":289,"watchers_count":289,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":54,"mirror_url":null,"open_issues_count":8,"forks":54,"open_issues":8,"watchers":289,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/brack3t/Djrill/pulls/99"},"html":{"href":"https://github.com/brack3t/Djrill/pull/99"},"issue":{"href":"https://api.github.com/repos/brack3t/Djrill/issues/99"},"comments":{"href":"https://api.github.com/repos/brack3t/Djrill/issues/99/comments"},"review_comments":{"href":"https://api.github.com/repos/brack3t/Djrill/pulls/99/comments"},"review_comment":{"href":"https://api.github.com/repos/brack3t/Djrill/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/brack3t/Djrill/pulls/99/commits"},"statuses":{"href":"https://api.github.com/repos/brack3t/Djrill/statuses/6a8d890eef611a7fa3b1de1a23e03e55a8cc7f54"}}}}