Merge pull request #464 from ZcashFoundation/develop

Release 1.5

backend/grant/email/send.py

@@ -85,6 +85,8 @@ def proposal_rejected(email_args):
 
 
 def proposal_contribution(email_args):
+    if email_args['contribution'].private:
+        email_args['contributor'] = None
     return {
         'subject': 'You just got a contribution!',
         'title': 'You just got a contribution',

backend/grant/user/views.py

@@ -122,6 +122,7 @@ def create_user(
 
 
 @blueprint.route("/auth", methods=["POST"])
+@limiter.limit("30/hour;5/minute")
 @body({
     "email": fields.Str(required=True),
     "password": fields.Str(required=True)