You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by cl...@apache.org on 2020/07/08 22:27:32 UTC
[whimsy] branch roster-emeritus updated (19c7b49 -> 99733df)
This is an automated email from the ASF dual-hosted git repository.
clr pushed a change to branch roster-emeritus
in repository https://gitbox.apache.org/repos/asf/whimsy.git.
from 19c7b49 Defer checking return from create
add 4d3e6fc += create_ metthod
add 287de46 Use correct SVN name
add 91b3ba1 only need podlings.xml
add dce6c48 Unused
add ebcfdff Eliminate variables only used once
add c5b3fdf Eliminate unnecessary variable
add 814cbd1 Unnecessary variable
add 9627356 Unnecessary variable
add db162dd Obsolete
add 8affe30 Docn
add 74e5fac More unneeded checkouts
add 18a2b56 Simpler check
add 5bb4688 Only read calendar once as part of ASF::SVN.update
add b5511d1 No need for local checkout of calendar.mdtext
add 5683da0 No need for local checkout
add 59c50b7 Error check needed
add 76b7f5d Detect commit error
add 2800636 Dropped site-board
add feb3b33 Optionally return all repo entries
add e03242d Keep only needed board files
add 712c07a SImply; don't use system shell
add 52e3d68 update now supports diff option
add 5c39934 Allow for frozen values (eg. in test setups)
add fea7fe0 Add check for file presence
add 3b39c32 Simplify by using SVN.update method
add 419aeea Tidy; don't use system shell
add 4b561d1 Only need a few files from officers and foundation
add 61c698f Docn
new 99733df merge master
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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(-)
delete mode 100755 www/board/publish_minutes.cgi
[whimsy] 01/01: merge master
Posted by cl...@apache.org.
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 <ap...@gmail.com>
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, '_')