Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #964 from warpc/946-wrong_links 

[refs #946] Fixed undefined local variable or method 'user_name'
This commit is contained in:
Vladimir Sharshov 2013-02-25 02:48:02 -08:00
parent f0a1fac070 6381c28e48
commit d53506b092
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/activity_feeds/partials/_git_new_push_notification.haml
View File

@ -3,7 +3,8 @@
.image= link_to(image_tag(avatar_url(user, :small), :alt => 'avatar'), user_path(user)) if user.persisted?
.text
%span
= raw t("notifications.bodies.#{change_type}_branch", {:branch_name => branch_name, :user_link => user_link(user, user_name)})
-_user_link = user_link(user, defined?(user_name) ? user_name : user_email)
= raw t("notifications.bodies.#{change_type}_branch", {:branch_name => branch_name, :user_link => _user_link})
= raw t("notifications.bodies.project", :project_link => link_to("#{project_owner}/#{project_name}", project_path(project_owner, project_name)) )
.both
%span.date= activity_feed.created_at