This is an automated email from the ASF dual-hosted git repository.
sebb 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 4e1e167c Also drop emeritus comment
4e1e167c is described below
commit 4e1e167c87443ac997a369df3725c23d27e7e7dd
Author: Sebb <s...@apache.org>
AuthorDate: Tue Mar 4 16:44:06 2025 +0000
Also drop emeritus comment
---
www/roster/views/actions/memstat.json.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/roster/views/actions/memstat.json.rb
b/www/roster/views/actions/memstat.json.rb
index 7ca70d7a..c89f6c71 100644
--- a/www/roster/views/actions/memstat.json.rb
+++ b/www/roster/views/actions/memstat.json.rb
@@ -47,7 +47,7 @@ if %w{active emeritus deceased involuntary_emeritus}.include?
@action
entry.sub! "\n", " /* involuntary, #{@emeritus_reason} */\n" # add the
reason comment
elsif @action == 'active' # revert to active
index = text.index(/^\s\*\)\s/, text.index(/^Active/))
- entry.sub! %r{\s*/\* (?:deceased|involuntary), .+?\*/},'' # drop the
comments if necessary
+ entry.sub! %r{\s*/\* (?:deceased|involuntary|emeritus), .+?\*/},'' #
drop the comments if necessary
# if emeritus file was found, move it to emeritus-reinstated
# otherwise ignore
pathname, basename = ASF::EmeritusFiles.findpath(user)
