aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-07-06 22:38:19 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-07-06 22:38:19 -0500
commit1f69672478a4f65fc6b84e3feedb5f3763c420f1 (patch)
tree0221ccbebf651686e5043e893b26563119ece7f5
parent0f7dc0b4a9ad8b51dada3a034bb9276fa1775380 (diff)
parent02542d54e1c0556cee79c9f1d75c5dc64aeb18c8 (diff)
downloadmediagoblin-1f69672478a4f65fc6b84e3feedb5f3763c420f1.tar.lz
mediagoblin-1f69672478a4f65fc6b84e3feedb5f3763c420f1.tar.xz
mediagoblin-1f69672478a4f65fc6b84e3feedb5f3763c420f1.zip
Merge remote branch 'remotes/gullydwarf-cfdv/b404_v2_redirect_after_profile_edit'
Conflicts: mediagoblin/edit/views.py
-rw-r--r--mediagoblin/edit/views.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index e064a9c3..a3326b2d 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -106,8 +106,8 @@ def edit_profile(request):
messages.add_message(request,
messages.SUCCESS,
'Profile edited!')
- return redirect(request,
- "mediagoblin.edit.profile",
+ return redirect(request,
+ 'mediagoblin.user_pages.user_home',
username=edit_username)
return render_to_response(