paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 13:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply Python 3 futurize transform lib2to3.fixes.fix_ws_comma.

Browse Source
This commit is contained in:
Tim Abbott
2015-11-01 08:10:46 -08:00
parent 2b61c0203d
commit 43abd83d1c
15 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zproject/urls.py
View File

@@ -32,7 +32,7 @@ urlpatterns = patterns('',
url(r'^accounts/webathena_kerberos_login/', 'zerver.views.webathena_kerberos_login'),
url(r'^accounts/password/reset/$', 'django.contrib.auth.views.password_reset',
{'post_reset_redirect' : '/accounts/password/reset/done/',
{'post_reset_redirect': '/accounts/password/reset/done/',
'template_name': 'zerver/reset.html',
'email_template_name': 'registration/password_reset_email.txt',
}),
@@ -157,7 +157,7 @@ urlpatterns += patterns('zerver.views',
url(r'^api/v1/fetch_google_client_id$', 'api_fetch_google_client_id'),
# These are integration-specific web hook callbacks
url(r'^api/v1/external/beanstalk$' , 'webhooks.api_beanstalk_webhook'),
url(r'^api/v1/external/beanstalk$', 'webhooks.api_beanstalk_webhook'),
url(r'^api/v1/external/github$', 'webhooks.api_github_landing'),
url(r'^api/v1/external/jira$', 'webhooks.api_jira_webhook'),
url(r'^api/v1/external/pivotal$', 'webhooks.api_pivotal_webhook'),