updates from production: fix user.time_zone, precompile assets

2014-09-26 13:47:57 -04:00
parent 85056c9d17
commit cc7114f37e
12 changed files with 116 additions and 14 deletions
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@ -16,7 +16,7 @@
      </tr>
      <tr>
        <td><%= t(:time_zone) %></td>
-        <td><%= @user.time_zone %></td>
+        <td><%= @user.time_zone_or_utc %></td>
      </tr>
      <tr>
        <td><%= t(:api_key) %></td>