This is an automated email from the ASF dual-hosted git repository. clr pushed a commit to branch roster-emeritus in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit 99733df47dd2b52eef1697dd76103171f8082b59 Merge: 19c7b49 61c698f Author: Craig L Russell <[email protected]> AuthorDate: Wed Jul 8 15:27:01 2020 -0700 merge master Rakefile | 18 ++- lib/spec/lib/svn_spec.rb | 2 +- lib/whimsy/asf/icla.rb | 6 +- lib/whimsy/asf/rack.rb | 4 +- lib/whimsy/asf/svn.rb | 74 +++++++-- lib/whimsy/asf/watch.rb | 3 +- repository.yml | 32 +++- tools/iclasort.rb | 20 +-- tools/membersort.rb | 19 ++- tools/migrate_podlings.rb | 4 +- www/board/agenda/views/actions/publish.json.rb | 44 +++--- www/board/publish_minutes.cgi | 170 --------------------- www/roster/views/actions/memstat.json.rb | 7 +- www/secretary/response-time.cgi | 3 +- www/secretary/workbench/views/actions/ccla.json.rb | 21 +-- 15 files changed, 152 insertions(+), 275 deletions(-) diff --cc www/roster/views/actions/memstat.json.rb index d383584,9d86373..b13f217 --- a/www/roster/views/actions/memstat.json.rb +++ b/www/roster/views/actions/memstat.json.rb @@@ -63,11 -60,9 +60,11 @@@ if @action == 'rescind_emeritus emeritus_rescinded_url = ASF::SVN.svnurl('emeritus-requests-rescinded') ASF::SVN.svn_('mv', [@emeritusfileurl, emeritus_rescinded_url], _, {env:env, msg:message}) elsif @action == 'request_emeritus' - # Create mail to secretary requesting emeritus + # Create emeritus request and send mail from secretary + FOUNDATION_URL = ASF::SVN.svnurl('foundation') + EMERITUS_TEMPLATE_URL = ASF::SVN.svnpath!('foundation', 'emeritus-request.txt').untaint template, err = - ASF::SVN.svn('cat', EMERITUS_TEMPLATE_URL, {env:env}) + ASF::SVN.svn('cat', ASF::SVN.svnpath!('foundation', 'emeritus-request.txt').untaint, {env:env}) raise RuntimeError.new("Failed to read emeritus-request.txt: " + err) unless template centered_id = "#{USERID}".center(55, '_') centered_name = "#{USERNAME}".center(55, '_')
