Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/views/users/_project_issue.html.erb

@@ -1,4 +1,3 @@
-<% unless activity.author.nil? %>
 <div class="resources mt10" id="user_activity_<%= user_activity_id%>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
@@ -104,4 +103,3 @@
         user_card_show_hide();
     });
 </script>
-<% end %>

db/migrate/20160918033136_update_issue_author.rb

@@ -0,0 +1,13 @@
+class UpdateIssueAuthor < ActiveRecord::Migration
+  def up
+    begin
+      issue = Issue.find(9377)
+      issue.update_column(:author_id, 15341)
+    rescue Exception => e
+      puts e
+    end
+  end
+
+  def down
+  end
+end