Merge remote branch 'origin/master' into bug261-resized-filenames

[mediagoblin.git] / mediagoblin / auth / routing.py

diff --git a/mediagoblin/auth/routing.py b/mediagoblin/auth/routing.py
index 912d89fa5ef701d323a614ff5663feb7b6887bb5..15d8fc3ce670885d5ad15181dd8e0f2ccd4dc1a8 100644 (file)
--- a/mediagoblin/auth/routing.py
+++ b/mediagoblin/auth/routing.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -33,13 +33,6 @@ auth_routes = [
           controller='mediagoblin.views:simple_template_render'),
     Route('mediagoblin.auth.forgot_password', '/forgot_password/',
           controller='mediagoblin.auth.views:forgot_password'),
-    Route('mediagoblin.auth.verify_forgot_password', '/forgot_password/verify/',
-          controller='mediagoblin.auth.views:verify_forgot_password'),
-    Route('mediagoblin.auth.fp_changed_success',
-          '/forgot_password/changed_success/',
-          template='mediagoblin/auth/fp_changed_success.html',
-          controller='mediagoblin.views:simple_template_render'),
-    Route('mediagoblin.auth.fp_email_sent',
-          '/forgot_password/email_sent/',
-          template='mediagoblin/auth/fp_email_sent.html',
-          controller='mediagoblin.views:simple_template_render')]
+    Route('mediagoblin.auth.verify_forgot_password',
+          '/forgot_password/verify/',
+          controller='mediagoblin.auth.views:verify_forgot_password')]