summaryrefslogtreecommitdiff
path: root/app/views/alerts/show.html.erb
diff options
context:
space:
mode:
authorAndrewMurrell <amurrel@purdue.edu>2014-04-27 22:18:45 -0400
committerAndrewMurrell <amurrel@purdue.edu>2014-04-27 22:18:45 -0400
commit8dcf94aa47869a61a7b03e3117187dee2ffb34f9 (patch)
tree4e3dc5af333a38b4bd6c62d78da2087b78fd6b25 /app/views/alerts/show.html.erb
parent7620fbd26b7131788eadf5b9a4f7ff4da6a05850 (diff)
parent3ef73244d6acaa3a16f4c9c4c276d30cc2753f2a (diff)
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'app/views/alerts/show.html.erb')
-rw-r--r--app/views/alerts/show.html.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/alerts/show.html.erb b/app/views/alerts/show.html.erb
index 59d8094..398a10e 100644
--- a/app/views/alerts/show.html.erb
+++ b/app/views/alerts/show.html.erb
@@ -1,6 +1,6 @@
<p>
<strong>Author:</strong>
- <%# @alert.author %>
+ <%= @alert.author.user_name %>
</p>
<p>