mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-03 21:43:21 +00:00 
			
		
		
		
	Clean up compatability code from Django 1.6 transition.
(imported from commit a83bd3340f5488fd687f045e2143c32f9385fa88)
This commit is contained in:
		@@ -42,14 +42,6 @@ urlpatterns = patterns('',
 | 
				
			|||||||
        {'post_reset_redirect' : '/accounts/password/done/',
 | 
					        {'post_reset_redirect' : '/accounts/password/done/',
 | 
				
			||||||
         'template_name': 'zerver/reset_confirm.html',
 | 
					         'template_name': 'zerver/reset_confirm.html',
 | 
				
			||||||
         'set_password_form' : zerver.forms.LoggingSetPasswordForm}),
 | 
					         'set_password_form' : zerver.forms.LoggingSetPasswordForm}),
 | 
				
			||||||
 | 
					 | 
				
			||||||
    # the next line can be removed PASSWORD_RESET_TIMEOUT_DAYS after this code is deployed
 | 
					 | 
				
			||||||
    url(r'^reset/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$',
 | 
					 | 
				
			||||||
        'django.contrib.auth.views.password_reset_confirm_uidb36',
 | 
					 | 
				
			||||||
        {'post_reset_redirect' : '/accounts/password/done/',
 | 
					 | 
				
			||||||
         'template_name': 'zerver/reset_confirm.html',
 | 
					 | 
				
			||||||
         'set_password_form' : zerver.forms.LoggingSetPasswordForm}),
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    url(r'^accounts/password/done/$', 'django.contrib.auth.views.password_reset_complete',
 | 
					    url(r'^accounts/password/done/$', 'django.contrib.auth.views.password_reset_complete',
 | 
				
			||||||
        {'template_name': 'zerver/reset_done.html'}),
 | 
					        {'template_name': 'zerver/reset_done.html'}),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user