Merge remote-tracking branch 'upstream/pull/2009'

[rails.git] / app / views / browse / changeset.html.erb

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 85b9515dfedab9442490590023bdbbf0c67977e1..81e930812c883310f7d8525d6dbdf83855743905 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -63,7 +63,7 @@
 
   <% unless current_user %>
     <div class="notice">
 
   <% unless current_user %>
     <div class="notice">

-      <%= link_to(t(".join_discussion"), :controller => 'user', :action => 'login', :referer => request.fullpath) %>
+      <%= link_to(t(".join_discussion"), :controller => 'users', :action => 'login', :referer => request.fullpath) %>

     </div>
   <% end %>
 
     </div>
   <% end %>
 


@@ -127,7 +127,7 @@
     <% end %>
     <%=
         user = (@prev_by_user || @next_by_user).user.display_name
     <% end %>
     <%=
         user = (@prev_by_user || @next_by_user).user.display_name

-        link_to content_tag(:bdi, user), :controller => "changeset", :action => "list", :display_name => user
+        link_to content_tag(:bdi, user), :controller => "changeset", :action => "index", :display_name => user

     %>
     <% if @next_by_user %>
       &middot;
     %>
     <% if @next_by_user %>
       &middot;