Skip to content
Extraits de code Groupes Projets
Valider 601da95c rédigé par maxwell's avatar maxwell
Parcourir les fichiers

Merge branch 'master' of github.com:diaspora/diaspora_rails

parents 29516d82 aa916d06
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
%html %html
%head %head
%title %title
= User.first.real_name if User.first = current_user.real_name if current_user
= " | diaspora" = " | diaspora"
%meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/ %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#session_action #session_action
- if user_signed_in? - if user_signed_in?
=User.first.real_name = current_user.real_name
| |
= link_to "requests (#{@request_count})", requests_path = link_to "requests (#{@request_count})", requests_path
| |
...@@ -50,9 +50,9 @@ ...@@ -50,9 +50,9 @@
.span-20 .span-20
- if user_signed_in? - if user_signed_in?
%h1#user_name %h1#user_name
= link_to User.first.real_name, root_url = link_to current_user.real_name, root_url
%span.description %span.description
= my_latest_message = my_latest_message
= yield = yield
.span-20 .span-12
= render "posts/debug" = render "posts/debug"
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter