You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by se...@apache.org on 2026/09/30 15:46:06 UTC

(whimsy) branch master updated: Handle merged projects

This is an automated email from the ASF dual-hosted git repository.

sebbASF pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new ed90fa60 Handle merged projects
ed90fa60 is described below

commit ed90fa60b8540bb868ac275ff118232d71b1ede3
Author: Sebb <se...@apache.org>
AuthorDate: Wed Sep 30 16:45:06 2026 +0100

    Handle merged projects
---
 www/roster/main.rb             | 6 +++++-
 www/roster/views/other.html.rb | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/www/roster/main.rb b/www/roster/main.rb
index 06421db5..111fd7d5 100755
--- a/www/roster/main.rb
+++ b/www/roster/main.rb
@@ -87,9 +87,13 @@ get '/other/' do
                 ASF::Committee.nonpmcs.map{|x| ASF::Project.ldapname x.name} -
                 ASF::Podling.currentids
   attics = ASF::Committee.load_committee_metadata[:tlps].filter {|k,v| v[:retired]}
+  merged = ASF::Committee.load_committee_metadata[:tlps].filter {|k,v| v[:merged_into]}
   @others = {}
   otherids.each do |id|
-    if attics.include? id
+    if merged.include? id # must be done before attic
+      type = "Merged into #{merged[id][:merged_into]}"
+      date = merged[id][:retired]
+    elsif attics.include? id
       type = 'Attic'
       date = attics[id][:retired]
     else
diff --git a/www/roster/views/other.html.rb b/www/roster/views/other.html.rb
index 6e17856d..d3ffbf2c 100644
--- a/www/roster/views/other.html.rb
+++ b/www/roster/views/other.html.rb
@@ -26,6 +26,7 @@ _html do
         _li 'Retired podlings'
         _li 'Podling aliases'
         _li 'Podling graduated as part of another TLP'
+        _li 'Project merged into another TLP'
       end
       _p 'None of the above normally have an LDAP project group'
     end