Merge branch 'release/0.21'0.21.0.0

Conflicts:
	locale/cy/app.po
	locale/es_NI/app.po
	locale/hr/app.po
	locale/is_IS/app.po
	locale/sr@latin/app.po

1 files changed, 2 insertions, 2 deletions

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 3709469cf..44d6c6f5f 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -116,7 +116,7 @@ module LinkToHelper
         if request.is_external?
             external_text || (request.external_user_name || _("Anonymous user")) + " (external)"
         else
-            link_to(internal_text || request.user.name, admin_user_show_url(request.user))
+            link_to(internal_text || request.user.name, admin_user_url(request.user))
         end
     end
 
@@ -178,7 +178,7 @@ module LinkToHelper
     end
 
     def user_admin_link(user, name="admin", cls=nil)
-      link_to name, admin_user_show_url(user), :class => cls
+      link_to name, admin_user_url(user), :class => cls
     end
 
     # Tracks. feed can be 'track' or 'feed'