Merge remote-tracking branch 'is_derek/bug405_email_notifications_for_comments' into notifications-merge

Conflicts: mediagoblin/db/mongo/migrations.py
2012-06-10 15:53:46 +02:00
parent a855e92a98 fa72e51689
commit 879ff4bde6
9 changed files with 143 additions and 30 deletions
--- a/mediagoblin/tests/test_edit.py
+++ b/mediagoblin/tests/test_edit.py
@@ -37,6 +37,7 @@ def test_change_password(test_app):
        '/edit/account/', {
            'old_password': 'toast',
            'new_password': '123456',
+            'wants_comment_notification': 'y'
            })

    # test_user has to be fetched again in order to have the current values