You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by Sam Ruby <ru...@apache.org> on 2016/02/28 19:11:39 UTC

[whimsy.git] [1/2] Commit b6c3034: retab

Commit b6c30340b6284cd44dc51822b0e49ab3bc4ed3d2:
    retab


Branch: refs/heads/master
Author: Sam Ruby <ru...@intertwingly.net>
Committer: Sam Ruby <ru...@intertwingly.net>
Pusher: rubys <ru...@apache.org>

------------------------------------------------------------
www/roster/models/committer.rb                               | ++++ ----
www/roster/views/committer.js.rb                             | ++++++++++++++ 
------------------------------------------------------------
22 changes: 18 additions, 4 deletions.
------------------------------------------------------------


diff --git a/www/roster/models/committer.rb b/www/roster/models/committer.rb
index a6aaecb..f881607 100644
--- a/www/roster/models/committer.rb
+++ b/www/roster/models/committer.rb
@@ -57,12 +57,12 @@ def self.serialize(id, env)
       member = {}
 
       if person.asf_member?
-	member[:info] = person.members_txt
-	member[:status] = ASF::Member.status[id] || 'Active'
+        member[:info] = person.members_txt
+        member[:status] = ASF::Member.status[id] || 'Active'
       else
         if person.member_nomination
-	  member[:nomination] = person.member_nomination
-	end
+          member[:nomination] = person.member_nomination
+        end
       end
 
       response[:member] = member
diff --git a/www/roster/views/committer.js.rb b/www/roster/views/committer.js.rb
index 4d9a64d..7d4934a 100644
--- a/www/roster/views/committer.js.rb
+++ b/www/roster/views/committer.js.rb
@@ -93,6 +93,20 @@ def render
         end
       end
 
+      if committer.pgp
+        _tr do
+          _td 'PGP key'
+          _td committer.pgp
+        end
+      end
+
+      if committer.sascore
+        _tr.editable do
+          _td 'SpamAssassin score'
+          _td committer.sascore
+        end
+      end
+
       if committer.githubUsername
         _tr do
           _td 'GitHub username'